X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FCmsState.java;h=219f2d53c059b58f4032ed11c22d3d9dc5c3812d;hb=5986e55820cba0821f0c16627c4ab144863c82ab;hp=fc9ea7dd71cbefc20b00b871b8a4fb6eecc453ae;hpb=1a0d5ca243bc86a5f54448186178e5fb04c623e9;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsState.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsState.java
index fc9ea7dd7..219f2d53c 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsState.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsState.java
@@ -8,15 +8,14 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
-import javax.transaction.TransactionManager;
-import javax.transaction.UserTransaction;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.api.NodeConstants;
 import org.argeo.api.NodeState;
 import org.argeo.cms.LocaleUtils;
-import org.argeo.transaction.simple.SimpleTransactionManager;
+import org.argeo.osgi.transaction.SimpleTransactionManager;
+import org.argeo.osgi.transaction.WorkControl;
+import org.argeo.osgi.transaction.WorkTransaction;
 import org.argeo.util.LangUtils;
 import org.osgi.framework.Constants;
 import org.osgi.service.cm.ManagedServiceFactory;
@@ -117,8 +116,10 @@ public class CmsState implements NodeState {
 
 	private void initSimpleTransactionManager() {
 		SimpleTransactionManager transactionManager = new SimpleTransactionManager();
-		Activator.registerService(TransactionManager.class, transactionManager, null);
-		Activator.registerService(UserTransaction.class, transactionManager, null);
+		Activator.registerService(WorkControl.class, transactionManager, null);
+		Activator.registerService(WorkTransaction.class, transactionManager, null);
+//		Activator.registerService(TransactionManager.class, transactionManager, null);
+//		Activator.registerService(UserTransaction.class, transactionManager, null);
 		// TODO TransactionSynchronizationRegistry
 	}