package org.argeo.cms.acr.fs;
-import java.lang.System.Logger;
-import java.lang.System.Logger.Level;
import java.nio.file.Path;
import java.util.Objects;
+import org.argeo.api.cms.CmsLog;
+
/** Synchronises two directory structures. */
public class SyncFileVisitor extends BasicSyncFileVisitor {
- private final static Logger logger = System.getLogger(SyncFileVisitor.class.getName());
+ private final static CmsLog log = CmsLog.getLog(SyncFileVisitor.class);
public SyncFileVisitor(Path sourceBasePath, Path targetBasePath, boolean delete, boolean recursive) {
super(sourceBasePath, targetBasePath, delete, recursive);
@Override
protected void error(Object obj, Throwable e) {
- logger.log(Level.ERROR, Objects.toString(obj), e);
+ log.error(Objects.toString(obj), e);
}
@Override
protected boolean isTraceEnabled() {
- return logger.isLoggable(Level.TRACE);
+ return log.isTraceEnabled();
}
@Override
protected void trace(Object obj) {
- logger.log(Level.TRACE, Objects.toString(obj));
+ log.error(Objects.toString(obj));
}
}
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.lang.System.Logger;
-import java.lang.System.Logger.Level;
import java.nio.file.DirectoryStream;
import java.nio.file.Files;
import java.nio.file.Path;
* versioning system).
*/
public class XmlNormalizer {
- private final static Logger logger = System.getLogger(XmlNormalizer.class.getName());
+// private final static Logger logger = System.getLogger(XmlNormalizer.class.getName());
private DocumentBuilder documentBuilder;
private Transformer transformer;
try (ByteArrayInputStream in = new ByteArrayInputStream(bytes);
OutputStream out = Files.newOutputStream(path)) {
normalizeAndIndent(in, out);
- logger.log(Level.DEBUG, () -> "Normalized XML " + path);
+// logger.log(Level.DEBUG, () -> "Normalized XML " + path);
}
}
/** Manages the LDIF-based deployment configuration. */
public class DeployConfig {
- private final static LdapName USER_ADMIN_BASE_DN;
- static {
- try {
- USER_ADMIN_BASE_DN = new LdapName(
- CmsConstants.OU + "=" + CmsConstants.NODE_USER_ADMIN_PID + "," + CmsConstants.DEPLOY_BASEDN);
- } catch (InvalidNameException e) {
- throw new IllegalArgumentException(e);
- }
- }
private final CmsLog log = CmsLog.getLog(getClass());
// private final BundleContext bc = FrameworkUtil.getBundle(getClass()).getBundleContext();
}
public Set<Dictionary<String, Object>> getUserDirectoryConfigs() {
+ // not static because class is not supported by Android
+ final LdapName USER_ADMIN_BASE_DN;
+ try {
+ USER_ADMIN_BASE_DN = new LdapName(
+ CmsConstants.OU + "=" + CmsConstants.NODE_USER_ADMIN_PID + "," + CmsConstants.DEPLOY_BASEDN);
+ } catch (InvalidNameException e) {
+ throw new IllegalArgumentException(e);
+ }
Set<Dictionary<String, Object>> res = new HashSet<>();
for (LdapName dn : deployConfigs.keySet()) {
if (dn.endsWith(USER_ADMIN_BASE_DN)) {
* Aggregates multiple {@link UserDirectory} and integrates them with system
* roles.
*/
-public class CmsUserAdmin extends AggregatingUserAdmin {
+public class CmsUserAdmin extends AggregatingUserAdmin {
private final static CmsLog log = CmsLog.getLog(CmsUserAdmin.class);
// GSS API
public void stop() {
}
-
+
public UserDirectory enableUserDirectory(Dictionary<String, ?> properties) {
String uri = (String) properties.get(UserAdminConf.uri.name());
Object realm = properties.get(UserAdminConf.realm.name());
addUserDirectory(userDirectory);
if (isSystemRolesBaseDn(baseDn)) {
addStandardSystemRoles();
- }
+ }
if (log.isDebugEnabled()) {
log.debug("User directory " + userDirectory.getBaseDn() + (u != null ? " [" + u.getScheme() + "]" : "")
+ " enabled." + (realm != null ? " " + realm + " realm." : ""));
return userDirectory;
}
-
protected void addStandardSystemRoles() {
// we assume UserTransaction is already available (TODO make it more robust)
try {
}
}
-
@Override
protected void addAbstractSystemRoles(Authorization rawAuthorization, Set<String> sysRoles) {
if (rawAuthorization.getName() == null) {
}
private GSSCredential logInAsAcceptor(Subject subject, String servicePrincipal) {
+ // not static because class is not supported by Android
+ final Oid KERBEROS_OID;
+ try {
+ KERBEROS_OID = new Oid("1.3.6.1.5.5.2");
+ } catch (GSSException e) {
+ throw new IllegalStateException("Cannot create Kerberos OID", e);
+ }
// GSS
Iterator<KerberosPrincipal> krb5It = subject.getPrincipals(KerberosPrincipal.class).iterator();
if (!krb5It.hasNext())
* STATIC
*/
- public final static Oid KERBEROS_OID;
- static {
- try {
- KERBEROS_OID = new Oid("1.3.6.1.5.5.2");
- } catch (GSSException e) {
- throw new IllegalStateException("Cannot create Kerberos OID", e);
- }
- }
}