accept namespace when reading groups from csv
diff --git a/src/com/google/enterprise/adaptor/examples/GroupDefinitionsFromCsv.java b/src/com/google/enterprise/adaptor/examples/GroupDefinitionsFromCsv.java
index 25b301f..dd15af1 100644
--- a/src/com/google/enterprise/adaptor/examples/GroupDefinitionsFromCsv.java
+++ b/src/com/google/enterprise/adaptor/examples/GroupDefinitionsFromCsv.java
@@ -44,11 +44,13 @@
private File csvFile;
private String domain;
+ private String namespace;
@Override
public void initConfig(Config config) {
config.addKey("csv.filename", null);
config.addKey("csv.domain", null);
+ config.addKey("csv.namespace", Principal.DEFAULT_NAMESPACE);
}
@Override
@@ -59,6 +61,7 @@
throw new IllegalStateException("cannot find file: " + fname);
}
domain = context.getConfig().getValue("csv.domain");
+ namespace = context.getConfig().getValue("csv.namespace");
}
@Override
@@ -118,12 +121,12 @@
String name = makeName(id);
boolean entityIsGroup = src.containsKey(id);
if (entityIsGroup) {
- entities.add(new GroupPrincipal(name));
+ entities.add(new GroupPrincipal(name, namespace));
} else {
- entities.add(new UserPrincipal(name));
+ entities.add(new UserPrincipal(name, namespace));
}
}
- dest.put(new GroupPrincipal(makeName(e.getKey())), entities);
+ dest.put(new GroupPrincipal(makeName(e.getKey()), namespace), entities);
}
return dest;
}