From 4672ec9d1071dffc7c591f623898d32a31637d04 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 22 Jun 2022 07:07:49 +0200 Subject: [PATCH] Rename transaction package --- .../src/org/argeo/cms/e4/handlers/ChangePassword.java | 2 +- .../src/org/argeo/cms/e4/users/GroupEditor.java | 2 +- .../src/org/argeo/cms/e4/users/UiAdminUtils.java | 2 +- .../src/org/argeo/cms/e4/users/UserAdminWrapper.java | 2 +- .../src/org/argeo/cms/e4/users/UserBatchUpdateWizard.java | 2 +- .../org/argeo/maintenance/AbstractMaintenanceService.java | 2 +- .../src/org/argeo/maintenance/SimpleRoleRegistration.java | 2 +- .../src/org/argeo/cms/internal/auth/CmsUserManagerImpl.java | 2 +- .../src/org/argeo/cms/internal/runtime/CmsUserAdmin.java | 4 ++-- org.argeo.cms/src/org/argeo/cms/runtime/StaticCms.java | 6 +++--- .../src/org/argeo/osgi/useradmin/AbstractUserDirectory.java | 2 +- .../src/org/argeo/osgi/useradmin/UserDirectory.java | 2 +- .../argeo/{osgi => util}/transaction/JtaStatusAdapter.java | 2 +- .../{osgi => util}/transaction/SimpleRollbackException.java | 2 +- .../argeo/{osgi => util}/transaction/SimpleTransaction.java | 2 +- .../transaction/SimpleTransactionManager.java | 2 +- .../transaction/TransactionStatusAdapter.java | 2 +- .../src/org/argeo/{osgi => util}/transaction/UuidXid.java | 2 +- .../org/argeo/{osgi => util}/transaction/WorkContext.java | 2 +- .../org/argeo/{osgi => util}/transaction/WorkControl.java | 2 +- .../argeo/{osgi => util}/transaction/WorkTransaction.java | 2 +- .../org/argeo/{osgi => util}/transaction/package-info.java | 2 +- 22 files changed, 25 insertions(+), 25 deletions(-) rename org.argeo.util/src/org/argeo/{osgi => util}/transaction/JtaStatusAdapter.java (97%) rename org.argeo.util/src/org/argeo/{osgi => util}/transaction/SimpleRollbackException.java (89%) rename org.argeo.util/src/org/argeo/{osgi => util}/transaction/SimpleTransaction.java (99%) rename org.argeo.util/src/org/argeo/{osgi => util}/transaction/SimpleTransactionManager.java (99%) rename org.argeo.util/src/org/argeo/{osgi => util}/transaction/TransactionStatusAdapter.java (91%) rename org.argeo.util/src/org/argeo/{osgi => util}/transaction/UuidXid.java (98%) rename org.argeo.util/src/org/argeo/{osgi => util}/transaction/WorkContext.java (87%) rename org.argeo.util/src/org/argeo/{osgi => util}/transaction/WorkControl.java (88%) rename org.argeo.util/src/org/argeo/{osgi => util}/transaction/WorkTransaction.java (87%) rename org.argeo.util/src/org/argeo/{osgi => util}/transaction/package-info.java (66%) diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/ChangePassword.java b/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/ChangePassword.java index 0ecd0a155..a6cdcf620 100644 --- a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/ChangePassword.java +++ b/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/ChangePassword.java @@ -17,7 +17,7 @@ import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.security.CryptoKeyring; import org.argeo.cms.swt.dialogs.CmsMessageDialog; import org.argeo.eclipse.ui.dialogs.ErrorFeedback; -import org.argeo.osgi.transaction.WorkTransaction; +import org.argeo.util.transaction.WorkTransaction; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.jface.dialogs.Dialog; diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupEditor.java b/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupEditor.java index a011c5f62..d54f8bc38 100644 --- a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupEditor.java +++ b/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupEditor.java @@ -32,8 +32,8 @@ import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.parts.LdifUsersTable; import org.argeo.jcr.JcrException; import org.argeo.jcr.JcrUtils; -import org.argeo.osgi.transaction.WorkTransaction; import org.argeo.util.naming.LdapAttrs; +import org.argeo.util.transaction.WorkTransaction; import org.eclipse.e4.ui.workbench.modeling.EPartService; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.ToolBarManager; diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UiAdminUtils.java b/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UiAdminUtils.java index f85649260..fb48a47c3 100644 --- a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UiAdminUtils.java +++ b/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UiAdminUtils.java @@ -1,6 +1,6 @@ package org.argeo.cms.e4.users; -import org.argeo.osgi.transaction.WorkTransaction; +import org.argeo.util.transaction.WorkTransaction; /** First effort to centralize back end methods used by the user admin UI */ public class UiAdminUtils { diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserAdminWrapper.java b/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserAdminWrapper.java index 934b880cd..cd8d4d7dc 100644 --- a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserAdminWrapper.java +++ b/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserAdminWrapper.java @@ -10,9 +10,9 @@ import java.util.Map; import org.argeo.api.cms.CmsConstants; import org.argeo.cms.CmsException; -import org.argeo.osgi.transaction.WorkTransaction; import org.argeo.osgi.useradmin.UserAdminConf; import org.argeo.osgi.useradmin.UserDirectory; +import org.argeo.util.transaction.WorkTransaction; import org.osgi.service.useradmin.UserAdmin; import org.osgi.service.useradmin.UserAdminEvent; import org.osgi.service.useradmin.UserAdminListener; diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserBatchUpdateWizard.java b/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserBatchUpdateWizard.java index a38d171ef..01ccc7d73 100644 --- a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserBatchUpdateWizard.java +++ b/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserBatchUpdateWizard.java @@ -17,9 +17,9 @@ import org.argeo.cms.e4.users.providers.UserNameLP; import org.argeo.eclipse.ui.ColumnDefinition; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.parts.LdifUsersTable; -import org.argeo.osgi.transaction.WorkTransaction; import org.argeo.util.naming.LdapAttrs; import org.argeo.util.naming.LdapObjs; +import org.argeo.util.transaction.WorkTransaction; import org.eclipse.jface.dialogs.IPageChangeProvider; import org.eclipse.jface.dialogs.IPageChangedListener; import org.eclipse.jface.dialogs.MessageDialog; diff --git a/jcr/org.argeo.cms.jcr/src/org/argeo/maintenance/AbstractMaintenanceService.java b/jcr/org.argeo.cms.jcr/src/org/argeo/maintenance/AbstractMaintenanceService.java index 3c8f296c4..8e2ac8960 100644 --- a/jcr/org.argeo.cms.jcr/src/org/argeo/maintenance/AbstractMaintenanceService.java +++ b/jcr/org.argeo.cms.jcr/src/org/argeo/maintenance/AbstractMaintenanceService.java @@ -14,8 +14,8 @@ import org.argeo.api.cms.CmsLog; import org.argeo.cms.jcr.CmsJcrUtils; import org.argeo.jcr.Jcr; import org.argeo.jcr.JcrUtils; -import org.argeo.osgi.transaction.WorkTransaction; import org.argeo.util.naming.Distinguished; +import org.argeo.util.transaction.WorkTransaction; import org.osgi.service.useradmin.Group; import org.osgi.service.useradmin.Role; import org.osgi.service.useradmin.UserAdmin; diff --git a/jcr/org.argeo.cms.jcr/src/org/argeo/maintenance/SimpleRoleRegistration.java b/jcr/org.argeo.cms.jcr/src/org/argeo/maintenance/SimpleRoleRegistration.java index ebb8c534d..e65e46a4e 100644 --- a/jcr/org.argeo.cms.jcr/src/org/argeo/maintenance/SimpleRoleRegistration.java +++ b/jcr/org.argeo.cms.jcr/src/org/argeo/maintenance/SimpleRoleRegistration.java @@ -8,7 +8,7 @@ import javax.naming.InvalidNameException; import javax.naming.ldap.LdapName; import org.argeo.api.cms.CmsLog; -import org.argeo.osgi.transaction.WorkTransaction; +import org.argeo.util.transaction.WorkTransaction; import org.osgi.service.useradmin.Role; import org.osgi.service.useradmin.UserAdmin; diff --git a/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsUserManagerImpl.java b/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsUserManagerImpl.java index e69cda644..9b7a2ed42 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsUserManagerImpl.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsUserManagerImpl.java @@ -31,13 +31,13 @@ import org.argeo.api.cms.CmsLog; import org.argeo.cms.CmsUserManager; import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.auth.UserAdminUtils; -import org.argeo.osgi.transaction.WorkTransaction; import org.argeo.osgi.useradmin.TokenUtils; import org.argeo.osgi.useradmin.UserAdminConf; import org.argeo.osgi.useradmin.UserDirectory; import org.argeo.util.naming.LdapAttrs; import org.argeo.util.naming.NamingUtils; import org.argeo.util.naming.SharedSecret; +import org.argeo.util.transaction.WorkTransaction; import org.osgi.framework.InvalidSyntaxException; import org.osgi.service.useradmin.Authorization; import org.osgi.service.useradmin.Group; diff --git a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsUserAdmin.java b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsUserAdmin.java index 10cb98dd3..965330237 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsUserAdmin.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsUserAdmin.java @@ -33,8 +33,6 @@ import org.argeo.api.cms.CmsConstants; import org.argeo.api.cms.CmsLog; import org.argeo.cms.internal.http.client.HttpCredentialProvider; import org.argeo.cms.internal.http.client.SpnegoAuthScheme; -import org.argeo.osgi.transaction.WorkControl; -import org.argeo.osgi.transaction.WorkTransaction; import org.argeo.osgi.useradmin.AggregatingUserAdmin; import org.argeo.osgi.useradmin.LdapUserAdmin; import org.argeo.osgi.useradmin.LdifUserAdmin; @@ -42,6 +40,8 @@ import org.argeo.osgi.useradmin.OsUserDirectory; import org.argeo.osgi.useradmin.UserAdminConf; import org.argeo.osgi.useradmin.UserDirectory; import org.argeo.util.naming.dns.DnsBrowser; +import org.argeo.util.transaction.WorkControl; +import org.argeo.util.transaction.WorkTransaction; import org.ietf.jgss.GSSCredential; import org.ietf.jgss.GSSException; import org.ietf.jgss.GSSManager; diff --git a/org.argeo.cms/src/org/argeo/cms/runtime/StaticCms.java b/org.argeo.cms/src/org/argeo/cms/runtime/StaticCms.java index a44c5d4fd..a1b8c5401 100644 --- a/org.argeo.cms/src/org/argeo/cms/runtime/StaticCms.java +++ b/org.argeo.cms/src/org/argeo/cms/runtime/StaticCms.java @@ -21,12 +21,12 @@ import org.argeo.cms.internal.runtime.CmsDeploymentImpl; import org.argeo.cms.internal.runtime.CmsStateImpl; import org.argeo.cms.internal.runtime.CmsUserAdmin; import org.argeo.cms.internal.runtime.DeployedContentRepository; -import org.argeo.osgi.transaction.SimpleTransactionManager; -import org.argeo.osgi.transaction.WorkControl; -import org.argeo.osgi.transaction.WorkTransaction; import org.argeo.osgi.useradmin.UserDirectory; import org.argeo.util.register.Component; import org.argeo.util.register.SimpleRegister; +import org.argeo.util.transaction.SimpleTransactionManager; +import org.argeo.util.transaction.WorkControl; +import org.argeo.util.transaction.WorkTransaction; import org.osgi.service.useradmin.UserAdmin; /** diff --git a/org.argeo.util/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java b/org.argeo.util/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java index dde39e0ab..e5576b91d 100644 --- a/org.argeo.util/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java +++ b/org.argeo.util/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java @@ -31,9 +31,9 @@ import javax.naming.directory.BasicAttributes; import javax.naming.ldap.LdapName; import javax.naming.ldap.Rdn; -import org.argeo.osgi.transaction.WorkControl; import org.argeo.util.naming.LdapAttrs; import org.argeo.util.naming.LdapObjs; +import org.argeo.util.transaction.WorkControl; import org.osgi.framework.Filter; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.InvalidSyntaxException; diff --git a/org.argeo.util/src/org/argeo/osgi/useradmin/UserDirectory.java b/org.argeo.util/src/org/argeo/osgi/useradmin/UserDirectory.java index 18bb1a0a6..2c070d66d 100644 --- a/org.argeo.util/src/org/argeo/osgi/useradmin/UserDirectory.java +++ b/org.argeo.util/src/org/argeo/osgi/useradmin/UserDirectory.java @@ -2,7 +2,7 @@ package org.argeo.osgi.useradmin; import java.util.Optional; -import org.argeo.osgi.transaction.WorkControl; +import org.argeo.util.transaction.WorkControl; import org.osgi.service.useradmin.Role; /** Information about a user directory. */ diff --git a/org.argeo.util/src/org/argeo/osgi/transaction/JtaStatusAdapter.java b/org.argeo.util/src/org/argeo/util/transaction/JtaStatusAdapter.java similarity index 97% rename from org.argeo.util/src/org/argeo/osgi/transaction/JtaStatusAdapter.java rename to org.argeo.util/src/org/argeo/util/transaction/JtaStatusAdapter.java index 2dd94c654..bd977069f 100644 --- a/org.argeo.util/src/org/argeo/osgi/transaction/JtaStatusAdapter.java +++ b/org.argeo.util/src/org/argeo/util/transaction/JtaStatusAdapter.java @@ -1,4 +1,4 @@ -package org.argeo.osgi.transaction; +package org.argeo.util.transaction; /** JTA transaction status. */ public class JtaStatusAdapter implements TransactionStatusAdapter { diff --git a/org.argeo.util/src/org/argeo/osgi/transaction/SimpleRollbackException.java b/org.argeo.util/src/org/argeo/util/transaction/SimpleRollbackException.java similarity index 89% rename from org.argeo.util/src/org/argeo/osgi/transaction/SimpleRollbackException.java rename to org.argeo.util/src/org/argeo/util/transaction/SimpleRollbackException.java index cf8a80b83..010b549c7 100644 --- a/org.argeo.util/src/org/argeo/osgi/transaction/SimpleRollbackException.java +++ b/org.argeo.util/src/org/argeo/util/transaction/SimpleRollbackException.java @@ -1,4 +1,4 @@ -package org.argeo.osgi.transaction; +package org.argeo.util.transaction; /** Internal unchecked rollback exception. */ class SimpleRollbackException extends RuntimeException { diff --git a/org.argeo.util/src/org/argeo/osgi/transaction/SimpleTransaction.java b/org.argeo.util/src/org/argeo/util/transaction/SimpleTransaction.java similarity index 99% rename from org.argeo.util/src/org/argeo/osgi/transaction/SimpleTransaction.java rename to org.argeo.util/src/org/argeo/util/transaction/SimpleTransaction.java index e668b317e..56ef06353 100644 --- a/org.argeo.util/src/org/argeo/osgi/transaction/SimpleTransaction.java +++ b/org.argeo.util/src/org/argeo/util/transaction/SimpleTransaction.java @@ -1,4 +1,4 @@ -package org.argeo.osgi.transaction; +package org.argeo.util.transaction; import java.util.ArrayList; import java.util.List; diff --git a/org.argeo.util/src/org/argeo/osgi/transaction/SimpleTransactionManager.java b/org.argeo.util/src/org/argeo/util/transaction/SimpleTransactionManager.java similarity index 99% rename from org.argeo.util/src/org/argeo/osgi/transaction/SimpleTransactionManager.java rename to org.argeo.util/src/org/argeo/util/transaction/SimpleTransactionManager.java index 3d4edfd17..f5be7c8e5 100644 --- a/org.argeo.util/src/org/argeo/osgi/transaction/SimpleTransactionManager.java +++ b/org.argeo.util/src/org/argeo/util/transaction/SimpleTransactionManager.java @@ -1,4 +1,4 @@ -package org.argeo.osgi.transaction; +package org.argeo.util.transaction; import java.util.Collections; import java.util.HashMap; diff --git a/org.argeo.util/src/org/argeo/osgi/transaction/TransactionStatusAdapter.java b/org.argeo.util/src/org/argeo/util/transaction/TransactionStatusAdapter.java similarity index 91% rename from org.argeo.util/src/org/argeo/osgi/transaction/TransactionStatusAdapter.java rename to org.argeo.util/src/org/argeo/util/transaction/TransactionStatusAdapter.java index 87abceba4..a74fef1c9 100644 --- a/org.argeo.util/src/org/argeo/osgi/transaction/TransactionStatusAdapter.java +++ b/org.argeo.util/src/org/argeo/util/transaction/TransactionStatusAdapter.java @@ -1,4 +1,4 @@ -package org.argeo.osgi.transaction; +package org.argeo.util.transaction; /** Abstract the various approaches to represent transaction status. */ public interface TransactionStatusAdapter { diff --git a/org.argeo.util/src/org/argeo/osgi/transaction/UuidXid.java b/org.argeo.util/src/org/argeo/util/transaction/UuidXid.java similarity index 98% rename from org.argeo.util/src/org/argeo/osgi/transaction/UuidXid.java rename to org.argeo.util/src/org/argeo/util/transaction/UuidXid.java index 729aef8e5..b6acebec1 100644 --- a/org.argeo.util/src/org/argeo/osgi/transaction/UuidXid.java +++ b/org.argeo.util/src/org/argeo/util/transaction/UuidXid.java @@ -1,4 +1,4 @@ -package org.argeo.osgi.transaction; +package org.argeo.util.transaction; import java.io.Serializable; import java.nio.ByteBuffer; diff --git a/org.argeo.util/src/org/argeo/osgi/transaction/WorkContext.java b/org.argeo.util/src/org/argeo/util/transaction/WorkContext.java similarity index 87% rename from org.argeo.util/src/org/argeo/osgi/transaction/WorkContext.java rename to org.argeo.util/src/org/argeo/util/transaction/WorkContext.java index f50f20870..e818b830f 100644 --- a/org.argeo.util/src/org/argeo/osgi/transaction/WorkContext.java +++ b/org.argeo.util/src/org/argeo/util/transaction/WorkContext.java @@ -1,4 +1,4 @@ -package org.argeo.osgi.transaction; +package org.argeo.util.transaction; import javax.transaction.xa.XAResource; diff --git a/org.argeo.util/src/org/argeo/osgi/transaction/WorkControl.java b/org.argeo.util/src/org/argeo/util/transaction/WorkControl.java similarity index 88% rename from org.argeo.util/src/org/argeo/osgi/transaction/WorkControl.java rename to org.argeo.util/src/org/argeo/util/transaction/WorkControl.java index 766809555..db0e475a3 100644 --- a/org.argeo.util/src/org/argeo/osgi/transaction/WorkControl.java +++ b/org.argeo.util/src/org/argeo/util/transaction/WorkControl.java @@ -1,4 +1,4 @@ -package org.argeo.osgi.transaction; +package org.argeo.util.transaction; import java.util.concurrent.Callable; diff --git a/org.argeo.util/src/org/argeo/osgi/transaction/WorkTransaction.java b/org.argeo.util/src/org/argeo/util/transaction/WorkTransaction.java similarity index 87% rename from org.argeo.util/src/org/argeo/osgi/transaction/WorkTransaction.java rename to org.argeo.util/src/org/argeo/util/transaction/WorkTransaction.java index 653390912..245ca41af 100644 --- a/org.argeo.util/src/org/argeo/osgi/transaction/WorkTransaction.java +++ b/org.argeo.util/src/org/argeo/util/transaction/WorkTransaction.java @@ -1,4 +1,4 @@ -package org.argeo.osgi.transaction; +package org.argeo.util.transaction; /** * A minimalistic interface inspired by JTA user transaction in order to commit diff --git a/org.argeo.util/src/org/argeo/osgi/transaction/package-info.java b/org.argeo.util/src/org/argeo/util/transaction/package-info.java similarity index 66% rename from org.argeo.util/src/org/argeo/osgi/transaction/package-info.java rename to org.argeo.util/src/org/argeo/util/transaction/package-info.java index 3d3756243..f4811613d 100644 --- a/org.argeo.util/src/org/argeo/osgi/transaction/package-info.java +++ b/org.argeo.util/src/org/argeo/util/transaction/package-info.java @@ -1,2 +1,2 @@ /** Minimalistic and partial XA transaction manager implementation. */ -package org.argeo.osgi.transaction; \ No newline at end of file +package org.argeo.util.transaction; \ No newline at end of file -- 2.30.2