Pull up fix for CONNECTORS-1314, and prepare for 2.0.2 release.
git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/integration/elasticsearch-1.5/branches/release-2.0-branch@1743928 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 107b1f8..38f06f8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -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.
diff --git a/pom.xml b/pom.xml
index 0b847b3..734a4af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/src/main/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizer.java b/src/main/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizer.java
index 4cf0e28..59891c7 100644
--- a/src/main/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizer.java
+++ b/src/main/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizer.java
@@ -116,14 +116,14 @@
}
/** 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 @@
}
/** 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 @@
}
/** 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.
*/
