Author: kishore
Date: Tue Mar 14 21:17:50 2017
New Revision: 1786952
URL: http://svn.apache.org/viewvc?rev=1786952&view=rev
Log:
Sync the CONNECTORS-1196 branch with ^/manifoldcf/trunk through r1786950.
Added:
manifoldcf/branches/CONNECTORS-1196/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ProcessActivityHTMLHandlerTest.java
- copied unchanged from r1786950,
manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ProcessActivityHTMLHandlerTest.java
Modified:
manifoldcf/branches/CONNECTORS-1196/ (props changed)
manifoldcf/branches/CONNECTORS-1196/CHANGES.txt
manifoldcf/branches/CONNECTORS-1196/DEPENDENCIES.txt
manifoldcf/branches/CONNECTORS-1196/NOTICE.txt
manifoldcf/branches/CONNECTORS-1196/README.txt
manifoldcf/branches/CONNECTORS-1196/build.xml
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryConfig.java
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_en_US.properties
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_es_ES.properties
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_ja_JP.properties
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_zh_CN.properties
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/activedirectory/editConfiguration.js
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/activedirectory/editConfiguration_DomainController.html
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/activedirectory/viewConfiguration.html
manifoldcf/branches/CONNECTORS-1196/connectors/amazoncloudsearch/pom.xml
manifoldcf/branches/CONNECTORS-1196/connectors/amazons3/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/amazons3/AmazonS3Authority.java
manifoldcf/branches/CONNECTORS-1196/connectors/amazons3/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/amazons3/AmazonS3Connector.java
manifoldcf/branches/CONNECTORS-1196/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/cmis/CmisAuthorityConnector.java
manifoldcf/branches/CONNECTORS-1196/connectors/cmis/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/cmis/common_en_US.properties
manifoldcf/branches/CONNECTORS-1196/connectors/cmis/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/cmis/common_es_ES.properties
manifoldcf/branches/CONNECTORS-1196/connectors/cmis/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/cmis/common_ja_JP.properties
manifoldcf/branches/CONNECTORS-1196/connectors/cmis/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/cmis/common_zh_CN.properties
manifoldcf/branches/CONNECTORS-1196/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/client/ConfluenceClient.java
manifoldcf/branches/CONNECTORS-1196/connectors/dropbox/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/dropbox/editSpecification.js
manifoldcf/branches/CONNECTORS-1196/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java
manifoldcf/branches/CONNECTORS-1196/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/notifications/email/EmailConnector.java
manifoldcf/branches/CONNECTORS-1196/connectors/generic/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/generic/GenericAuthority.java
manifoldcf/branches/CONNECTORS-1196/connectors/generic/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/generic/GenericConnector.java
manifoldcf/branches/CONNECTORS-1196/connectors/gridfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/gridfs/GridFSRepositoryConnector.java
manifoldcf/branches/CONNECTORS-1196/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
manifoldcf/branches/CONNECTORS-1196/connectors/kafka/connector/src/main/resources/org/apache/manifoldcf/agents/output/kafka/viewConfiguration.html
manifoldcf/branches/CONNECTORS-1196/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/APISanityHSQLDBIT.java
manifoldcf/branches/CONNECTORS-1196/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/BaseITHSQLDB.java
manifoldcf/branches/CONNECTORS-1196/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/BaseUIHSQLDB.java
manifoldcf/branches/CONNECTORS-1196/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/NavigationHSQLDBUI.java
manifoldcf/branches/CONNECTORS-1196/connectors/nulloutput/connector/src/main/java/org/apache/manifoldcf/agents/output/nullconnector/NullConnector.java
manifoldcf/branches/CONNECTORS-1196/connectors/sharepoint/ (props changed)
manifoldcf/branches/CONNECTORS-1196/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_Server.html
manifoldcf/branches/CONNECTORS-1196/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html
manifoldcf/branches/CONNECTORS-1196/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration_Server.html
manifoldcf/branches/CONNECTORS-1196/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/viewConfiguration.html
manifoldcf/branches/CONNECTORS-1196/connectors/slack/connector/src/main/java/org/apache/manifoldcf/crawler/notifications/slack/SlackConnector.java
manifoldcf/branches/CONNECTORS-1196/connectors/slack/connector/src/main/resources/org/apache/manifoldcf/crawler/notifications/slack/ConfigurationView.html
manifoldcf/branches/CONNECTORS-1196/connectors/slack/connector/src/main/resources/org/apache/manifoldcf/crawler/notifications/slack/Configuration_Server.html
manifoldcf/branches/CONNECTORS-1196/connectors/tika/pom.xml
manifoldcf/branches/CONNECTORS-1196/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConfig.java
manifoldcf/branches/CONNECTORS-1196/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
manifoldcf/branches/CONNECTORS-1196/connectors/webcrawler/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/webcrawler/common_en_US.properties
manifoldcf/branches/CONNECTORS-1196/connectors/webcrawler/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/webcrawler/common_es_ES.properties
manifoldcf/branches/CONNECTORS-1196/connectors/webcrawler/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/webcrawler/common_ja_JP.properties
manifoldcf/branches/CONNECTORS-1196/connectors/webcrawler/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/webcrawler/common_zh_CN.properties
manifoldcf/branches/CONNECTORS-1196/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/NavigationHSQLDBUI.java
manifoldcf/branches/CONNECTORS-1196/connectors/webcrawler/pom.xml
manifoldcf/branches/CONNECTORS-1196/dist-license/DEPENDENCIES.txt
manifoldcf/branches/CONNECTORS-1196/dist-license/NOTICE.txt
manifoldcf/branches/CONNECTORS-1196/framework/agents/src/main/java/org/apache/manifoldcf/agents/system/IdleCleanupThread.java
manifoldcf/branches/CONNECTORS-1196/framework/build.xml
manifoldcf/branches/CONNECTORS-1196/framework/connector-common/pom.xml
manifoldcf/branches/CONNECTORS-1196/framework/core/src/test/resources/org/apache/manifoldcf/core/tests/VirtualBrowser.py
(contents, props changed)
manifoldcf/branches/CONNECTORS-1196/framework/example-multiprocess-zk-proprietary/properties.xml
manifoldcf/branches/CONNECTORS-1196/framework/example-multiprocess-zk/properties.xml
manifoldcf/branches/CONNECTORS-1196/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/system/IdleCleanupThread.java
manifoldcf/branches/CONNECTORS-1196/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/IdleCleanupThread.java
manifoldcf/branches/CONNECTORS-1196/lib-license/NOTICE.txt
manifoldcf/branches/CONNECTORS-1196/pom.xml
manifoldcf/branches/CONNECTORS-1196/site/build.xml
manifoldcf/branches/CONNECTORS-1196/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml
manifoldcf/branches/CONNECTORS-1196/site/src/documentation/resources/images/en_US/web-configure-robots.PNG
manifoldcf/branches/CONNECTORS-1196/site/src/documentation/skinconf.xml
Propchange: manifoldcf/branches/CONNECTORS-1196/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 14 21:17:50 2017
@@ -138,3 +138,4 @@
/manifoldcf/branches/CONNECTORS-981:1605049-1605773
/manifoldcf/branches/CONNECTORS-989:1611600-1612101
/manifoldcf/branches/CONNECTORS-990:1610284-1610707
+/manifoldcf/trunk:1783604-1786950
Modified: manifoldcf/branches/CONNECTORS-1196/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/CHANGES.txt?rev=1786952&r1=1786951&r2=1786952&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/CHANGES.txt (original)
+++ manifoldcf/branches/CONNECTORS-1196/CHANGES.txt Tue Mar 14 21:17:50 2017
@@ -3,6 +3,60 @@ $Id$
======================= 2.7-dev =====================
+CONNECTORS-1395: Increase zookeeper session timeout to 300000,
+because we were having sessions expire.
+(Karl Wright)
+
+CONNECTORS-1396: Fix email connector class cast exception.
+(Cihad Guzel, Karl Wright)
+
+CONNECTORS-1394: Fix email connector ArrayIndexOutOfBounds
+exception.
+(Cihad Guzel, Karl Wright)
+
+CONNECTORS-1392: The Webcrawler connector now has an option to ignore
+meta robots tags in HTML pages
+(Markus Schuch)
+
+CONNECTORS-1390: Add user-settable connect timeout field for
+Active Directory authority.
+(Cihad Guzel, Karl Wright)
+
+CONNECTORS-1389: The email notification connector now supports
+multiple comma separated recipients
+(Markus Schuch)
+
+CONNECTORS-1388: The User ID field is now focused when the login
+page is loaded
+(Markus Schuch)
+
+CONNECTORS-1387: Fix Amazon S3 connector not storing secret key
+and proxy credentials properly
+(Markus Schuch)
+
+CONNECTORS-1383: Fix Generic connector not to send the password
+to the client in plaintext
+(Markus Schuch)
+
+CONNECTORS-1384: Fix GridFS connector not to send the password
+to the client in plaintext and enabled password obfuscation
+(Markus Schuch)
+
+CONNECTORS-1385: Confluence connector was constructing bad paths
+which confused CF 6.4.
+(Andrew Shumway, Karl Wright)
+
+CONNECTORS-1382: Slack notification connector now treats the webhook url
+as sensitive information
+(Markus Schuch)
+
+CONNECTORS-1381: Fix slack notification connector not to send the proxy
+password to the client in plaintext
+(Markus Schuch)
+
+CONNECTORS-1380: DropBox connector editSpecification.js velocity template
incorrect variable
+(Kishore Kumar)
+
CONNECTORS-1378: History reports End time year resets to Start Time year
(Kishore Kumar)
@@ -66,7 +120,7 @@ transformation connections.
CONNECTORS-1344: Adds Slack Notification Connector
(Odilo Oehmichen, Markus Schuch, Rüdiger Kurz)
-CONNECTORS-1349: Fix the modified_date and original_size Solr
+CONNECTORS-1349: Fix the modified_date and original_size Solr
attributes.
(Cihad Guzel)
@@ -126,7 +180,7 @@ CONNECTORS-1329: Add logging to LDAP con
CONNECTORS-1326: Fix URL for Confluence documents.
(Chalitha Perera)
-CONNECTORS-1325: Deal with SharePoint bad XML when document has
+CONNECTORS-1325: Deal with SharePoint bad XML when document has
optional plane utf-16 characters. Documents with these are skipped
since Java can't represent them either.
(Karl Wright)
@@ -248,7 +302,7 @@ CONNECTORS-1266: Fix an infinite loop in
CONNECTORS-1265: Adjust interval for checking validity of http connection.
(Shinichiro Abe, Karl Wright)
-CONNECTORS-1263: New version of Alfresco-indexer package.
+CONNECTORS-1263: New version of Alfresco-indexer package.
(Maurizio Pillitu)
CONNECTORS-1262: Fix Alfresco-webscript connector's version string,
@@ -410,7 +464,7 @@ CONNECTORS-1204: Add ability to post ori
to Solr from JCIFS connector. Also improve efficiency of JCIFS connector.
(Karl Wright)
-CONNECTORS-1193: Add ability to discard web content based on a
+CONNECTORS-1193: Add ability to discard web content based on a
set of regular expressions.
(Arcadius Ahouansou)
@@ -1332,7 +1386,7 @@ CONNECTORS-863: Increase the number of z
this permits agents processes to start on linux.
(Karl Wright)
-CONNECTORS-862: Reduce the binary image footprint by consolidating the
+CONNECTORS-862: Reduce the binary image footprint by consolidating the
various lib directories and just changing classpaths.
(Karl Wright)
@@ -1967,7 +2021,7 @@ CONNECTORS-658: Add common metadata supp
to Livelink connector.
(David Morana, Karl Wright)
-CONNECTORS-654: Move extension to mimetype mapping to a
+CONNECTORS-654: Move extension to mimetype mapping to a
central location.
(Mark Lugert, Karl Wright)
@@ -2090,7 +2144,7 @@ JDBC connections under some error condit
CONNECTORS-619: Include slf4j jars in multiprocess agents classpath.
This was causing Solrj to not work on multiprocess deployments.
-(Erlend Garåsen, Karl Wright)
+(Erlend Garåsen, Karl Wright)
CONNECTORS-618: MySQL orders indexes so that NULL values are first.
This is a problem for the stuffer query, which then must go through
@@ -2229,7 +2283,7 @@ we have.
CONNECTORS-577: Typo in language message properties which cause stack
traces
-(Erlend Garåsen)
+(Erlend Garåsen)
CONNECTORS-120: Port ManifoldCF to httpcomponents 4.2.2, from legacy
commons-httpclient 3.1 (mcf edition).
@@ -2451,7 +2505,7 @@ CONNECTORS-505: Fix for "unknown state"
UI.
(Ahmet Arslan, Karl Wright)
-CONNECTORS-504: Stop agents process from talking to database after
+CONNECTORS-504: Stop agents process from talking to database after
the stop signal has been sent.
(Karl Wright)
@@ -2743,7 +2797,7 @@ etc.
CONNECTORS-419: Alfresco Connector needs to invoke the ingestDocument for each
d:content property of a node
(Piergiorgio Lucidi)
-CONNECTORS-417: CMIS Connector creates documentURI with wrong value when
version is null.
+CONNECTORS-417: CMIS Connector creates documentURI with wrong value when
version is null.
Now the documentURI to get the content stream is retrieved from the CMIS
server using an internal method of the OpenCMIS API.
(Piergiorgio Lucidi)
@@ -3359,11 +3413,11 @@ CONNECTORS-220: Fix long-standing issue
problems. Reset logic was insufficiently robust.
(Farzad Valad, Karl Wright)
-CONNECTORS-217: Check running more than one of instance of agent.
+CONNECTORS-217: Check running more than one of instance of agent.
(Shinichiro Abe)
-CONNECTORS-218: LockClean supports relative path
-to the synchronization directory.
+CONNECTORS-218: LockClean supports relative path
+to the synchronization directory.
(Shinichiro Abe)
CONNECTORS-215: Setting an environment variable of agent.
@@ -3597,7 +3651,7 @@ CONNECTORS-130: Block the Solr output co
that have folder-level security.
(Karl Wright)
-CONNECTORS-129: Add an API reset/outputconnections/xxx command, to
+CONNECTORS-129: Add an API reset/outputconnections/xxx command, to
forget the index state for an output connection.
(Karl Wright)
@@ -3740,7 +3794,7 @@ CONNECTORS-105: File system connector UI
metaphor for paths and rules.
(Karl Wright)
-CONNECTORS-101: File system connector paths should automatically get default
+CONNECTORS-101: File system connector paths should automatically get default
rules added.
(Karl Wright)
@@ -3756,7 +3810,7 @@ CONNECTORS-97: Web connector session aut
due to cookies httpclient thought were illegal, but browsers would accept.
(Karl Wright)
-CONNECTORS-91: Made the initialization commands more accessible via code.
+CONNECTORS-91: Made the initialization commands more accessible via code.
(Jettro Coenradie, Karl Wright)
CONNECTORS-90: Fixed a localization issue where database errors that should be
Modified: manifoldcf/branches/CONNECTORS-1196/DEPENDENCIES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/DEPENDENCIES.txt?rev=1786952&r1=1786951&r2=1786952&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/DEPENDENCIES.txt (original)
+++ manifoldcf/branches/CONNECTORS-1196/DEPENDENCIES.txt Tue Mar 14 21:17:50
2017
@@ -1,6 +1,6 @@
ManifoldCF requires
------------------
-* JRE 1.7 or above
+* JRE 1.8 or above
* SVN client, version 1.7 or above
* Apache Ant, version 1.7 or above
* Apache Forrest, version 0.9-dev or above
Modified: manifoldcf/branches/CONNECTORS-1196/NOTICE.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/NOTICE.txt?rev=1786952&r1=1786951&r2=1786952&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/NOTICE.txt (original)
+++ manifoldcf/branches/CONNECTORS-1196/NOTICE.txt Tue Mar 14 21:17:50 2017
@@ -1,5 +1,5 @@
Apache ManifoldCF
-Copyright 2010-2016 The Apache Software Foundation
+Copyright 2010-2017 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: manifoldcf/branches/CONNECTORS-1196/README.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/README.txt?rev=1786952&r1=1786951&r2=1786952&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/README.txt (original)
+++ manifoldcf/branches/CONNECTORS-1196/README.txt Tue Mar 14 21:17:50 2017
@@ -32,10 +32,10 @@ Instructions for Building Apache Manifol
3. Copy the lib folder in the lib distribution into the source distribution.
-4. Download the Java SE 7 JDK (Java Development Kit), or greater, from
http://www.oracle.com/technetwork/java/index.html.
+4. Download the Java SE 8 JDK (Java Development Kit), or greater, from
http://www.oracle.com/technetwork/java/index.html.
You will need the JDK installed, and the %JAVA_HOME%\bin directory included
on your command path. To test this, issue a "java -version" command from
your
- shell and verify that the Java version is 1.7 or greater.
+ shell and verify that the Java version is 1.8 or greater.
5. Download the Apache Ant binary distribution (1.7.0 or greater) from
http://ant.apache.org.
You will need Ant installed and the %ANT_HOME%\bin directory included on
your
Modified: manifoldcf/branches/CONNECTORS-1196/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/build.xml?rev=1786952&r1=1786951&r2=1786952&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1196/build.xml Tue Mar 14 21:17:50 2017
@@ -46,6 +46,7 @@
<property name="wsdl4j.version" value="1.6.2"/>
<property name="commons-codec.version" value="1.10"/>
<property name="commons-collections.version" value="3.2.1"/>
+ <property name="commons-collections4.version" value="4.1"/>
<property name="commons-discovery.version" value="0.5"/>
<property name="commons-el.version" value="1.0"/>
<property name="commons-fileupload.version" value="1.2.2"/>
@@ -56,7 +57,7 @@
<property name="commons-cli.version" value="1.2"/>
<property name="slf4j.version" value="1.7.7"/>
<property name="xalan.version" value="2.7.1"/>
- <property name="poi.version" value="3.15-beta1"/>
+ <property name="poi.version" value="3.15"/>
<property name="activation.version" value="1.1.1"/>
<property name="avalon.version" value="4.3.1"/>
<property name="ecj.version" value="4.3.1"/>
@@ -92,69 +93,75 @@
<property name="json-simple.version" value="1.1.1"/>
<property name="google-api-client.version" value="v2-rev136-1.19.0"/>
<property name="google-http-client.version" value="1.19.0"/>
- <property name="jackson-core.version" value="2.7.1"/>
+ <property name="jackson-core.version" value="2.8.1"/>
<property name="jetty-jsp-jdt.version" value="2.3.3"/>
<property name="jetty-schemas.version" value="3.1.M0"/>
<property name="alfresco-indexer.version" value="0.8.1"/>
- <property name="gson.version" value="2.6.2"/>
+ <property name="gson.version" value="2.2.4"/>
<property name="guava.version" value="18.0"/>
<property name="mockito.version" value="1.9.5"/>
- <property name="wiremock.version" value="1.34"/>
+ <property name="wiremock.version" value="2.5.1"/>
<property name="objenesis.version" value="2.1"/>
- <property name="tika.version" value="1.13"/>
+ <property name="tika.version" value="1.14"/>
<property name="tagsoup.version" value="1.2.1"/>
<property name="james.version" value="0.7.2"/>
<property name="vorbis.version" value="0.8"/>
- <property name="metadata-extractor.version" value="2.8.1"/>
+ <property name="metadata-extractor.version" value="2.9.1"/>
<property name="aspectjrt.version" value="1.8.6"/>
- <property name="jhighlight.version" value="1.0.3"/>
+ <property name="jhighlight.version" value="1.0.2"/>
<property name="xmlbeans.version" value="2.6.0"/>
<property name="bc.version" value="1.54"/>
<property name="tukaani.version" value="1.5"/>
- <property name="pdfbox.version" value="2.0.1"/>
+ <property name="pdfbox.version" value="2.0.3"/>
<property name="jempbox.version" value="1.8.12"/>
- <property name="commons-compress.version" value="1.11"/>
- <property name="commons-csv.version" value="1.2"/>
+ <property name="commons-compress.version" value="1.12"/>
+ <property name="commons-csv.version" value="1.0"/>
<property name="commons-exec.version" value="1.3"/>
<property name="juniversalchardet.version" value="1.0.3"/>
<property name="ucar.version" value="4.5.5"/>
- <property name="jcommander.version" value="1.48"/>
- <property name="protobuf.version" value="2.6.1"/>
+ <property name="jna.version" value="4.1.0"/>
+ <property name="jcommander.version" value="1.35"/>
+ <property name="protobuf.version" value="2.5.0"/>
<property name="jcip-annotations.version" value="1.0"/>
- <property name="ehcache.version" value="2.6.11"/>
+ <property name="ehcache.version" value="2.6.2"/>
<property name="bzip2.version" value="0.9.1"/>
- <property name="jdom2.version" value="2.0.6"/>
- <property name="quartz.version" value="2.2.1"/>
+ <property name="jdom2.version" value="2.0.4"/>
+ <property name="quartz.version" value="2.2.0"/>
<property name="boilerpipe.version" value="1.1.0"/>
<property name="dom4j.version" value="1.6.1"/>
- <property name="asm.version" value="5.1"/>
+ <property name="asm.version" value="5.0.4"/>
<property name="xmpcore.version" value="5.1.2"/>
- <property name="rome.version" value="1.6.0"/>
+ <property name="rome.version" value="1.5.1"/>
<property name="jdom2.version" value="2.0.6"/>
<property name="mp4parser.version" value="1.1.18"/>
- <property name="jmatio.version" value="1.0"/>
+ <property name="jmatio.version" value="1.2"/>
<property name="java-libpst.version" value="0.8.1"/>
<property name="commons-httpclient.version" value="3.1"/>
- <property name="jackson-databind.version" value="2.1.3"/>
- <property name="jackson-annotations.version" value="2.1.2"/>
+ <property name="jackson-databind.version" value="2.6.1"/>
+ <property name="jackson-annotations.version" value="2.6.1"/>
<property name="resteasy.client.version" value="3.0.16.Final"/>
- <property name="jsoup.version" value="1.8.1"/>
+ <property name="jsoup.version" value="1.7.2"/>
+ <property name="jj2000.version" value="5.2"/>
<property name="hadoop.version" value="2.6.0"/>
<property name="aws-sdk.version" value="1.9.0"/>
- <property name="joda-time.version" value="2.8.2"/>
+ <property name="joda-time.version" value="2.9.7"/>
<property name="junrar.version" value="0.7"/>
- <property name="jackcess.version" value="2.1.3"/>
+ <property name="jackcess.version" value="2.1.4"/>
<property name="jackcess-encrypt.version" value="2.1.1"/>
<property name="opennlp.version" value="1.6.0"/>
<property name="sis.version" value="0.6"/>
<property name="opengis.version" value="3.0.0"/>
+ <property name="jsr-275.version" value="0.9.3"/>
<property name="commons-vfs2.version" value="2.0"/>
- <property name="c3p0.version" value="0.9.5.1"/>
- <property name="cxf.version" value="3.1.6"/>
- <property name="xmlschema.version" value="2.2.1"/>
+ <property name="maven-scm.version" value="1.4"/>
+ <property name="plexus-utils.version" value="1.5.6"/>
+ <property name="regexp.version" value="1.3"/>
+ <property name="c3p0.version" value="0.9.1.1"/>
+ <property name="cxf.version" value="3.0.3"/>
+ <property name="xmlschema.version" value="2.1.0"/>
<property name="annotation-api.version" value="1.2"/>
<property name="javax.ws.rs-api.version" value="2.0.1"/>
- <property name="virtuald.version" value="1.03"/>
+ <property name="virtuald.version" value="1.04"/>
<property name="rat.bootstrap.version" value="0.12"/>
<property name="rat_checksum_sha1"
value="16398550402b27f81cd0d508cef54b3e47a4a6da"/>
<property name="rat_install_path" location="${user.home}/.ant/lib" />
@@ -1202,6 +1209,12 @@ Use Apache Forrest version forrest-0.9-d
<param name="artifact-type" value="jar"/>
</antcall>
<antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/apache/commons"/>
+ <param name="artifact-version"
value="${commons-collections4.version}"/>
+ <param name="artifact-name" value="commons-collections4"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
<param name="project-path" value="commons-discovery"/>
<param name="artifact-version"
value="${commons-discovery.version}"/>
<param name="artifact-name" value="commons-discovery"/>
@@ -2008,7 +2021,7 @@ Use Apache Forrest version forrest-0.9-d
<param name="artifact-type" value="jar"/>
</antcall>
<antcall target="download-via-maven"><param name="target" value="lib"/>
- <param name="project-path" value="com/mchange"/>
+ <param name="project-path" value="c3p0"/>
<param name="artifact-version" value="${c3p0.version}"/>
<param name="artifact-name" value="c3p0"/>
<param name="artifact-type" value="jar"/>
@@ -2056,6 +2069,12 @@ Use Apache Forrest version forrest-0.9-d
<param name="artifact-type" value="jar"/>
</antcall>
<antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="javax/measure"/>
+ <param name="artifact-version" value="${jsr-275.version}"/>
+ <param name="artifact-name" value="jsr-275"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
<param name="project-path" value="org/apache/sis/core"/>
<param name="artifact-version" value="${sis.version}"/>
<param name="artifact-name" value="sis-metadata"/>
@@ -2116,6 +2135,36 @@ Use Apache Forrest version forrest-0.9-d
<param name="artifact-type" value="jar"/>
</antcall>
<antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/apache/maven/scm"/>
+ <param name="artifact-version" value="${maven-scm.version}"/>
+ <param name="artifact-name" value="maven-scm-api"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/apache/maven/scm"/>
+ <param name="artifact-version" value="${maven-scm.version}"/>
+ <param name="artifact-name" value="maven-scm-provider-svnexe"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/apache/maven/scm"/>
+ <param name="artifact-version" value="${maven-scm.version}"/>
+ <param name="artifact-name"
value="maven-scm-provider-svn-commons"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/codehaus/plexus"/>
+ <param name="artifact-version" value="${plexus-utils.version}"/>
+ <param name="artifact-name" value="plexus-utils"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="regexp"/>
+ <param name="artifact-version" value="${regexp.version}"/>
+ <param name="artifact-name" value="regexp"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
<param name="project-path" value="org/apache/commons"/>
<param name="artifact-name" value="commons-csv"/>
<param name="artifact-version" value="${commons-csv.version}"/>
@@ -2158,6 +2207,18 @@ Use Apache Forrest version forrest-0.9-d
<param name="artifact-type" value="jar"/>
</antcall>
<antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="net/java/dev/jna"/>
+ <param name="artifact-name" value="jna"/>
+ <param name="artifact-version" value="${jna.version}"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="edu/ucar"/>
+ <param name="artifact-name" value="jj2000"/>
+ <param name="artifact-version" value="${jj2000.version}"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
<param name="project-path" value="org/ccil/cowan/tagsoup"/>
<param name="artifact-version" value="${tagsoup.version}"/>
<param name="artifact-name" value="tagsoup"/>
@@ -2416,7 +2477,7 @@ Use Apache Forrest version forrest-0.9-d
<param name="artifact-type" value="jar"/>
</antcall>
<antcall target="download-via-maven"><param name="target" value="lib"/>
- <param name="project-path" value="net/sourceforge/jmatio"/>
+ <param name="project-path" value="org/tallison"/>
<param name="artifact-name" value="jmatio"/>
<param name="artifact-version" value="${jmatio.version}"/>
<param name="artifact-type" value="jar"/>
Modified:
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java?rev=1786952&r1=1786951&r2=1786952&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java
(original)
+++
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java
Tue Mar 14 21:17:50 2017
@@ -19,7 +19,6 @@
package org.apache.manifoldcf.authorities.authorities.activedirectory;
import org.apache.manifoldcf.core.interfaces.*;
-import org.apache.manifoldcf.agents.interfaces.*;
import org.apache.manifoldcf.authorities.interfaces.*;
import org.apache.manifoldcf.authorities.system.Logging;
import org.apache.manifoldcf.authorities.system.ManifoldCF;
@@ -52,6 +51,7 @@ public class ActiveDirectoryAuthority ex
private String cacheLRUsize = null;
private long responseLifetime = 60000L;
private int LRUsize = 1000;
+ private String ldapConnectionTimeout = null;
/** Session information for all DC's we talk with. */
private Map<String,DCSessionInfo> sessionInfo = null;
@@ -136,7 +136,10 @@ public class ActiveDirectoryAuthority ex
}
}
}
-
+
+ ldapConnectionTimeout =
params.getParameter(ActiveDirectoryConfig.PARAM_LDAPCONNECTIONTIMEOUT);
+ if (ldapConnectionTimeout == null)
+ ldapConnectionTimeout = "60000";
cacheLifetime =
params.getParameter(ActiveDirectoryConfig.PARAM_CACHELIFETIME);
if (cacheLifetime == null)
cacheLifetime = "1";
@@ -197,7 +200,7 @@ public class ActiveDirectoryAuthority ex
session = new DCSessionInfo();
sessionInfo.put(domainController,session);
}
- return session.getSession(domainController,parms);
+ return session.getSession(domainController,parms,ldapConnectionTimeout);
}
/** Poll. The connection should be closed if it has been idle for too long.
@@ -246,6 +249,7 @@ public class ActiveDirectoryAuthority ex
cacheLifetime = null;
cacheLRUsize = null;
+ ldapConnectionTimeout = null;
super.disconnect();
}
@@ -364,7 +368,7 @@ public class ActiveDirectoryAuthority ex
try
{
// Establish a session with the selected domain controller
- LdapContext ctx = createDCSession(domainController);
+ LdapContext ctx = createDCSession(domainController);
//Get DistinguishedName (for this method we are using DomainPart as a
searchBase ie: DC=qa-ad-76,DC=metacarta,DC=com")
String searchBase = getDistinguishedName(ctx, userPart,
domainsb.toString(), userACLsUsername);
@@ -544,6 +548,10 @@ public class ActiveDirectoryAuthority ex
}
}
velocityContext.put("DOMAINCONTROLLERS",domainControllers);
+ String ldapConnectionTimeout =
parameters.getParameter(ActiveDirectoryConfig.PARAM_LDAPCONNECTIONTIMEOUT);
+ if (ldapConnectionTimeout == null)
+ ldapConnectionTimeout = "60000";
+ velocityContext.put("LDAPCONNECTIONTIMEOUT", ldapConnectionTimeout);
}
protected static Map<String,String>
createDomainControllerMap(IPasswordMapperActivity mapper, String suffix, String
domainControllerName,
@@ -576,7 +584,7 @@ public class ActiveDirectoryAuthority ex
cacheLRUsize = "1000";
velocityContext.put("CACHELRUSIZE",cacheLRUsize);
}
-
+
/** Process a configuration post.
* This method is called at the start of the authority connector's
configuration page, whenever there is a possibility that form data for a
connection has been
* posted. Its purpose is to gather form information and modify the
configuration parameters accordingly.
@@ -656,7 +664,9 @@ public class ActiveDirectoryAuthority ex
variableContext.getParameter("dcrecord_userACLsUsername"));
}
}
-
+ String ldapConnectionTimeout =
variableContext.getParameter("ldapconnectiontimeout");
+ if (ldapConnectionTimeout != null)
+
parameters.setParameter(ActiveDirectoryConfig.PARAM_LDAPCONNECTIONTIMEOUT,ldapConnectionTimeout);
String cacheLifetime = variableContext.getParameter("cachelifetime");
if (cacheLifetime != null)
parameters.setParameter(ActiveDirectoryConfig.PARAM_CACHELIFETIME,cacheLifetime);
@@ -833,7 +843,7 @@ public class ActiveDirectoryAuthority ex
}
/** Initialize the session. */
- public LdapContext getSession(String domainControllerName,
DCConnectionParameters params)
+ public LdapContext getSession(String domainControllerName,
DCConnectionParameters params, String ldapConnectionTimeout)
throws ManifoldCFException
{
String authentication = params.getAuthentication();
@@ -858,7 +868,9 @@ public class ActiveDirectoryAuthority ex
//specify attributes to be returned in binary format
env.put("java.naming.ldap.attributes.binary","tokenGroups
objectSid");
-
+
+ env.put("com.sun.jndi.ldap.connect.timeout", ldapConnectionTimeout);
+
// Now, try the connection...
try
{
Modified:
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryConfig.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryConfig.java?rev=1786952&r1=1786951&r2=1786952&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryConfig.java
(original)
+++
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryConfig.java
Tue Mar 14 21:17:50 2017
@@ -41,6 +41,8 @@ public class ActiveDirectoryConfig
public static final String PARAM_CACHELIFETIME = "Cache lifetime";
/** Cache LRU size */
public static final String PARAM_CACHELRUSIZE = "Cache LRU size";
+ /** LDAP connection timeout*/
+ public static final String PARAM_LDAPCONNECTIONTIMEOUT = "LDAP connection
timeout";
/** Domain controller node */
public static final String NODE_DOMAINCONTROLLER = "domaincontroller";
Modified:
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_en_US.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_en_US.properties?rev=1786952&r1=1786951&r2=1786952&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_en_US.properties
(original)
+++
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_en_US.properties
Tue Mar 14 21:17:50 2017
@@ -40,6 +40,9 @@ ActiveDirectoryAuthority.CacheLifetimeMu
ActiveDirectoryAuthority.CacheLRUSizeCannotBeNull=Cache LRU size cannot be null
ActiveDirectoryAuthority.CacheLRUSizeMustBeAnInteger=Cache LRU size must be an
integer
ActiveDirectoryAuthority.certificate=certificate(s)
+ActiveDirectoryAuthority.ConnectionTimeout=Connection timeout:
+ActiveDirectoryAuthority.ConnectionTimeoutMustBeAnInteger=Connection timeout
value must be an integer
+ActiveDirectoryAuthority.milliseconds=milliseconds
Modified:
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_es_ES.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_es_ES.properties?rev=1786952&r1=1786951&r2=1786952&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_es_ES.properties
(original)
+++
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_es_ES.properties
Tue Mar 14 21:17:50 2017
@@ -14,19 +14,19 @@
# limitations under the License.
ActiveDirectoryAuthority.DomainController=Controlador de Dominio
-ActiveDirectoryAuthority.Cache=Caché
+ActiveDirectoryAuthority.Cache=Caché
ActiveDirectoryAuthority.DomainControllers=Controlador de Dominio:
ActiveDirectoryAuthority.DomainControllerName=Nombre del Controlador de Dominio
ActiveDirectoryAuthority.DomainSuffix=Sufijo de Dominio
ActiveDirectoryAuthority.AdministrativeUserName=Nombre de Usuario
Administrativo
-ActiveDirectoryAuthority.AdministrativePassword=Contraseña Administrativa
-ActiveDirectoryAuthority.Authentication=Autenticación
-ActiveDirectoryAuthority.LoginNameADAttribute=Atributo AD Iniciar sesión Nombre
-ActiveDirectoryAuthority.CacheLifetime=Vida útil de la caché:
-ActiveDirectoryAuthority.CacheLRUSize=Tamaño de caché LRU:
+ActiveDirectoryAuthority.AdministrativePassword=Contraseña Administrativa
+ActiveDirectoryAuthority.Authentication=Autenticación
+ActiveDirectoryAuthority.LoginNameADAttribute=Atributo AD Iniciar sesión
Nombre
+ActiveDirectoryAuthority.CacheLifetime=Vida útil de la caché:
+ActiveDirectoryAuthority.CacheLRUSize=Tamaño de caché LRU:
ActiveDirectoryAuthority.minutes=minutos
-ActiveDirectoryAuthority.AddToEnd=Añadir a Terminar
-ActiveDirectoryAuthority.AddRuleToEnd=Añadir regla a final de la lista
+ActiveDirectoryAuthority.AddToEnd=Añadir a Terminar
+ActiveDirectoryAuthority.AddRuleToEnd=Añadir regla a final de la lista
ActiveDirectoryAuthority.Delete=Borrar
ActiveDirectoryAuthority.DeleteRuleNumber=Eliminar regla #
ActiveDirectoryAuthority.InsertBefore=Insertar antes
@@ -34,12 +34,15 @@ ActiveDirectoryAuthority.InsertBeforeRul
ActiveDirectoryAuthority.EnterADomainControllerServerName=Introduzca un nombre
de servidor de controlador de dominio
ActiveDirectoryAuthority.Domain Controller2=Controlador de Dominio
ActiveDirectoryAuthority.AdministrativeUserNameCannotBeNull=Nombre de usuario
administrativo no puede ser nulo
-ActiveDirectoryAuthority.AuthenticationCannotBeNull=Autenticación no puede ser
nulo
-ActiveDirectoryAuthority.CacheLifetimeCannotBeNull=Vida útil de la caché no
puede ser nulo
-ActiveDirectoryAuthority.CacheLifetimeMustBeAnInteger=Vida útil de la caché
debe ser un entero
-ActiveDirectoryAuthority.CacheLRUSizeCannotBeNull=Tamaño de caché LRU no puede
ser nulo
-ActiveDirectoryAuthority.CacheLRUSizeMustBeAnInteger=Tamaño de caché LRU debe
ser un entero
+ActiveDirectoryAuthority.AuthenticationCannotBeNull=Autenticación no puede
ser nulo
+ActiveDirectoryAuthority.CacheLifetimeCannotBeNull=Vida útil de la caché no
puede ser nulo
+ActiveDirectoryAuthority.CacheLifetimeMustBeAnInteger=Vida útil de la caché
debe ser un entero
+ActiveDirectoryAuthority.CacheLRUSizeCannotBeNull=Tamaño de caché LRU no
puede ser nulo
+ActiveDirectoryAuthority.CacheLRUSizeMustBeAnInteger=Tamaño de caché LRU
debe ser un entero
ActiveDirectoryAuthority.certificate=certificado(s)
+ActiveDirectoryAuthority.ConnectionTimeout=Connection timeout:
+ActiveDirectoryAuthority.ConnectionTimeoutMustBeAnInteger=Connection timeout
value must be an integer
+ActiveDirectoryAuthority.milliseconds=milliseconds
Modified:
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_ja_JP.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_ja_JP.properties?rev=1786952&r1=1786951&r2=1786952&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_ja_JP.properties
(original)
+++
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_ja_JP.properties
Tue Mar 14 21:17:50 2017
@@ -40,3 +40,6 @@ ActiveDirectoryAuthority.CacheLifetimeMu
ActiveDirectoryAuthority.CacheLRUSizeCannotBeNull=ãã£ãã·ã¥LRUãµã¤ãºãå
¥åãã¦ãã ãã
ActiveDirectoryAuthority.CacheLRUSizeMustBeAnInteger=ãã£ãã·ã¥LRUãµã¤ãºã«ã¯æ´æ°ãå
¥åãã¦ãã ãã
ActiveDirectoryAuthority.certificate=証ææ¸
+ActiveDirectoryAuthority.ConnectionTimeout=Connection timeout:
+ActiveDirectoryAuthority.ConnectionTimeoutMustBeAnInteger=Connection timeout
value must be an integer
+ActiveDirectoryAuthority.milliseconds=milliseconds
Modified:
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_zh_CN.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_zh_CN.properties?rev=1786952&r1=1786951&r2=1786952&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_zh_CN.properties
(original)
+++
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_zh_CN.properties
Tue Mar 14 21:17:50 2017
@@ -40,3 +40,6 @@ ActiveDirectoryAuthority.CacheLifetimeMu
ActiveDirectoryAuthority.CacheLRUSizeCannotBeNull=请è¾å
¥ç¼åLRU大å°
ActiveDirectoryAuthority.CacheLRUSizeMustBeAnInteger=ç¼åLRU大å°å¿
须为æ´æ°
ActiveDirectoryAuthority.certificate=è¯ä¹¦
+ActiveDirectoryAuthority.ConnectionTimeout=Connection timeout:
+ActiveDirectoryAuthority.ConnectionTimeoutMustBeAnInteger=Connection timeout
value must be an integer
+ActiveDirectoryAuthority.milliseconds=milliseconds
Modified:
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/activedirectory/editConfiguration.js
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/activedirectory/editConfiguration.js?rev=1786952&r1=1786951&r2=1786952&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/activedirectory/editConfiguration.js
(original)
+++
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/activedirectory/editConfiguration.js
Tue Mar 14 21:17:50 2017
@@ -72,6 +72,13 @@ function checkConfigForSave()
editconnection.cachelrusize.focus();
return false;
}
+ if (editconnection.ldapconnectiontimeout.value != "" &&
!isInteger(editconnection.ldapconnectiontimeout.value))
+ {
+
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ActiveDirectoryAuthority.ConnectionTimeoutMustBeAnInteger'))");
+
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ActiveDirectoryAuthority.DomainController'))");
+ editconnection.ldapconnectiontimeout.focus();
+ return false;
+ }
return true;
}
Modified:
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/activedirectory/editConfiguration_DomainController.html
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/activedirectory/editConfiguration_DomainController.html?rev=1786952&r1=1786951&r2=1786952&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/activedirectory/editConfiguration_DomainController.html
(original)
+++
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/activedirectory/editConfiguration_DomainController.html
Tue Mar 14 21:17:50 2017
@@ -110,6 +110,11 @@
</table>
</td>
</tr>
+ <tr><td class="separator" colspan="2"><hr/></td></tr>
+ <tr>
+ <td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.ConnectionTimeout'))</nobr></td>
+ <td class="value"><input type="text" size="5" name="ldapconnectiontimeout"
value="$Encoder.attributeEscape($LDAPCONNECTIONTIMEOUT)"/>
$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.milliseconds'))</td>
+ </tr>
</table>
#else
@@ -128,5 +133,6 @@
#end
<input type="hidden" name="dcrecord_count" value="$dccounter"/>
+<input type="hidden" name="ldapconnectiontimeout"
value="$LDAPCONNECTIONTIMEOUT"/>
#end
Modified:
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/activedirectory/viewConfiguration.html
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/activedirectory/viewConfiguration.html?rev=1786952&r1=1786951&r2=1786952&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/activedirectory/viewConfiguration.html
(original)
+++
manifoldcf/branches/CONNECTORS-1196/connectors/activedirectory/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/activedirectory/viewConfiguration.html
Tue Mar 14 21:17:50 2017
@@ -49,6 +49,11 @@
</tr>
<tr><td class="separator" colspan="2"><hr/></td></tr>
<tr>
+ <td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.ConnectionTimeout'))</nobr></td>
+ <td class="value"><nobr>$Encoder.bodyEscape($LDAPCONNECTIONTIMEOUT)
$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.milliseconds'))</nobr></td>
+ </tr>
+ <tr><td class="separator" colspan="2"><hr/></td></tr>
+ <tr>
<td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.CacheLifetime'))</nobr></td>
<td class="value"><nobr>$Encoder.bodyEscape($CACHELIFETIME)</nobr>
$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.minutes'))</td>
</tr>
@@ -56,4 +61,4 @@
<td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.CacheLRUSize'))</nobr></td>
<td class="value"><nobr>$Encoder.bodyEscape($CACHELRUSIZE)</nobr></td>
</tr>
-</table>
+</table>
\ No newline at end of file
Modified:
manifoldcf/branches/CONNECTORS-1196/connectors/amazoncloudsearch/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/amazoncloudsearch/pom.xml?rev=1786952&r1=1786951&r2=1786952&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/connectors/amazoncloudsearch/pom.xml
(original)
+++ manifoldcf/branches/CONNECTORS-1196/connectors/amazoncloudsearch/pom.xml
Tue Mar 14 21:17:50 2017
@@ -213,17 +213,17 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.1.3</version>
+ <version>2.6.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.3.2</version>
+ <version>2.6.1</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>2.3.0</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>2.6.1</version>
</dependency>
<!-- Testing dependencies -->
Modified:
manifoldcf/branches/CONNECTORS-1196/connectors/amazons3/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/amazons3/AmazonS3Authority.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/amazons3/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/amazons3/AmazonS3Authority.java?rev=1786952&r1=1786951&r2=1786952&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/connectors/amazons3/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/amazons3/AmazonS3Authority.java
(original)
+++
manifoldcf/branches/CONNECTORS-1196/connectors/amazons3/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/amazons3/AmazonS3Authority.java
Tue Mar 14 21:17:50 2017
@@ -195,7 +195,7 @@ public class AmazonS3Authority extends o
String amazons3AccessKey = parameters
.getParameter(AmazonS3Config.AWS_ACCESS_KEY);
String amazons3SecretKey = parameters
- .getParameter(AmazonS3Config.AWS_SECRET_KEY);
+ .getObfuscatedParameter(AmazonS3Config.AWS_SECRET_KEY);
// default values
if (amazons3AccessKey == null)
@@ -338,7 +338,7 @@ public class AmazonS3Authority extends o
if (awsSecretKey != null) {
// set as obfuscated parameter
parameters.setObfuscatedParameter(AmazonS3Config.AWS_SECRET_KEY,
- awsSecretKey);
+ variableContext.mapKeyToPassword(awsSecretKey));
}
Logging.authorityConnectors.info("Saved values for aws keys");
@@ -382,8 +382,8 @@ public class AmazonS3Authority extends o
if (amazons3ProxyPassword != null) {
// set as obfuscated parameter
parameters.setObfuscatedParameter(
- AmazonS3Config.AMAZONS3_PROXY_USERNAME,
- amazons3ProxyUserName);
+ AmazonS3Config.AMAZONS3_PROXY_PASSWORD,
+ variableContext.mapKeyToPassword(amazons3ProxyPassword));
}
return null;
Modified:
manifoldcf/branches/CONNECTORS-1196/connectors/amazons3/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/amazons3/AmazonS3Connector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/amazons3/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/amazons3/AmazonS3Connector.java?rev=1786952&r1=1786951&r2=1786952&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/connectors/amazons3/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/amazons3/AmazonS3Connector.java
(original)
+++
manifoldcf/branches/CONNECTORS-1196/connectors/amazons3/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/amazons3/AmazonS3Connector.java
Tue Mar 14 21:17:50 2017
@@ -265,7 +265,7 @@ public class AmazonS3Connector extends B
String amazons3AccessKey = parameters
.getParameter(AmazonS3Config.AWS_ACCESS_KEY);
String amazons3SecretKey = parameters
- .getParameter(AmazonS3Config.AWS_SECRET_KEY);
+ .getObfuscatedParameter(AmazonS3Config.AWS_SECRET_KEY);
// default values
if (amazons3AccessKey == null)
@@ -415,7 +415,7 @@ public class AmazonS3Connector extends B
if (awsSecretKey != null) {
// set as obfuscated parameter
parameters.setObfuscatedParameter(AmazonS3Config.AWS_SECRET_KEY,
- awsSecretKey);
+ variableContext.mapKeyToPassword(awsSecretKey));
}
// proxy tab
@@ -448,8 +448,8 @@ public class AmazonS3Connector extends B
if (amazons3ProxyPassword != null) {
// set as obfuscated parameter
parameters.setObfuscatedParameter(
- AmazonS3Config.AMAZONS3_PROXY_USERNAME,
- amazons3ProxyUserName);
+ AmazonS3Config.AMAZONS3_PROXY_PASSWORD,
+ variableContext.mapKeyToPassword(amazons3ProxyPassword));
}
return null;
Modified:
manifoldcf/branches/CONNECTORS-1196/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/cmis/CmisAuthorityConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/cmis/CmisAuthorityConnector.java?rev=1786952&r1=1786951&r2=1786952&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/cmis/CmisAuthorityConnector.java
(original)
+++
manifoldcf/branches/CONNECTORS-1196/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/cmis/CmisAuthorityConnector.java
Tue Mar 14 21:17:50 2017
@@ -196,7 +196,7 @@ public class CmisAuthorityConnector exte
+ " alert(\"" +
Messages.getBodyJavascriptString(locale,"CmisAuthorityConnector.TheEndpointMustBeNotNull")
+ "\");\n"
+ " editconnection.endpoint.focus();\n" + " return false;\n"
+ " }\n" + " if (editconnection.repositoryId.value == \"\")\n" + "
{\n"
- + " alert(\"" +
Messages.getBodyJavascriptString(locale,"CmisAuthorityConnector.TheEndpointMustBeNotNull")
+ "\");\n"
+ + " alert(\"" +
Messages.getBodyJavascriptString(locale,"CmisAuthorityConnector.TheRepositoryIDMustBeNotNull")
+ "\");\n"
+ " editconnection.repositoryId.focus();\n" + " return false;\n"
+ " }\n" + " return true;\n" + "}\n" + "\n" + "//-->\n"
+ "</script>\n");
Modified:
manifoldcf/branches/CONNECTORS-1196/connectors/cmis/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/cmis/common_en_US.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/cmis/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/cmis/common_en_US.properties?rev=1786952&r1=1786951&r2=1786952&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/connectors/cmis/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/cmis/common_en_US.properties
(original)
+++
manifoldcf/branches/CONNECTORS-1196/connectors/cmis/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/cmis/common_en_US.properties
Tue Mar 14 21:17:50 2017
@@ -17,6 +17,7 @@ CmisAuthorityConnector.Endpoint=Endpoint
CmisAuthorityConnector.RepositoryID=Repository ID:
CmisAuthorityConnector.UserMapping=User mapping:
CmisAuthorityConnector.TheEndpointMustBeNotNull=The endpoint must be not null
+CmisAuthorityConnector.TheRepositoryIDMustBeNotNull=The repository id must be
not null
CmisAuthorityConnector.Parameters=Parameters:
CmisRepositoryConnector.Server=Server
Modified:
manifoldcf/branches/CONNECTORS-1196/connectors/cmis/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/cmis/common_es_ES.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/cmis/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/cmis/common_es_ES.properties?rev=1786952&r1=1786951&r2=1786952&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/connectors/cmis/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/cmis/common_es_ES.properties
(original)
+++
manifoldcf/branches/CONNECTORS-1196/connectors/cmis/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/cmis/common_es_ES.properties
Tue Mar 14 21:17:50 2017
@@ -15,46 +15,47 @@
# limitations under the License.
CmisAuthorityConnector.Endpoint=Punto final:
-CmisAuthorityConnector.RepositoryID=Depósito ID:
+CmisAuthorityConnector.RepositoryID=Depósito ID:
CmisAuthorityConnector.UserMapping=Trazar un mapa de usuario:
CmisAuthorityConnector.TheEndpointMustBeNotNull=El punto final no debe ser nulo
-CmisAuthorityConnector.Parameters=Parámetros:
+CmisAuthorityConnector.TheRepositoryIDMustBeNotNull=The repository id must be
not null
+CmisAuthorityConnector.Parameters=Parámetros:
CmisRepositoryConnector.Server=Servidor
-CmisRepositoryConnector.BindingColon=Uniòn:
+CmisRepositoryConnector.BindingColon=Uniòn:
CmisRepositoryConnector.UsernameColon=Nombre de usuario:
-CmisRepositoryConnector.PasswordColon=Contraseña:
+CmisRepositoryConnector.PasswordColon=Contraseña:
CmisRepositoryConnector.ProtocolColon=Protocolo:
CmisRepositoryConnector.ServerColon=Servidor:
CmisRepositoryConnector.PortColon=Puerto:
CmisRepositoryConnector.PathColon=Camino:
-CmisRepositoryConnector.RepositoryIDColon=Depósito ID:
+CmisRepositoryConnector.RepositoryIDColon=Depósito ID:
CmisRepositoryConnector.Optional=(opcional)
CmisRepositoryConnector.TheUsernameMustNotBeNull=El nombre de usuario no debe
ser nulo
-CmisRepositoryConnector.ThePasswordMustNotBeNull=La contraseña no debe ser nulo
-CmisRepositoryConnector.TheBindingMustNotBeNull=La unión no debe ser nulo
+CmisRepositoryConnector.ThePasswordMustNotBeNull=La contraseña no debe ser
nulo
+CmisRepositoryConnector.TheBindingMustNotBeNull=La unión no debe ser nulo
CmisRepositoryConnector.ServerNameMustNotBeNull=Nombre del servidor debe ser
no nula
-CmisRepositoryConnector.ServerNameCantContainSlash=Nombre del servidor no
puede contener el carácter '/'
+CmisRepositoryConnector.ServerNameCantContainSlash=Nombre del servidor no
puede contener el carácter '/'
CmisRepositoryConnector.ThePortMustNotBeNull=El puerto debe ser no nula
-CmisRepositoryConnector.TheServerPortMustBeValidInteger=El puerto del servidor
debe ser un entero válido
+CmisRepositoryConnector.TheServerPortMustBeValidInteger=El puerto del servidor
debe ser un entero válido
CmisRepositoryConnector.PathMustNotBeNull=El camino debe ser no nulo
CmisRepositoryConnector.CMISQuery=CMIS consulta
CmisRepositoryConnector.CMISQueryColon=CMIS consulta:
-CmisRepositoryConnector.ParametersColon=Parámetros:
+CmisRepositoryConnector.ParametersColon=Parámetros:
CmisRepositoryConnector.UsernameEquals=nombre de usuario=
-CmisRepositoryConnector.PasswordEquals=contraseña=
-CmisRepositoryConnector.BindingEquals=unión=
+CmisRepositoryConnector.PasswordEquals=contraseña=
+CmisRepositoryConnector.BindingEquals=unión=
CmisRepositoryConnector.ProtocolEquals=protocolo=
CmisRepositoryConnector.ServerEquals=servidor=
CmisRepositoryConnector.PortEquals=puerto=
CmisRepositoryConnector.PathEquals=camino=
-CmisRepositoryConnector.RepositoryIdEquals=Depósito ID=
+CmisRepositoryConnector.RepositoryIdEquals=Depósito ID=
-CmisAuthorityConnector.Repository=Depósito
+CmisAuthorityConnector.Repository=Depósito
CmisAuthorityConnector.UserMapping=Trazar un mapa de usuario
Modified:
manifoldcf/branches/CONNECTORS-1196/connectors/cmis/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/cmis/common_ja_JP.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/cmis/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/cmis/common_ja_JP.properties?rev=1786952&r1=1786951&r2=1786952&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/connectors/cmis/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/cmis/common_ja_JP.properties
(original)
+++
manifoldcf/branches/CONNECTORS-1196/connectors/cmis/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/cmis/common_ja_JP.properties
Tue Mar 14 21:17:50 2017
@@ -17,6 +17,7 @@ CmisAuthorityConnector.Endpoint=ã¨ã
CmisAuthorityConnector.RepositoryID=ãªãã¸ããªIDï¼
CmisAuthorityConnector.UserMapping=ã¦ã¼ã¶ãããã³ã°ï¼
CmisAuthorityConnector.TheEndpointMustBeNotNull=ã¨ã³ããã¤ã³ããnullã§ã
+CmisAuthorityConnector.TheRepositoryIDMustBeNotNull=ãªãã¸ããªidãnullã§ã
CmisAuthorityConnector.Parameters=å¼æ°ï¼
CmisRepositoryConnector.Server=ãµã¼ã
Modified:
manifoldcf/branches/CONNECTORS-1196/connectors/cmis/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/cmis/common_zh_CN.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/cmis/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/cmis/common_zh_CN.properties?rev=1786952&r1=1786951&r2=1786952&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/connectors/cmis/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/cmis/common_zh_CN.properties
(original)
+++
manifoldcf/branches/CONNECTORS-1196/connectors/cmis/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/cmis/common_zh_CN.properties
Tue Mar 14 21:17:50 2017
@@ -17,6 +17,7 @@ CmisAuthorityConnector.Endpoint=端ç
CmisAuthorityConnector.RepositoryID=åå¨åºID:
CmisAuthorityConnector.UserMapping=ç¨æ·æ å°:
CmisAuthorityConnector.TheEndpointMustBeNotNull=端ç¹ä¸è½ä¸ºNull
+CmisAuthorityConnector.TheRepositoryIDMustBeNotNull=åå¨åºidä¸è½ä¸ºNull
CmisAuthorityConnector.Parameters=åæ°:
CmisRepositoryConnector.Server=æå¡å¨
Modified:
manifoldcf/branches/CONNECTORS-1196/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/client/ConfluenceClient.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/client/ConfluenceClient.java?rev=1786952&r1=1786951&r2=1786952&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/client/ConfluenceClient.java
(original)
+++
manifoldcf/branches/CONNECTORS-1196/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/client/ConfluenceClient.java
Tue Mar 14 21:17:50 2017
@@ -201,7 +201,7 @@ public class ConfluenceClient {
connect();
}
- String url = String.format(Locale.ROOT, "%s://%s:%s/%s/%s?limit=1",
protocol, host,
+ String url = String.format(Locale.ROOT, "%s://%s:%s%s%s?limit=1",
protocol, host,
port, path, CONTENT_PATH);
logger.debug(
"[Processing] Hitting url: {} for confluence status check fetching :
",
@@ -296,7 +296,7 @@ public class ConfluenceClient {
@SuppressWarnings("unchecked")
public ConfluenceResponse<Page> getPages(int start, int limit,
Optional<String> space) throws Exception {
- String url = String.format(Locale.ROOT,
"%s://%s:%s/%s/%s?limit=%s&start=%s", protocol,
+ String url = String.format(Locale.ROOT,
"%s://%s:%s%s%s?limit=%s&start=%s", protocol,
host, port, path, CONTENT_PATH, limit, start);
if (space.isPresent()) {
url = String.format(Locale.ROOT, "%s&spaceKey=%s", url, space.get());
@@ -375,7 +375,7 @@ public class ConfluenceClient {
*/
public ConfluenceResponse<Attachment> getPageAttachments(String pageId, int
start,
int limit) throws Exception {
- String url = String.format(Locale.ROOT,
"%s://%s:%s/%s/%s/%s%s?limit=%s&start=%s",
+ String url = String.format(Locale.ROOT,
"%s://%s:%s%s%s/%s%s?limit=%s&start=%s",
protocol, host, port, path, CONTENT_PATH, pageId,
CHILD_ATTACHMENTS_PATH,
limit, start);
@SuppressWarnings("unchecked")
@@ -394,7 +394,7 @@ public class ConfluenceClient {
*/
public Attachment getAttachment(String attachmentId) {
String url = String
- .format(Locale.ROOT, "%s://%s:%s/%s/%s/%s?%s",
+ .format(Locale.ROOT, "%s://%s:%s%s%s/%s?%s",
protocol, host, port, path, CONTENT_PATH, attachmentId,
EXPANDABLE_PARAMETERS);
logger.debug(
"[Processing] Hitting url for getting document content : {}",
@@ -461,7 +461,7 @@ public class ConfluenceClient {
*/
public Page getPage(String pageId) {
String url = String
- .format(Locale.ROOT, "%s://%s:%s/%s/%s/%s?%s",
+ .format(Locale.ROOT, "%s://%s:%s%s%s/%s?%s",
protocol, host, port, path, CONTENT_PATH, pageId,
EXPANDABLE_PARAMETERS);
url = sanitizeUrl(url);
logger.debug(
@@ -497,7 +497,7 @@ public class ConfluenceClient {
boolean isLast = false;
do {
String url = String
- .format(Locale.ROOT, "%s://%s:%s/%s/%s/%s/%s?start=%s&limit=%s",
+ .format(Locale.ROOT, "%s://%s:%s%s%s/%s/%s?start=%s&limit=%s",
protocol, host, port, path, CONTENT_PATH, pageId, LABEL_PATH,
lastStart, limit);
url = sanitizeUrl(url);
logger.debug(
Modified:
manifoldcf/branches/CONNECTORS-1196/connectors/dropbox/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/dropbox/editSpecification.js
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/dropbox/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/dropbox/editSpecification.js?rev=1786952&r1=1786951&r2=1786952&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/connectors/dropbox/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/dropbox/editSpecification.js
(original)
+++
manifoldcf/branches/CONNECTORS-1196/connectors/dropbox/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/dropbox/editSpecification.js
Tue Mar 14 21:17:50 2017
@@ -21,7 +21,7 @@ function s${SeqNum}_checkSpecificationFo
{
if(editjob.s${SeqNum}_dropboxpath.value == "") {
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('DropboxRepositoryConnector.PathMustNotBeNull'))");
-
SelectSequencedTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('DropboxRepositoryConnector.Server'))",${SEQNUM});
+
SelectSequencedTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('DropboxRepositoryConnector.Server'))",${SeqNum});
editjob.s${SeqNum}_dropboxpath.focus();
return false;
}
@@ -51,4 +51,5 @@ function s${SeqNum}_SpecAddToken(i)
}
//-->
-</script>
\ No newline at end of file
+</script>
+
Modified:
manifoldcf/branches/CONNECTORS-1196/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java?rev=1786952&r1=1786951&r2=1786952&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java
(original)
+++
manifoldcf/branches/CONNECTORS-1196/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java
Tue Mar 14 21:17:50 2017
@@ -628,35 +628,51 @@ public class EmailConnector extends org.
} else if
(metadata.toLowerCase(Locale.ROOT).equals(EmailConfig.EMAIL_DATE)) {
rd.addField(EmailConfig.EMAIL_DATE, sentDate.toString());
} else if
(metadata.toLowerCase(Locale.ROOT).equals(EmailConfig.EMAIL_ATTACHMENT_ENCODING))
{
- Multipart mp = (Multipart) msg.getContent();
- if (mp != null) {
- String[] encoding = new String[mp.getCount()];
- for (int k = 0, n = mp.getCount(); k < n; k++) {
- Part part = mp.getBodyPart(k);
- String disposition = part.getDisposition();
- if ((disposition != null) &&
- ((disposition.equals(Part.ATTACHMENT) ||
- (disposition.equals(Part.INLINE))))) {
- encoding[k] = part.getFileName().split("\\?")[1];
-
+ Object o = msg.getContent();
+ if (o != null) {
+ if (o instanceof Multipart) {
+ Multipart mp = (Multipart) o;
+ String[] encoding = new String[mp.getCount()];
+ for (int k = 0, n = mp.getCount(); k < n; k++) {
+ Part part = mp.getBodyPart(k);
+ String disposition = part.getDisposition();
+ if ((disposition != null) &&
+
((disposition.toLowerCase(Locale.ROOT).equals(Part.ATTACHMENT) ||
+
(disposition.toLowerCase(Locale.ROOT).equals(Part.INLINE))))) {
+ final String[] fileSplit =
part.getFileName().split("\\?");
+ if (fileSplit.length > 1) {
+ encoding[k] = fileSplit[1];
+ } else {
+ encoding[k] = "";
+ }
+ }
}
+ rd.addField(EmailConfig.ENCODING_FIELD, encoding);
+ } else if (o instanceof String) {
+ rd.addField(EmailConfig.ENCODING_FIELD, "");
}
- rd.addField(EmailConfig.ENCODING_FIELD, encoding);
}
} else if
(metadata.toLowerCase(Locale.ROOT).equals(EmailConfig.EMAIL_ATTACHMENT_MIMETYPE))
{
- Multipart mp = (Multipart) msg.getContent();
- String[] MIMEType = new String[mp.getCount()];
- for (int k = 0, n = mp.getCount(); k < n; k++) {
- Part part = mp.getBodyPart(k);
- String disposition = part.getDisposition();
- if ((disposition != null) &&
- ((disposition.equals(Part.ATTACHMENT) ||
- (disposition.equals(Part.INLINE))))) {
- MIMEType[k] = part.getContentType();
+ Object o = msg.getContent();
+ if (o != null) {
+ if (o instanceof Multipart) {
+ Multipart mp = (Multipart) o;
+ String[] MIMEType = new String[mp.getCount()];
+ for (int k = 0, n = mp.getCount(); k < n; k++) {
+ Part part = mp.getBodyPart(k);
+ String disposition = part.getDisposition();
+ if ((disposition != null) &&
+
((disposition.toLowerCase(Locale.ROOT).equals(Part.ATTACHMENT) ||
+
(disposition.toLowerCase(Locale.ROOT).equals(Part.INLINE))))) {
+ MIMEType[k] = part.getContentType();
+ }
+ }
+ rd.addField(EmailConfig.MIMETYPE_FIELD, MIMEType);
+ } else if (o instanceof String) {
+ rd.addField(EmailConfig.MIMETYPE_FIELD, "");
}
}
- rd.addField(EmailConfig.MIMETYPE_FIELD, MIMEType);
}
}
Modified:
manifoldcf/branches/CONNECTORS-1196/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/notifications/email/EmailConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/notifications/email/EmailConnector.java?rev=1786952&r1=1786951&r2=1786952&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/notifications/email/EmailConnector.java
(original)
+++
manifoldcf/branches/CONNECTORS-1196/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/notifications/email/EmailConnector.java
Tue Mar 14 21:17:50 2017
@@ -22,16 +22,11 @@ package org.apache.manifoldcf.crawler.no
import org.apache.commons.lang.StringUtils;
import org.apache.manifoldcf.agents.interfaces.ServiceInterruption;
import org.apache.manifoldcf.core.interfaces.*;
-import org.apache.manifoldcf.core.util.URLEncoder;
-import org.apache.manifoldcf.crawler.interfaces.*;
import org.apache.manifoldcf.crawler.system.Logging;
import java.io.*;
import java.util.*;
import javax.mail.*;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.search.*;
/**
*/
@@ -265,7 +260,7 @@ public class EmailConnector extends org.
for (int i = 0; i < spec.getChildCount(); i++) {
SpecificationNode sn = spec.getChild(i);
if (sn.getType().equals(EmailConfig.NODE_TO))
- to.add(sn.getAttributeValue(EmailConfig.ATTRIBUTE_VALUE));
+
to.addAll(splitAtCommaAndTrim(sn.getAttributeValue(EmailConfig.ATTRIBUTE_VALUE)));
else if (sn.getType().equals(EmailConfig.NODE_FROM))
from = sn.getAttributeValue(EmailConfig.ATTRIBUTE_VALUE);
else if (sn.getType().equals(EmailConfig.NODE_SUBJECT))
@@ -282,8 +277,9 @@ public class EmailConnector extends org.
{
for (int j = 0; j < childNode.getChildCount(); j++) {
SpecificationNode sn = childNode.getChild(j);
- if (sn.getType().equals(EmailConfig.NODE_TO))
- to.add(sn.getAttributeValue(EmailConfig.ATTRIBUTE_VALUE));
+ if (sn.getType().equals(EmailConfig.NODE_TO)) {
+
to.addAll(splitAtCommaAndTrim(sn.getAttributeValue(EmailConfig.ATTRIBUTE_VALUE)));
+ }
else if (sn.getType().equals(EmailConfig.NODE_FROM))
from = sn.getAttributeValue(EmailConfig.ATTRIBUTE_VALUE);
else if (sn.getType().equals(EmailConfig.NODE_SUBJECT))
@@ -311,6 +307,14 @@ public class EmailConnector extends org.
handleMessagingException(e,"sending email");
}
}
+
+ private List<String> splitAtCommaAndTrim(String input) {
+ List<String> result = new ArrayList<>();
+ if (input != null) {
+ result.addAll(Arrays.asList(input.split("\\s*,\\s*")));
+ }
+ return result;
+ }
//////////////////////////////End of Notification Connector
Methods///////////////////////////////////
Modified:
manifoldcf/branches/CONNECTORS-1196/connectors/generic/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/generic/GenericAuthority.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/generic/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/generic/GenericAuthority.java?rev=1786952&r1=1786951&r2=1786952&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/connectors/generic/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/generic/GenericAuthority.java
(original)
+++
manifoldcf/branches/CONNECTORS-1196/connectors/generic/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/generic/GenericAuthority.java
Tue Mar 14 21:17:50 2017
@@ -372,7 +372,7 @@ public class GenericAuthority extends or
String login = getParam(parameters, "genericLogin", "");
String password = "";
try {
- password = ManifoldCF.deobfuscate(getParam(parameters,
"genericPassword", ""));
+ password =
out.mapPasswordToKey(ManifoldCF.deobfuscate(getParam(parameters,
"genericPassword", "")));
} catch (ManifoldCFException ignore) {
}
String conTimeout = getParam(parameters, "genericConnectionTimeout",
"60000");
@@ -433,7 +433,7 @@ public class GenericAuthority extends or
if (password == null) {
password = "";
}
- parameters.setParameter("genericPassword",
org.apache.manifoldcf.core.system.ManifoldCF.obfuscate(password));
+ parameters.setParameter("genericPassword",
org.apache.manifoldcf.core.system.ManifoldCF.obfuscate(variableContext.mapKeyToPassword(password)));
return null;
}
Modified:
manifoldcf/branches/CONNECTORS-1196/connectors/generic/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/generic/GenericConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/generic/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/generic/GenericConnector.java?rev=1786952&r1=1786951&r2=1786952&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/connectors/generic/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/generic/GenericConnector.java
(original)
+++
manifoldcf/branches/CONNECTORS-1196/connectors/generic/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/generic/GenericConnector.java
Tue Mar 14 21:17:50 2017
@@ -485,7 +485,7 @@ public class GenericConnector extends Ba
String login = getParam(parameters, "genericLogin", "");
String password = "";
try {
- password = ManifoldCF.deobfuscate(getParam(parameters,
"genericPassword", ""));
+ password =
out.mapPasswordToKey(ManifoldCF.deobfuscate(getParam(parameters,
"genericPassword", "")));
} catch (ManifoldCFException ignore) {
}
String conTimeout = getParam(parameters, "genericConnectionTimeout",
"60000");
@@ -539,7 +539,7 @@ public class GenericConnector extends Ba
if (password == null) {
password = "";
}
- parameters.setParameter("genericPassword", ManifoldCF.obfuscate(password));
+ parameters.setParameter("genericPassword",
ManifoldCF.obfuscate(variableContext.mapKeyToPassword(password)));
return null;
}
Modified:
manifoldcf/branches/CONNECTORS-1196/connectors/gridfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/gridfs/GridFSRepositoryConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/gridfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/gridfs/GridFSRepositoryConnector.java?rev=1786952&r1=1786951&r2=1786952&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/connectors/gridfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/gridfs/GridFSRepositoryConnector.java
(original)
+++
manifoldcf/branches/CONNECTORS-1196/connectors/gridfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/gridfs/GridFSRepositoryConnector.java
Tue Mar 14 21:17:50 2017
@@ -192,7 +192,7 @@ public class GridFSRepositoryConnector e
public void connect(ConfigParams configParams) {
super.connect(configParams);
username = params.getParameter(GridFSConstants.USERNAME_PARAM);
- password = params.getParameter(GridFSConstants.PASSWORD_PARAM);
+ password =
params.getObfuscatedParameter(GridFSConstants.PASSWORD_PARAM);
host = params.getParameter(GridFSConstants.HOST_PARAM);
port = params.getParameter(GridFSConstants.PORT_PARAM);
db = params.getParameter(GridFSConstants.DB_PARAM);
@@ -642,7 +642,7 @@ public class GridFSRepositoryConnector e
String password =
variableContext.getParameter(GridFSConstants.PASSWORD_PARAM);
if (password != null) {
- parameters.setParameter(GridFSConstants.PASSWORD_PARAM,
variableContext.mapKeyToPassword(password));
+ parameters.setObfuscatedParameter(GridFSConstants.PASSWORD_PARAM,
variableContext.mapKeyToPassword(password));
}
String db = variableContext.getParameter(GridFSConstants.DB_PARAM);
@@ -774,8 +774,12 @@ public class GridFSRepositoryConnector e
String usernameParam =
parameters.getParameter(GridFSConstants.USERNAME_PARAM);
paramMap.put(GridFSConstants.USERNAME_PARAM, usernameParam);
- String passwordParam =
parameters.getParameter(GridFSConstants.PASSWORD_PARAM);
- passwordParam = mapper.mapKeyToPassword(passwordParam);
+ String passwordParam =
parameters.getObfuscatedParameter(GridFSConstants.PASSWORD_PARAM);
+ if (passwordParam == null) {
+ passwordParam = StringUtils.EMPTY;
+ } else {
+ passwordParam = mapper.mapPasswordToKey(passwordParam);
+ }
paramMap.put(GridFSConstants.PASSWORD_PARAM, passwordParam);
String dbParam = parameters.getParameter(GridFSConstants.DB_PARAM);
Modified:
manifoldcf/branches/CONNECTORS-1196/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java?rev=1786952&r1=1786951&r2=1786952&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
(original)
+++
manifoldcf/branches/CONNECTORS-1196/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
Tue Mar 14 21:17:50 2017
@@ -2055,6 +2055,7 @@ public class JDBCConnector extends org.a
out.print(
" </table>\n"+
" </td>\n"+
+" </tr>\n"+
" <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"
);
// Find whether security is on or off
