package org.argeo.cms.internal.kernel;
+import static bitronix.tm.TransactionManagerServices.getTransactionManager;
+import static bitronix.tm.TransactionManagerServices.getTransactionSynchronizationRegistry;
+import static org.argeo.cms.internal.kernel.KernelUtils.getFrameworkProp;
+import static org.argeo.cms.internal.kernel.KernelUtils.getOsgiInstancePath;
import static org.argeo.jcr.ArgeoJcrConstants.ALIAS_NODE;
import static org.argeo.jcr.ArgeoJcrConstants.JCR_REPOSITORY_ALIAS;
+import static org.osgi.framework.Constants.FRAMEWORK_UUID;
+import java.io.File;
import java.lang.management.ManagementFactory;
import java.security.PrivilegedAction;
import java.util.HashMap;
import javax.jcr.RepositoryFactory;
import javax.security.auth.Subject;
import javax.transaction.TransactionManager;
+import javax.transaction.TransactionSynchronizationRegistry;
import javax.transaction.UserTransaction;
import org.apache.commons.logging.Log;
import org.argeo.ArgeoException;
import org.argeo.ArgeoLogger;
import org.argeo.cms.CmsException;
-import org.argeo.cms.internal.transaction.SimpleTransactionManager;
import org.argeo.jackrabbit.OsgiJackrabbitRepositoryFactory;
import org.argeo.jcr.ArgeoJcrConstants;
import org.eclipse.equinox.http.servlet.ExtendedHttpService;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.useradmin.UserAdmin;
+import bitronix.tm.BitronixTransactionManager;
+import bitronix.tm.BitronixTransactionSynchronizationRegistry;
+import bitronix.tm.Configuration;
+import bitronix.tm.TransactionManagerServices;
+
/**
* Argeo CMS Kernel. Responsible for :
* <ul>
* <li>OS access</li>
* </ul>
*/
-final class Kernel implements ServiceListener {
+final class Kernel implements KernelConstants, ServiceListener {
/*
* REGISTERED SERVICES
*/
private ServiceRegistration<ArgeoLogger> loggerReg;
private ServiceRegistration<TransactionManager> tmReg;
private ServiceRegistration<UserTransaction> utReg;
- // private ServiceRegistration<TransactionSynchronizationRegistry> tsrReg;
+ private ServiceRegistration<TransactionSynchronizationRegistry> tsrReg;
private ServiceRegistration<Repository> repositoryReg;
private ServiceRegistration<RepositoryFactory> repositoryFactoryReg;
private ServiceRegistration<UserAdmin> userAdminReg;
* SERVICES IMPLEMENTATIONS
*/
private NodeLogger logger;
- private SimpleTransactionManager transactionManager;
+ private BitronixTransactionManager transactionManager;
+ private BitronixTransactionSynchronizationRegistry transactionSynchronizationRegistry;
private OsgiJackrabbitRepositoryFactory repositoryFactory;
NodeRepository repository;
private NodeUserAdmin userAdmin;
try {
// Initialise services
logger = new NodeLogger();
- transactionManager = new SimpleTransactionManager();
+ // transactionManager = new SimpleTransactionManager();
+ initBitronixTransactionManager();
repository = new NodeRepository(bc);
repositoryFactory = new OsgiJackrabbitRepositoryFactory();
userAdmin = new NodeUserAdmin(transactionManager, repository);
directorsCut(initDuration);
}
+ private void initBitronixTransactionManager() {
+ Configuration tmConf = TransactionManagerServices.getConfiguration();
+ tmConf.setServerId(getFrameworkProp(FRAMEWORK_UUID));
+
+ File tmBaseDir = new File(getFrameworkProp(TRANSACTIONS_HOME,
+ getOsgiInstancePath("transactions")));
+ File tmDir1 = new File(tmBaseDir, "btm1");
+ tmDir1.mkdirs();
+ tmConf.setLogPart1Filename(new File(tmDir1, tmDir1.getName() + ".tlog")
+ .getAbsolutePath());
+ File tmDir2 = new File(tmBaseDir, "btm2");
+ tmDir2.mkdirs();
+ tmConf.setLogPart2Filename(new File(tmDir2, tmDir2.getName() + ".tlog")
+ .getAbsolutePath());
+ transactionManager = getTransactionManager();
+ transactionSynchronizationRegistry = getTransactionSynchronizationRegistry();
+ }
+
private void publish() {
// Listen to service publication (also ours)
bc.addServiceListener(Kernel.this);
-
+
// Logging
loggerReg = bc.registerService(ArgeoLogger.class, logger, null);
// Transaction
transactionManager, null);
utReg = bc.registerService(UserTransaction.class, transactionManager,
null);
- // tsrReg = bc.registerService(TransactionSynchronizationRegistry.class,
- // transactionManager.getTsr(), null);
+ tsrReg = bc.registerService(TransactionSynchronizationRegistry.class,
+ transactionSynchronizationRegistry, null);
// User admin
userAdminReg = bc.registerService(UserAdmin.class, userAdmin,
userAdmin.currentState());
userAdmin.destroy();
if (repository != null)
repository.destroy();
+ if (transactionManager != null)
+ transactionManager.shutdown();
bc.removeServiceListener(this);
repositoryReg.unregister();
tmReg.unregister();
utReg.unregister();
+ tsrReg.unregister();
loggerReg.unregister();
}
final static String REPO_SEARCH_CACHE_SIZE = "argeo.node.repo.searchCacheSize";
final static String REPO_MAX_VOLATILE_INDEX_SIZE = "argeo.node.repo.maxVolatileIndexSize";
+ final static String TRANSACTIONS_HOME = "argeo.node.transactions.home";
+
// Node Security
final static String ROLES_URI = "argeo.node.roles.uri";
/** URI to an LDIF file or LDAP server used as initialization or backend */
.getAbsoluteFile();
}
+ static String getOsgiInstancePath(String relativePath) {
+ try {
+ if (relativePath == null)
+ return getOsgiInstanceDir().getCanonicalPath();
+ else
+ return new File(getOsgiInstanceDir(), relativePath)
+ .getCanonicalPath();
+ } catch (IOException e) {
+ throw new CmsException("Cannot get instance path for "
+ + relativePath, e);
+ }
+ }
+
static File getOsgiConfigurationFile(String relativePath) {
try {
return new File(new URI(Activator.getBundleContext().getProperty(
Subject subject = new Subject();
LoginContext lc;
try {
- lc = new LoginContext(AuthConstants.LOGIN_CONTEXT_ANONYMOUS, subject);
+ lc = new LoginContext(AuthConstants.LOGIN_CONTEXT_ANONYMOUS,
+ subject);
lc.login();
return subject;
} catch (LoginException e) {
Import-Package:org.bouncycastle.*;resolution:=optional,\
+bitronix.tm.*;resolution:=optional,\
javax.jcr.security,\
org.apache.commons.codec,\
org.apache.commons.codec.digest,\
import java.util.Arrays;
import java.util.Dictionary;
import java.util.Enumeration;
-import java.util.HashMap;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import javax.naming.InvalidNameException;
import javax.naming.directory.Attributes;
import javax.transaction.SystemException;
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
-import javax.transaction.xa.XAException;
-import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.osgi.framework.Filter;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.InvalidSyntaxException;
/** Base class for a {@link UserDirectory}. */
abstract class AbstractUserDirectory implements UserAdmin, UserDirectory {
- private final static Log log = LogFactory
- .getLog(AbstractUserDirectory.class);
-
private final Hashtable<String, Object> properties;
private final String baseDn;
private final String userObjectClass;
.asList(new String[] { LdifName.userpassword.name() });
private TransactionManager transactionManager;
- private ThreadLocal<WorkingCopy> workingCopy = new ThreadLocal<AbstractUserDirectory.WorkingCopy>();
+ private ThreadLocal<UserDirectoryWorkingCopy> workingCopy = new ThreadLocal<UserDirectoryWorkingCopy>();
private Xid editingTransactionXid = null;
AbstractUserDirectory(Dictionary<String, ?> props) {
return workingCopy.get() != null;
}
- protected WorkingCopy getWorkingCopy() {
- WorkingCopy wc = workingCopy.get();
+ protected UserDirectoryWorkingCopy getWorkingCopy() {
+ UserDirectoryWorkingCopy wc = workingCopy.get();
if (wc == null)
return null;
- if (wc.xid == null) {
+ if (wc.getXid() == null) {
workingCopy.set(null);
return null;
}
throw new UserDirectoryException(
"A transaction needs to be active in order to edit");
if (editingTransactionXid == null) {
- WorkingCopy wc = new WorkingCopy();
+ UserDirectoryWorkingCopy wc = new UserDirectoryWorkingCopy(this);
try {
transaction.enlistResource(wc);
editingTransactionXid = wc.getXid();
}
protected DirectoryUser doGetRole(LdapName dn) {
- WorkingCopy wc = getWorkingCopy();
+ UserDirectoryWorkingCopy wc = getWorkingCopy();
DirectoryUser user = daoGetRole(dn);
if (wc != null) {
if (user == null && wc.getNewUsers().containsKey(dn))
@SuppressWarnings("unchecked")
@Override
public Role[] getRoles(String filter) throws InvalidSyntaxException {
- WorkingCopy wc = getWorkingCopy();
+ UserDirectoryWorkingCopy wc = getWorkingCopy();
Filter f = filter != null ? FrameworkUtil.createFilter(filter) : null;
List<DirectoryUser> res = doGetRoles(f);
if (wc != null) {
@Override
public Role createRole(String name, int type) {
checkEdit();
- WorkingCopy wc = getWorkingCopy();
+ UserDirectoryWorkingCopy wc = getWorkingCopy();
LdapName dn = toDn(name);
if ((daoHasRole(dn) && !wc.getDeletedUsers().containsKey(dn))
|| wc.getNewUsers().containsKey(dn))
@Override
public boolean removeRole(String name) {
checkEdit();
- WorkingCopy wc = getWorkingCopy();
+ UserDirectoryWorkingCopy wc = getWorkingCopy();
LdapName dn = toDn(name);
boolean actuallyDeleted;
if (daoHasRole(dn) || wc.getNewUsers().containsKey(dn)) {
}
// TRANSACTION
- protected void prepare(WorkingCopy wc) {
+ protected void prepare(UserDirectoryWorkingCopy wc) {
}
- protected void commit(WorkingCopy wc) {
+ protected void commit(UserDirectoryWorkingCopy wc) {
}
- protected void rollback(WorkingCopy wc) {
+ protected void rollback(UserDirectoryWorkingCopy wc) {
+
+ }
+ void clearEditingTransactionXid() {
+ editingTransactionXid = null;
}
// UTILITIES
this.transactionManager = transactionManager;
}
- //
- // XA RESOURCE
- //
- protected class WorkingCopy implements XAResource {
- private Xid xid;
- private int transactionTimeout = 0;
-
- private Map<LdapName, DirectoryUser> newUsers = new HashMap<LdapName, DirectoryUser>();
- private Map<LdapName, Attributes> modifiedUsers = new HashMap<LdapName, Attributes>();
- private Map<LdapName, DirectoryUser> deletedUsers = new HashMap<LdapName, DirectoryUser>();
-
- @Override
- public void start(Xid xid, int flags) throws XAException {
- if (editingTransactionXid != null)
- throw new UserDirectoryException("Transaction "
- + editingTransactionXid + " already editing");
- this.xid = xid;
- }
-
- @Override
- public void end(Xid xid, int flags) throws XAException {
- checkXid(xid);
-
- // clean collections
- newUsers.clear();
- newUsers = null;
- modifiedUsers.clear();
- modifiedUsers = null;
- deletedUsers.clear();
- deletedUsers = null;
-
- // clean IDs
- this.xid = null;
- editingTransactionXid = null;
- }
-
- @Override
- public int prepare(Xid xid) throws XAException {
- checkXid(xid);
- if (noModifications())
- return XA_RDONLY;
- try {
- AbstractUserDirectory.this.prepare(this);
- } catch (Exception e) {
- log.error("Cannot prepare " + xid, e);
- throw new XAException(XAException.XA_RBOTHER);
- }
- return XA_OK;
- }
-
- @Override
- public void commit(Xid xid, boolean onePhase) throws XAException {
- checkXid(xid);
- if (noModifications())
- return;
- try {
- if (onePhase)
- AbstractUserDirectory.this.prepare(this);
- AbstractUserDirectory.this.commit(this);
- } catch (Exception e) {
- log.error("Cannot commit " + xid, e);
- throw new XAException(XAException.XA_RBOTHER);
- }
- }
-
- @Override
- public void rollback(Xid xid) throws XAException {
- checkXid(xid);
- try {
- AbstractUserDirectory.this.rollback(this);
- } catch (Exception e) {
- log.error("Cannot rollback " + xid, e);
- throw new XAException(XAException.XA_HEURMIX);
- }
- }
-
- @Override
- public void forget(Xid xid) throws XAException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public boolean isSameRM(XAResource xares) throws XAException {
- return xares == this;
- }
-
- @Override
- public Xid[] recover(int flag) throws XAException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public int getTransactionTimeout() throws XAException {
- return transactionTimeout;
- }
-
- @Override
- public boolean setTransactionTimeout(int seconds) throws XAException {
- transactionTimeout = seconds;
- return true;
- }
-
- private Xid getXid() {
- return xid;
- }
-
- private void checkXid(Xid xid) throws XAException {
- if (this.xid == null)
- throw new XAException(XAException.XAER_OUTSIDE);
- if (!this.xid.equals(xid))
- throw new XAException(XAException.XAER_NOTA);
- }
-
- @Override
- protected void finalize() throws Throwable {
- if (editingTransactionXid != null)
- log.warn("Editing transaction still referenced but no working copy "
- + editingTransactionXid);
- editingTransactionXid = null;
- }
-
- public boolean noModifications() {
- return newUsers.size() == 0 && modifiedUsers.size() == 0
- && deletedUsers.size() == 0;
- }
-
- public Attributes getAttributes(LdapName dn) {
- if (modifiedUsers.containsKey(dn))
- return modifiedUsers.get(dn);
- return null;
- }
-
- public void startEditing(DirectoryUser user) {
- LdapName dn = user.getDn();
- if (modifiedUsers.containsKey(dn))
- throw new UserDirectoryException("Already editing " + dn);
- modifiedUsers.put(dn, (Attributes) user.getAttributes().clone());
- }
-
- public Map<LdapName, DirectoryUser> getNewUsers() {
- return newUsers;
- }
-
- public Map<LdapName, DirectoryUser> getDeletedUsers() {
- return deletedUsers;
- }
-
- public Map<LdapName, Attributes> getModifiedUsers() {
- return modifiedUsers;
- }
-
- }
}
}
@Override
- protected void prepare(WorkingCopy wc) {
+ protected void prepare(UserDirectoryWorkingCopy wc) {
try {
getLdapContext().reconnect(getLdapContext().getConnectControls());
// delete
}
@Override
- protected void commit(WorkingCopy wc) {
+ protected void commit(UserDirectoryWorkingCopy wc) {
try {
// delete
for (LdapName dn : wc.getDeletedUsers().keySet()) {
}
@Override
- protected void rollback(WorkingCopy wc) {
+ protected void rollback(UserDirectoryWorkingCopy wc) {
// prepare not impacting
}
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.codec.digest.DigestUtils;
-import org.argeo.osgi.useradmin.AbstractUserDirectory.WorkingCopy;
/** Directory user implementation */
class LdifUser implements DirectoryUser {
return getWc() != null && getModifiedAttributes() != null;
}
- private synchronized WorkingCopy getWc() {
+ private synchronized UserDirectoryWorkingCopy getWc() {
return userAdmin.getWorkingCopy();
}
}
@Override
- protected void prepare(WorkingCopy wc) {
+ protected void prepare(UserDirectoryWorkingCopy wc) {
// delete
for (LdapName dn : wc.getDeletedUsers().keySet()) {
if (users.containsKey(dn))
}
@Override
- protected void commit(WorkingCopy wc) {
+ protected void commit(UserDirectoryWorkingCopy wc) {
save();
}
@Override
- protected void rollback(WorkingCopy wc) {
+ protected void rollback(UserDirectoryWorkingCopy wc) {
init();
}
--- /dev/null
+package org.argeo.osgi.useradmin;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.naming.directory.Attributes;
+import javax.naming.ldap.LdapName;
+import javax.transaction.xa.XAException;
+import javax.transaction.xa.XAResource;
+import javax.transaction.xa.Xid;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import bitronix.tm.resource.ehcache.EhCacheXAResourceProducer;
+
+/** {@link XAResource} for a user directory being edited. */
+class UserDirectoryWorkingCopy implements XAResource {
+ private final static Log log = LogFactory
+ .getLog(UserDirectoryWorkingCopy.class);
+ private final String cacheName = getClass().getName();
+
+ private final AbstractUserDirectory userDirectory;
+
+ private Xid xid;
+ private int transactionTimeout = 0;
+
+ private Map<LdapName, DirectoryUser> newUsers = new HashMap<LdapName, DirectoryUser>();
+ private Map<LdapName, Attributes> modifiedUsers = new HashMap<LdapName, Attributes>();
+ private Map<LdapName, DirectoryUser> deletedUsers = new HashMap<LdapName, DirectoryUser>();
+
+ public UserDirectoryWorkingCopy(AbstractUserDirectory userDirectory) {
+ this.userDirectory = userDirectory;
+ try {
+ // FIXME Make it less bitronix dependant
+ EhCacheXAResourceProducer.registerXAResource(cacheName, this);
+ } catch (Exception e) {
+ log.error("Cannot register resource to Bitronix", e);
+ }
+ }
+
+ @Override
+ public void start(Xid xid, int flags) throws XAException {
+ this.xid = xid;
+ }
+
+ @Override
+ public void end(Xid xid, int flags) throws XAException {
+ checkXid(xid);
+
+ }
+
+ private void cleanUp() {
+ // clean collections
+ newUsers.clear();
+ newUsers = null;
+ modifiedUsers.clear();
+ modifiedUsers = null;
+ deletedUsers.clear();
+ deletedUsers = null;
+
+ // clean IDs
+ this.xid = null;
+ userDirectory.clearEditingTransactionXid();
+
+ try {
+ // FIXME Make it less bitronix dependant
+ EhCacheXAResourceProducer.unregisterXAResource(cacheName, this);
+ } catch (Exception e) {
+ log.error("Cannot unregister resource from Bitronix", e);
+ }
+ }
+
+ @Override
+ public int prepare(Xid xid) throws XAException {
+ checkXid(xid);
+ if (noModifications())
+ return XA_RDONLY;
+ try {
+ userDirectory.prepare(this);
+ } catch (Exception e) {
+ log.error("Cannot prepare " + xid, e);
+ throw new XAException(XAException.XA_RBOTHER);
+ }
+ return XA_OK;
+ }
+
+ @Override
+ public void commit(Xid xid, boolean onePhase) throws XAException {
+ try {
+ checkXid(xid);
+ if (noModifications())
+ return;
+ if (onePhase)
+ userDirectory.prepare(this);
+ userDirectory.commit(this);
+ } catch (Exception e) {
+ log.error("Cannot commit " + xid, e);
+ throw new XAException(XAException.XA_RBOTHER);
+ } finally {
+ cleanUp();
+ }
+ }
+
+ @Override
+ public void rollback(Xid xid) throws XAException {
+ try {
+ checkXid(xid);
+ userDirectory.rollback(this);
+ } catch (Exception e) {
+ log.error("Cannot rollback " + xid, e);
+ throw new XAException(XAException.XA_HEURMIX);
+ } finally {
+ cleanUp();
+ }
+ }
+
+ @Override
+ public void forget(Xid xid) throws XAException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public boolean isSameRM(XAResource xares) throws XAException {
+ return xares == this;
+ }
+
+ @Override
+ public Xid[] recover(int flag) throws XAException {
+ return new Xid[0];
+ }
+
+ @Override
+ public int getTransactionTimeout() throws XAException {
+ return transactionTimeout;
+ }
+
+ @Override
+ public boolean setTransactionTimeout(int seconds) throws XAException {
+ transactionTimeout = seconds;
+ return true;
+ }
+
+ Xid getXid() {
+ return xid;
+ }
+
+ private void checkXid(Xid xid) throws XAException {
+ if (this.xid == null)
+ throw new XAException(XAException.XAER_OUTSIDE);
+ if (!this.xid.equals(xid))
+ throw new XAException(XAException.XAER_NOTA);
+ }
+
+ public boolean noModifications() {
+ return newUsers.size() == 0 && modifiedUsers.size() == 0
+ && deletedUsers.size() == 0;
+ }
+
+ public Attributes getAttributes(LdapName dn) {
+ if (modifiedUsers.containsKey(dn))
+ return modifiedUsers.get(dn);
+ return null;
+ }
+
+ public void startEditing(DirectoryUser user) {
+ LdapName dn = user.getDn();
+ if (modifiedUsers.containsKey(dn))
+ throw new UserDirectoryException("Already editing " + dn);
+ modifiedUsers.put(dn, (Attributes) user.getAttributes().clone());
+ }
+
+ public Map<LdapName, DirectoryUser> getNewUsers() {
+ return newUsers;
+ }
+
+ public Map<LdapName, DirectoryUser> getDeletedUsers() {
+ return deletedUsers;
+ }
+
+ public Map<LdapName, Attributes> getModifiedUsers() {
+ return modifiedUsers;
+ }
+
+}
<version.argeo-commons>2.1.29-SNAPSHOT</version.argeo-commons>
<developmentCycle.argeo-commons>2.1</developmentCycle.argeo-commons>
<developmentCycle.argeo-commons.startDate>2012-12-19</developmentCycle.argeo-commons.startDate>
- <version.argeo-distribution>2.1.10</version.argeo-distribution>
+ <version.argeo-distribution>2.1.11</version.argeo-distribution>
<!-- RPM -->
<rpm.release>6</rpm.release>
<rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/6/x86_64</rpm.stagingRepository>
projects / lgpl / argeo-commons.git / commitdiff