You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2016/05/15 17:53:15 UTC
svn commit: r1743928 - in
/manifoldcf/integration/elasticsearch-1.5/branches/release-2.0-branch: ./
CHANGES.txt pom.xml
src/main/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizer.java
Author: kwright
Date: Sun May 15 17:53:15 2016
New Revision: 1743928
URL: http://svn.apache.org/viewvc?rev=1743928&view=rev
Log:
Pull up fix for CONNECTORS-1314, and prepare for 2.0.2 release.
Modified:
manifoldcf/integration/elasticsearch-1.5/branches/release-2.0-branch/ (props changed)
manifoldcf/integration/elasticsearch-1.5/branches/release-2.0-branch/CHANGES.txt
manifoldcf/integration/elasticsearch-1.5/branches/release-2.0-branch/pom.xml
manifoldcf/integration/elasticsearch-1.5/branches/release-2.0-branch/src/main/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizer.java
Propchange: manifoldcf/integration/elasticsearch-1.5/branches/release-2.0-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun May 15 17:53:15 2016
@@ -1 +1 @@
-/manifoldcf/integration/elasticsearch-1.5/trunk:1688749,1696109,1696112
+/manifoldcf/integration/elasticsearch-1.5/trunk:1688749,1696109,1696112,1743926
Modified: manifoldcf/integration/elasticsearch-1.5/branches/release-2.0-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/integration/elasticsearch-1.5/branches/release-2.0-branch/CHANGES.txt?rev=1743928&r1=1743927&r2=1743928&view=diff
==============================================================================
--- manifoldcf/integration/elasticsearch-1.5/branches/release-2.0-branch/CHANGES.txt (original)
+++ manifoldcf/integration/elasticsearch-1.5/branches/release-2.0-branch/CHANGES.txt Sun May 15 17:53:15 2016
@@ -1,6 +1,10 @@
Apache ManifoldCF Plugin for Elastic Search change Log
$Id$
+======================= Release 2.0.2 =====================
+
+CONNECTORS-1314: Use ":" as mcf user name / mcf domain name separator instead of "@".
+
======================= Release 2.0.1 =====================
CONNECTORS-1228: Fix default values so they are correct.
Modified: manifoldcf/integration/elasticsearch-1.5/branches/release-2.0-branch/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/integration/elasticsearch-1.5/branches/release-2.0-branch/pom.xml?rev=1743928&r1=1743927&r2=1743928&view=diff
==============================================================================
--- manifoldcf/integration/elasticsearch-1.5/branches/release-2.0-branch/pom.xml (original)
+++ manifoldcf/integration/elasticsearch-1.5/branches/release-2.0-branch/pom.xml Sun May 15 17:53:15 2016
@@ -31,7 +31,7 @@
<name>ManifoldCF ElasticSearch Plugin</name>
<artifactId>elasticsearch-1.5-plugin-mcf</artifactId>
- <version>2.0.1</version>
+ <version>2.0.2</version>
<packaging>jar</packaging>
<description>ManifoldCF Plugin for ElasticSearch 1.5</description>
<inceptionYear>2015</inceptionYear>
Modified: manifoldcf/integration/elasticsearch-1.5/branches/release-2.0-branch/src/main/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizer.java
URL: http://svn.apache.org/viewvc/manifoldcf/integration/elasticsearch-1.5/branches/release-2.0-branch/src/main/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizer.java?rev=1743928&r1=1743927&r2=1743928&view=diff
==============================================================================
--- manifoldcf/integration/elasticsearch-1.5/branches/release-2.0-branch/src/main/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizer.java (original)
+++ manifoldcf/integration/elasticsearch-1.5/branches/release-2.0-branch/src/main/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizer.java Sun May 15 17:53:15 2016
@@ -116,14 +116,14 @@ public class MCFAuthorizer
}
/** Main method for building a filter representing appropriate security.
- *@param authenticatedUserNamesAndDomains is a list of user names and its domains in the form "user@domain".
+ *@param authenticatedUserNamesAndDomains is a list of user names and its domains in the form "user:mcfdomain".
*@return the filter builder.
*/
public FilterBuilder buildAuthorizationFilter(String[] authenticatedUserNamesAndDomains)
throws MCFAuthorizerException{
Map<String,String> domainMap = new HashMap<String,String>();
for(String buffer : authenticatedUserNamesAndDomains){
- String[] authenticatedUserNameAndDomain = buffer.split("@", 2);
+ String[] authenticatedUserNameAndDomain = buffer.split(":", 2);
String authenticatedUserName = authenticatedUserNameAndDomain[0];
String authenticatedUserDomain;
if(authenticatedUserNameAndDomain.length<2) authenticatedUserDomain="";
@@ -166,7 +166,7 @@ public class MCFAuthorizer
}
/** Main method for building a filter representing appropriate security.
- *@param authenticatedUserName is a user name in the form "user@domain".
+ *@param authenticatedUserName is a user name in the form "user:mcfdomain".
*@return the filter builder.
*/
public FilterBuilder buildAuthorizationFilter(String authenticatedUserName)
@@ -176,7 +176,7 @@ public class MCFAuthorizer
}
/** Main method for building a filter representing appropriate security.
- *@param authenticatedUserName is a user name in the form "user@domain".
+ *@param authenticatedUserName is a user name in the form "user".
*@param authenticatedUserDomain is the corresponding MCF authorization domain.
*@return the filter builder.
*/