manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1407936 - in /manifoldcf/branches/CONNECTORS-120: ./ connectors/sharepoint/ connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/ framework/script-engine/ framework/script-engine/src/main/java/o...
Date Sun, 11 Nov 2012 10:50:14 GMT
Author: kwright
Date: Sun Nov 11 10:50:13 2012
New Revision: 1407936

URL: http://svn.apache.org/viewvc?rev=1407936&view=rev
Log:
Various fixes, including getting Maven working

Modified:
    manifoldcf/branches/CONNECTORS-120/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
    manifoldcf/branches/CONNECTORS-120/connectors/sharepoint/pom.xml
    manifoldcf/branches/CONNECTORS-120/framework/script-engine/pom.xml
    manifoldcf/branches/CONNECTORS-120/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/ScriptParser.java
    manifoldcf/branches/CONNECTORS-120/pom.xml

Modified: manifoldcf/branches/CONNECTORS-120/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-120/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java?rev=1407936&r1=1407935&r2=1407936&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-120/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
(original)
+++ manifoldcf/branches/CONNECTORS-120/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
Sun Nov 11 10:50:13 2012
@@ -1568,7 +1568,7 @@ public class SharePointRepository extend
                         // This is not fatal
                         Logging.connectors.debug("SharePoint: Timeout before read could finish
for '"+fileUrl+"': "+e.getMessage(),e);
                       }
-                      catch (org.apache.commons.httpclient.ConnectTimeoutException e)
+                      catch (org.apache.http.conn.ConnectTimeoutException e)
                       {
                         // This is not fatal
                         Logging.connectors.debug("SharePoint: Connect timeout before read
could finish for '"+fileUrl+"': "+e.getMessage(),e);
@@ -1597,7 +1597,7 @@ public class SharePointRepository extend
               {
                 throw new ManifoldCFException("Socket timeout error writing '"+fileUrl+"'
to temporary file: "+e.getMessage(),e);
               }
-              catch (org.apache.commons.httpclient.ConnectTimeoutException e)
+              catch (org.apache.http.conn.ConnectTimeoutException e)
               {
                 throw new ManifoldCFException("Connect timeout error writing '"+fileUrl+"'
to temporary file: "+e.getMessage(),e);
               }

Modified: manifoldcf/branches/CONNECTORS-120/connectors/sharepoint/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-120/connectors/sharepoint/pom.xml?rev=1407936&r1=1407935&r2=1407936&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-120/connectors/sharepoint/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-120/connectors/sharepoint/pom.xml Sun Nov 11 10:50:13 2012
@@ -93,33 +93,33 @@
         <artifactId>axistools-maven-plugin</artifactId>
         <version>1.4</version>
         
-				<dependencies>
-					<dependency>
-						<groupId>org.apache.axis</groupId>
-						<artifactId>axis</artifactId>
-						<version>1.4</version>
-					</dependency>
-					<dependency>
-						<groupId>commons-logging</groupId>
-						<artifactId>commons-logging</artifactId>
-						<version>${commons-logging.version}</version>
-					</dependency>
-					<dependency>
-						<groupId>commons-discovery</groupId>
-						<artifactId>commons-discovery</artifactId>
-						<version>0.2</version>
-					</dependency>
-					<dependency>
-						<groupId>javax.xml</groupId>
-						<artifactId>jaxrpc-api</artifactId>
-						<version>1.1</version>
-					</dependency>
-					<dependency>
-						<groupId>wsdl4j</groupId>
-						<artifactId>wsdl4j</artifactId>
-						<version>1.6.2</version>
-					</dependency>
-				</dependencies>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.axis</groupId>
+            <artifactId>axis</artifactId>
+            <version>1.4</version>
+          </dependency>
+          <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>${commons-logging.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>commons-discovery</groupId>
+            <artifactId>commons-discovery</artifactId>
+            <version>0.2</version>
+          </dependency>
+          <dependency>
+            <groupId>javax.xml</groupId>
+            <artifactId>jaxrpc-api</artifactId>
+            <version>1.1</version>
+          </dependency>
+          <dependency>
+            <groupId>wsdl4j</groupId>
+            <artifactId>wsdl4j</artifactId>
+            <version>1.6.2</version>
+          </dependency>
+        </dependencies>
         
         <configuration>
           <sourceDirectory>wsdls</sourceDirectory>
@@ -181,9 +181,9 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient</artifactId>
-      <version>${commons-httpclient.version}</version>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <version>${httpcomponent.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>

Modified: manifoldcf/branches/CONNECTORS-120/framework/script-engine/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-120/framework/script-engine/pom.xml?rev=1407936&r1=1407935&r2=1407936&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-120/framework/script-engine/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-120/framework/script-engine/pom.xml Sun Nov 11 10:50:13
2012
@@ -74,9 +74,9 @@
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient</artifactId>
-      <version>${commons-httpclient.version}</version>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <version>${httpcomponent.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-collections</groupId>

Modified: manifoldcf/branches/CONNECTORS-120/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/ScriptParser.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-120/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/ScriptParser.java?rev=1407936&r1=1407935&r2=1407936&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-120/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/ScriptParser.java
(original)
+++ manifoldcf/branches/CONNECTORS-120/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/ScriptParser.java
Sun Nov 11 10:50:13 2012
@@ -33,7 +33,7 @@ import org.apache.http.util.EntityUtils;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.impl.client.DefaultRedirectStrategy;
 import org.apache.http.conn.ClientConnectionManager;
-import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
+import org.apache.http.impl.conn.PoolingClientConnectionManager;
 import java.util.*;
 import java.io.*;
 
@@ -1200,7 +1200,7 @@ public class ScriptParser
     {
       if (httpClient == null)
       {
-        connectionManager = new ThreadSafeClientConnManager();
+        connectionManager = new PoolingClientConnectionManager();
         BasicHttpParams params = new BasicHttpParams();
         params.setBooleanParameter(CoreConnectionPNames.TCP_NODELAY,true);
         params.setBooleanParameter(CoreConnectionPNames.STALE_CONNECTION_CHECK,false);

Modified: manifoldcf/branches/CONNECTORS-120/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-120/pom.xml?rev=1407936&r1=1407935&r2=1407936&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-120/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-120/pom.xml Sun Nov 11 10:50:13 2012
@@ -49,6 +49,7 @@
     <commons-collections.version>3.2.1</commons-collections.version>
     <commons-fileupload.version>1.2.2</commons-fileupload.version>
     <commons-httpclient.version>3.1-mcf-1</commons-httpclient.version>
+    <httpcomponent.version>4.2.2</httpcomponent.version>
     <commons-el.version>1.0</commons-el.version>
     <commons-lang.version>2.6</commons-lang.version>
     <xalan.version>2.7.1</xalan.version>



Mime
View raw message