From 616a062e9d061ce91589556624ed622298a21ac7 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 11 Mar 2024 09:00:48 +0100 Subject: [PATCH] Refactor Argeo APIs --- Makefile | 2 +- {org.argeo.app.api => org.argeo.api.app}/.classpath | 0 {org.argeo.app.api => org.argeo.api.app}/.gitignore | 0 {org.argeo.app.api => org.argeo.api.app}/.project | 2 +- .../META-INF/.gitignore | 0 {org.argeo.app.api => org.argeo.api.app}/bnd.bnd | 0 .../build.properties | 0 .../src/org/argeo/api/app}/AppUserState.java | 2 +- .../src/org/argeo/api/app}/EntityConstants.java | 2 +- .../src/org/argeo/api/app}/EntityDefinition.java | 2 +- .../src/org/argeo/api/app}/EntityMimeType.java | 2 +- .../src/org/argeo/api/app}/EntityName.java | 2 +- .../src/org/argeo/api/app}/EntityNames.java | 2 +- .../src/org/argeo/api/app}/EntityType.java | 2 +- .../src/org/argeo/api/app}/IdRange.java | 2 +- .../src/org/argeo/api/app}/RankedObject.java | 2 +- .../src/org/argeo/api/app}/SuiteRole.java | 4 ++-- .../src/org/argeo/api/app}/Term.java | 2 +- .../src/org/argeo/api/app}/TermsManager.java | 2 +- .../src/org/argeo/api/app}/Typology.java | 2 +- .../src/org/argeo/api/app}/WGS84PosName.java | 2 +- .../src/org/argeo/api/app}/entity.xsd | 0 .../src/org/argeo/api/app}/entityFeature.xsd | 0 org.argeo.app.core/OSGI-INF/termsContentProvider.xml | 2 +- .../src/org/argeo/app/acr/terms/TermContent.java | 2 +- .../org/argeo/app/acr/terms/TermsContentProvider.java | 8 ++++---- .../src/org/argeo/app/acr/terms/TypologyContent.java | 2 +- .../org/argeo/app/core/AbstractEntityDefinition.java | 2 +- .../src/org/argeo/app/core/SuiteContentNamespace.java | 2 +- .../src/org/argeo/app/core/SuiteUtils.java | 4 ++-- .../src/org/argeo/app/docbook/DbkAcrUtils.java | 2 +- org.argeo.app.geo/OSGI-INF/wfsHttpHandler.xml | 2 +- .../src/org/argeo/app/api/geo/FeatureAdapter.java | 2 +- .../src/org/argeo/app/geo/acr/GeoEntityUtils.java | 6 +++--- .../src/org/argeo/app/geo/http/WfsHttpHandler.java | 6 +++--- org.argeo.app.jcr/OSGI-INF/appUserState.xml | 2 +- org.argeo.app.jcr/OSGI-INF/termsManager.xml | 2 +- .../org/argeo/app/jcr/CustomMaintenanceService.java | 2 +- .../src/org/argeo/app/jcr/JcrEntityDefinition.java | 4 ++-- .../src/org/argeo/app/jcr/SuiteJcrUtils.java | 6 +++--- .../src/org/argeo/app/jcr/docbook/DbkJcrUtils.java | 2 +- .../src/org/argeo/app/jcr/odk/OdkJcrUtils.java | 4 ++-- .../src/org/argeo/app/jcr/terms/SuiteTerm.java | 2 +- .../src/org/argeo/app/jcr/terms/SuiteTermsManager.java | 10 +++++----- .../src/org/argeo/app/jcr/terms/SuiteTypology.java | 4 ++-- .../org/argeo/internal/app/jcr/AppUserStateImpl.java | 2 +- .../internal/app/jcr/SuiteMaintenanceService.java | 2 +- .../OSGI-INF/odkSubmissionServlet.xml | 2 +- .../org/argeo/app/servlet/odk/OdkFormListServlet.java | 2 +- .../org/argeo/app/servlet/odk/OdkManifestServlet.java | 6 +++--- .../argeo/app/servlet/odk/OdkSubmissionServlet.java | 2 +- org.argeo.app.servlet.publish/bnd.bnd | 2 +- org.argeo.suite.knowledge/OSGI-INF/swtArgeoApp.xml | 2 +- org.argeo.suite.knowledge/OSGI-INF/termsEntryArea.xml | 2 +- org.argeo.suite.knowledge/bnd.bnd | 2 +- swt/org.argeo.app.swt/bnd.bnd | 2 +- .../src/org/argeo/app/swt/docbook/DbkImageManager.java | 4 ++-- .../src/org/argeo/app/swt/space/SpaceEntryArea.java | 2 +- .../src/org/argeo/app/swt/terms/AbstractTermsPart.java | 6 +++--- .../src/org/argeo/app/swt/terms/MultiTermsPart.java | 4 ++-- .../src/org/argeo/app/swt/terms/SingleTermPart.java | 4 ++-- .../src/org/argeo/app/swt/terms/TermsEntryArea.java | 4 ++-- .../src/org/argeo/app/swt/ux/DefaultLeadPane.java | 2 +- .../src/org/argeo/app/swt/ux/SwtArgeoApp.java | 10 +++++----- swt/org.argeo.app.ui/OSGI-INF/cmsApp.xml | 2 +- .../src/org/argeo/app/ui/RecentItems.java | 2 +- .../src/org/argeo/app/ui/SuiteUiUtils.java | 4 ++-- .../src/org/argeo/app/ui/docbook/DbkImageManager.java | 4 ++-- .../src/org/argeo/app/ui/forms/AbstractTermsPart.java | 6 +++--- .../src/org/argeo/app/ui/forms/MultiTermsPart.java | 4 ++-- .../src/org/argeo/app/ui/forms/SingleTermPart.java | 4 ++-- .../src/org/argeo/app/ui/library/ContentEntryArea.java | 2 +- .../org/argeo/app/ui/library/JcrContentEntryArea.java | 2 +- .../src/org/argeo/app/ui/openlayers/OpenLayersMap.java | 4 ++-- .../src/org/argeo/app/ui/openlayers/OverviewMap.java | 2 +- .../src/org/argeo/app/ui/people/PersonUiProvider.java | 6 +++--- 76 files changed, 108 insertions(+), 108 deletions(-) rename {org.argeo.app.api => org.argeo.api.app}/.classpath (100%) rename {org.argeo.app.api => org.argeo.api.app}/.gitignore (100%) rename {org.argeo.app.api => org.argeo.api.app}/.project (95%) rename {org.argeo.app.api => org.argeo.api.app}/META-INF/.gitignore (100%) rename {org.argeo.app.api => org.argeo.api.app}/bnd.bnd (100%) rename {org.argeo.app.api => org.argeo.api.app}/build.properties (100%) rename {org.argeo.app.api/src/org/argeo/app/api => org.argeo.api.app/src/org/argeo/api/app}/AppUserState.java (89%) rename {org.argeo.app.api/src/org/argeo/app/api => org.argeo.api.app/src/org/argeo/api/app}/EntityConstants.java (89%) rename {org.argeo.app.api/src/org/argeo/app/api => org.argeo.api.app/src/org/argeo/api/app}/EntityDefinition.java (86%) rename {org.argeo.app.api/src/org/argeo/app/api => org.argeo.api.app/src/org/argeo/api/app}/EntityMimeType.java (97%) rename {org.argeo.app.api/src/org/argeo/app/api => org.argeo.api.app/src/org/argeo/api/app}/EntityName.java (94%) rename {org.argeo.app.api/src/org/argeo/app/api => org.argeo.api.app/src/org/argeo/api/app}/EntityNames.java (98%) rename {org.argeo.app.api/src/org/argeo/app/api => org.argeo.api.app/src/org/argeo/api/app}/EntityType.java (96%) rename {org.argeo.app.api/src/org/argeo/app/api => org.argeo.api.app/src/org/argeo/api/app}/IdRange.java (99%) rename {org.argeo.app.api/src/org/argeo/app/api => org.argeo.api.app/src/org/argeo/api/app}/RankedObject.java (99%) rename {org.argeo.app.api/src/org/argeo/app/api => org.argeo.api.app/src/org/argeo/api/app}/SuiteRole.java (94%) rename {org.argeo.app.api/src/org/argeo/app/api => org.argeo.api.app/src/org/argeo/api/app}/Term.java (92%) rename {org.argeo.app.api/src/org/argeo/app/api => org.argeo.api.app/src/org/argeo/api/app}/TermsManager.java (91%) rename {org.argeo.app.api/src/org/argeo/app/api => org.argeo.api.app/src/org/argeo/api/app}/Typology.java (89%) rename {org.argeo.app.api/src/org/argeo/app/api => org.argeo.api.app/src/org/argeo/api/app}/WGS84PosName.java (96%) rename {org.argeo.app.api/src/org/argeo/app/api => org.argeo.api.app/src/org/argeo/api/app}/entity.xsd (100%) rename {org.argeo.app.api/src/org/argeo/app/api => org.argeo.api.app/src/org/argeo/api/app}/entityFeature.xsd (100%) diff --git a/Makefile b/Makefile index e724f9b..134414d 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ uninstall: osgi-uninstall A2_CATEGORY = org.argeo.suite BUNDLES = \ -org.argeo.app.api \ +org.argeo.api.app \ org.argeo.app.core \ org.argeo.app.jcr \ org.argeo.app.geo \ diff --git a/org.argeo.app.api/.classpath b/org.argeo.api.app/.classpath similarity index 100% rename from org.argeo.app.api/.classpath rename to org.argeo.api.app/.classpath diff --git a/org.argeo.app.api/.gitignore b/org.argeo.api.app/.gitignore similarity index 100% rename from org.argeo.app.api/.gitignore rename to org.argeo.api.app/.gitignore diff --git a/org.argeo.app.api/.project b/org.argeo.api.app/.project similarity index 95% rename from org.argeo.app.api/.project rename to org.argeo.api.app/.project index 2f51e20..9081a67 100644 --- a/org.argeo.app.api/.project +++ b/org.argeo.api.app/.project @@ -1,6 +1,6 @@ - org.argeo.app.api + org.argeo.api.app diff --git a/org.argeo.app.api/META-INF/.gitignore b/org.argeo.api.app/META-INF/.gitignore similarity index 100% rename from org.argeo.app.api/META-INF/.gitignore rename to org.argeo.api.app/META-INF/.gitignore diff --git a/org.argeo.app.api/bnd.bnd b/org.argeo.api.app/bnd.bnd similarity index 100% rename from org.argeo.app.api/bnd.bnd rename to org.argeo.api.app/bnd.bnd diff --git a/org.argeo.app.api/build.properties b/org.argeo.api.app/build.properties similarity index 100% rename from org.argeo.app.api/build.properties rename to org.argeo.api.app/build.properties diff --git a/org.argeo.app.api/src/org/argeo/app/api/AppUserState.java b/org.argeo.api.app/src/org/argeo/api/app/AppUserState.java similarity index 89% rename from org.argeo.app.api/src/org/argeo/app/api/AppUserState.java rename to org.argeo.api.app/src/org/argeo/api/app/AppUserState.java index bcb0593..9250e99 100644 --- a/org.argeo.app.api/src/org/argeo/app/api/AppUserState.java +++ b/org.argeo.api.app/src/org/argeo/api/app/AppUserState.java @@ -1,4 +1,4 @@ -package org.argeo.app.api; +package org.argeo.api.app; import org.argeo.api.acr.Content; import org.argeo.api.cms.CmsSession; diff --git a/org.argeo.app.api/src/org/argeo/app/api/EntityConstants.java b/org.argeo.api.app/src/org/argeo/api/app/EntityConstants.java similarity index 89% rename from org.argeo.app.api/src/org/argeo/app/api/EntityConstants.java rename to org.argeo.api.app/src/org/argeo/api/app/EntityConstants.java index f04a6d0..a609ad8 100644 --- a/org.argeo.app.api/src/org/argeo/app/api/EntityConstants.java +++ b/org.argeo.api.app/src/org/argeo/api/app/EntityConstants.java @@ -1,4 +1,4 @@ -package org.argeo.app.api; +package org.argeo.api.app; /** Constant related to entities, typically used in an OSGi context. */ public interface EntityConstants { diff --git a/org.argeo.app.api/src/org/argeo/app/api/EntityDefinition.java b/org.argeo.api.app/src/org/argeo/api/app/EntityDefinition.java similarity index 86% rename from org.argeo.app.api/src/org/argeo/app/api/EntityDefinition.java rename to org.argeo.api.app/src/org/argeo/api/app/EntityDefinition.java index 97f7d7c..8ac73fa 100644 --- a/org.argeo.app.api/src/org/argeo/app/api/EntityDefinition.java +++ b/org.argeo.api.app/src/org/argeo/api/app/EntityDefinition.java @@ -1,4 +1,4 @@ -package org.argeo.app.api; +package org.argeo.api.app; /** The definition of an entity, a composite configurable data structure. */ public interface EntityDefinition { diff --git a/org.argeo.app.api/src/org/argeo/app/api/EntityMimeType.java b/org.argeo.api.app/src/org/argeo/api/app/EntityMimeType.java similarity index 97% rename from org.argeo.app.api/src/org/argeo/app/api/EntityMimeType.java rename to org.argeo.api.app/src/org/argeo/api/app/EntityMimeType.java index eaefcd0..1a0f64c 100644 --- a/org.argeo.app.api/src/org/argeo/app/api/EntityMimeType.java +++ b/org.argeo.api.app/src/org/argeo/api/app/EntityMimeType.java @@ -1,4 +1,4 @@ -package org.argeo.app.api; +package org.argeo.api.app; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; diff --git a/org.argeo.app.api/src/org/argeo/app/api/EntityName.java b/org.argeo.api.app/src/org/argeo/api/app/EntityName.java similarity index 94% rename from org.argeo.app.api/src/org/argeo/app/api/EntityName.java rename to org.argeo.api.app/src/org/argeo/api/app/EntityName.java index 4330294..9abfc96 100644 --- a/org.argeo.app.api/src/org/argeo/app/api/EntityName.java +++ b/org.argeo.api.app/src/org/argeo/api/app/EntityName.java @@ -1,4 +1,4 @@ -package org.argeo.app.api; +package org.argeo.api.app; import org.argeo.api.acr.QNamed; diff --git a/org.argeo.app.api/src/org/argeo/app/api/EntityNames.java b/org.argeo.api.app/src/org/argeo/api/app/EntityNames.java similarity index 98% rename from org.argeo.app.api/src/org/argeo/app/api/EntityNames.java rename to org.argeo.api.app/src/org/argeo/api/app/EntityNames.java index b6240b3..5cb69d5 100644 --- a/org.argeo.app.api/src/org/argeo/app/api/EntityNames.java +++ b/org.argeo.api.app/src/org/argeo/api/app/EntityNames.java @@ -1,4 +1,4 @@ -package org.argeo.app.api; +package org.argeo.api.app; import org.argeo.api.acr.ldap.LdapAttr; diff --git a/org.argeo.app.api/src/org/argeo/app/api/EntityType.java b/org.argeo.api.app/src/org/argeo/api/app/EntityType.java similarity index 96% rename from org.argeo.app.api/src/org/argeo/app/api/EntityType.java rename to org.argeo.api.app/src/org/argeo/api/app/EntityType.java index 8a258eb..929045a 100644 --- a/org.argeo.app.api/src/org/argeo/app/api/EntityType.java +++ b/org.argeo.api.app/src/org/argeo/api/app/EntityType.java @@ -1,4 +1,4 @@ -package org.argeo.app.api; +package org.argeo.api.app; import org.argeo.api.acr.QNamed; diff --git a/org.argeo.app.api/src/org/argeo/app/api/IdRange.java b/org.argeo.api.app/src/org/argeo/api/app/IdRange.java similarity index 99% rename from org.argeo.app.api/src/org/argeo/app/api/IdRange.java rename to org.argeo.api.app/src/org/argeo/api/app/IdRange.java index e47eb5e..c70e96a 100644 --- a/org.argeo.app.api/src/org/argeo/app/api/IdRange.java +++ b/org.argeo.api.app/src/org/argeo/api/app/IdRange.java @@ -1,4 +1,4 @@ -package org.argeo.app.api; +package org.argeo.api.app; import java.util.HashSet; import java.util.Set; diff --git a/org.argeo.app.api/src/org/argeo/app/api/RankedObject.java b/org.argeo.api.app/src/org/argeo/api/app/RankedObject.java similarity index 99% rename from org.argeo.app.api/src/org/argeo/app/api/RankedObject.java rename to org.argeo.api.app/src/org/argeo/api/app/RankedObject.java index fab42d7..e9c47ce 100644 --- a/org.argeo.app.api/src/org/argeo/app/api/RankedObject.java +++ b/org.argeo.api.app/src/org/argeo/api/app/RankedObject.java @@ -1,4 +1,4 @@ -package org.argeo.app.api; +package org.argeo.api.app; import java.util.Map; diff --git a/org.argeo.app.api/src/org/argeo/app/api/SuiteRole.java b/org.argeo.api.app/src/org/argeo/api/app/SuiteRole.java similarity index 94% rename from org.argeo.app.api/src/org/argeo/app/api/SuiteRole.java rename to org.argeo.api.app/src/org/argeo/api/app/SuiteRole.java index 5a2fc6b..07f2499 100644 --- a/org.argeo.app.api/src/org/argeo/app/api/SuiteRole.java +++ b/org.argeo.api.app/src/org/argeo/api/app/SuiteRole.java @@ -1,4 +1,4 @@ -package org.argeo.app.api; +package org.argeo.api.app; import javax.xml.namespace.QName; @@ -6,7 +6,7 @@ import org.argeo.api.acr.ArgeoNamespace; import org.argeo.api.acr.ContentName; import org.argeo.api.acr.ldap.LdapAttr; import org.argeo.api.cms.CmsConstants; -import org.argeo.cms.SystemRole; +import org.argeo.api.cms.auth.SystemRole; /** Standard suite system roles. */ public enum SuiteRole implements SystemRole { diff --git a/org.argeo.app.api/src/org/argeo/app/api/Term.java b/org.argeo.api.app/src/org/argeo/api/app/Term.java similarity index 92% rename from org.argeo.app.api/src/org/argeo/app/api/Term.java rename to org.argeo.api.app/src/org/argeo/api/app/Term.java index 5a7f09e..18ee8e2 100644 --- a/org.argeo.app.api/src/org/argeo/app/api/Term.java +++ b/org.argeo.api.app/src/org/argeo/api/app/Term.java @@ -1,4 +1,4 @@ -package org.argeo.app.api; +package org.argeo.api.app; import java.util.List; diff --git a/org.argeo.app.api/src/org/argeo/app/api/TermsManager.java b/org.argeo.api.app/src/org/argeo/api/app/TermsManager.java similarity index 91% rename from org.argeo.app.api/src/org/argeo/app/api/TermsManager.java rename to org.argeo.api.app/src/org/argeo/api/app/TermsManager.java index 03e1150..dadaf9a 100644 --- a/org.argeo.app.api/src/org/argeo/app/api/TermsManager.java +++ b/org.argeo.api.app/src/org/argeo/api/app/TermsManager.java @@ -1,4 +1,4 @@ -package org.argeo.app.api; +package org.argeo.api.app; import java.util.List; import java.util.Set; diff --git a/org.argeo.app.api/src/org/argeo/app/api/Typology.java b/org.argeo.api.app/src/org/argeo/api/app/Typology.java similarity index 89% rename from org.argeo.app.api/src/org/argeo/app/api/Typology.java rename to org.argeo.api.app/src/org/argeo/api/app/Typology.java index f57e692..ea560a9 100644 --- a/org.argeo.app.api/src/org/argeo/app/api/Typology.java +++ b/org.argeo.api.app/src/org/argeo/api/app/Typology.java @@ -1,4 +1,4 @@ -package org.argeo.app.api; +package org.argeo.api.app; import java.util.List; diff --git a/org.argeo.app.api/src/org/argeo/app/api/WGS84PosName.java b/org.argeo.api.app/src/org/argeo/api/app/WGS84PosName.java similarity index 96% rename from org.argeo.app.api/src/org/argeo/app/api/WGS84PosName.java rename to org.argeo.api.app/src/org/argeo/api/app/WGS84PosName.java index 4ba1a13..929e98d 100644 --- a/org.argeo.app.api/src/org/argeo/app/api/WGS84PosName.java +++ b/org.argeo.api.app/src/org/argeo/api/app/WGS84PosName.java @@ -1,4 +1,4 @@ -package org.argeo.app.api; +package org.argeo.api.app; import org.argeo.api.acr.QNamed; diff --git a/org.argeo.app.api/src/org/argeo/app/api/entity.xsd b/org.argeo.api.app/src/org/argeo/api/app/entity.xsd similarity index 100% rename from org.argeo.app.api/src/org/argeo/app/api/entity.xsd rename to org.argeo.api.app/src/org/argeo/api/app/entity.xsd diff --git a/org.argeo.app.api/src/org/argeo/app/api/entityFeature.xsd b/org.argeo.api.app/src/org/argeo/api/app/entityFeature.xsd similarity index 100% rename from org.argeo.app.api/src/org/argeo/app/api/entityFeature.xsd rename to org.argeo.api.app/src/org/argeo/api/app/entityFeature.xsd diff --git a/org.argeo.app.core/OSGI-INF/termsContentProvider.xml b/org.argeo.app.core/OSGI-INF/termsContentProvider.xml index 4d5a1d2..2a1d10e 100644 --- a/org.argeo.app.core/OSGI-INF/termsContentProvider.xml +++ b/org.argeo.app.core/OSGI-INF/termsContentProvider.xml @@ -1,7 +1,7 @@ - + diff --git a/org.argeo.app.core/src/org/argeo/app/acr/terms/TermContent.java b/org.argeo.app.core/src/org/argeo/app/acr/terms/TermContent.java index 672f66f..2cc5fb5 100644 --- a/org.argeo.app.core/src/org/argeo/app/acr/terms/TermContent.java +++ b/org.argeo.app.core/src/org/argeo/app/acr/terms/TermContent.java @@ -8,7 +8,7 @@ import org.argeo.api.acr.Content; import org.argeo.api.acr.NamespaceUtils; import org.argeo.api.acr.spi.ContentProvider; import org.argeo.api.acr.spi.ProvidedSession; -import org.argeo.app.api.Term; +import org.argeo.api.app.Term; import org.argeo.cms.acr.AbstractContent; public class TermContent extends AbstractContent { diff --git a/org.argeo.app.core/src/org/argeo/app/acr/terms/TermsContentProvider.java b/org.argeo.app.core/src/org/argeo/app/acr/terms/TermsContentProvider.java index 2d7a5d1..8e58667 100644 --- a/org.argeo.app.core/src/org/argeo/app/acr/terms/TermsContentProvider.java +++ b/org.argeo.app.core/src/org/argeo/app/acr/terms/TermsContentProvider.java @@ -7,10 +7,10 @@ import org.argeo.api.acr.Content; import org.argeo.api.acr.ContentNotFoundException; import org.argeo.api.acr.spi.ProvidedContent; import org.argeo.api.acr.spi.ProvidedSession; -import org.argeo.app.api.EntityType; -import org.argeo.app.api.Term; -import org.argeo.app.api.TermsManager; -import org.argeo.app.api.Typology; +import org.argeo.api.app.EntityType; +import org.argeo.api.app.Term; +import org.argeo.api.app.TermsManager; +import org.argeo.api.app.Typology; import org.argeo.cms.acr.AbstractSimpleContentProvider; import org.argeo.cms.acr.ContentUtils; diff --git a/org.argeo.app.core/src/org/argeo/app/acr/terms/TypologyContent.java b/org.argeo.app.core/src/org/argeo/app/acr/terms/TypologyContent.java index 63bb8a3..d4b0c00 100644 --- a/org.argeo.app.core/src/org/argeo/app/acr/terms/TypologyContent.java +++ b/org.argeo.app.core/src/org/argeo/app/acr/terms/TypologyContent.java @@ -8,7 +8,7 @@ import org.argeo.api.acr.Content; import org.argeo.api.acr.NamespaceUtils; import org.argeo.api.acr.spi.ContentProvider; import org.argeo.api.acr.spi.ProvidedSession; -import org.argeo.app.api.Typology; +import org.argeo.api.app.Typology; import org.argeo.cms.acr.AbstractContent; public class TypologyContent extends AbstractContent { diff --git a/org.argeo.app.core/src/org/argeo/app/core/AbstractEntityDefinition.java b/org.argeo.app.core/src/org/argeo/app/core/AbstractEntityDefinition.java index 7e10bf0..7ccabd1 100644 --- a/org.argeo.app.core/src/org/argeo/app/core/AbstractEntityDefinition.java +++ b/org.argeo.app.core/src/org/argeo/app/core/AbstractEntityDefinition.java @@ -1,6 +1,6 @@ package org.argeo.app.core; -import org.argeo.app.api.EntityDefinition; +import org.argeo.api.app.EntityDefinition; public abstract class AbstractEntityDefinition implements EntityDefinition { diff --git a/org.argeo.app.core/src/org/argeo/app/core/SuiteContentNamespace.java b/org.argeo.app.core/src/org/argeo/app/core/SuiteContentNamespace.java index ec77eda..ecb07c9 100644 --- a/org.argeo.app.core/src/org/argeo/app/core/SuiteContentNamespace.java +++ b/org.argeo.app.core/src/org/argeo/app/core/SuiteContentNamespace.java @@ -12,7 +12,7 @@ public enum SuiteContentNamespace implements ContentNamespace { // ARGEO // ENTITY("entity", "http://www.argeo.org/ns/entity", - "platform:/plugin/org.argeo.app.api/org/argeo/app/api/entity.xsd", null), + "platform:/plugin/org.argeo.app.api/org/argeo/api/app/entity.xsd", null), // ARGEO_DBK("argeodbk", "http://www.argeo.org/ns/argeodbk", null, null), // diff --git a/org.argeo.app.core/src/org/argeo/app/core/SuiteUtils.java b/org.argeo.app.core/src/org/argeo/app/core/SuiteUtils.java index 7b614a7..adaf510 100644 --- a/org.argeo.app.core/src/org/argeo/app/core/SuiteUtils.java +++ b/org.argeo.app.core/src/org/argeo/app/core/SuiteUtils.java @@ -8,8 +8,8 @@ import javax.xml.namespace.QName; import org.argeo.api.acr.Content; import org.argeo.api.acr.ldap.LdapAttr; import org.argeo.api.acr.ldap.LdapObj; -import org.argeo.app.api.EntityType; -import org.argeo.cms.RoleNameUtils; +import org.argeo.api.app.EntityType; +import org.argeo.api.cms.auth.RoleNameUtils; /** Utilities around the Argeo Suite APIs. */ public class SuiteUtils { diff --git a/org.argeo.app.core/src/org/argeo/app/docbook/DbkAcrUtils.java b/org.argeo.app.core/src/org/argeo/app/docbook/DbkAcrUtils.java index 8a92db3..fed027d 100644 --- a/org.argeo.app.core/src/org/argeo/app/docbook/DbkAcrUtils.java +++ b/org.argeo.app.core/src/org/argeo/app/docbook/DbkAcrUtils.java @@ -1,7 +1,7 @@ package org.argeo.app.docbook; import org.argeo.api.acr.Content; -import org.argeo.app.api.EntityType; +import org.argeo.api.app.EntityType; /** Utilities when using ACR to access DocBook. */ public class DbkAcrUtils { diff --git a/org.argeo.app.geo/OSGI-INF/wfsHttpHandler.xml b/org.argeo.app.geo/OSGI-INF/wfsHttpHandler.xml index 0347631..8a08f57 100644 --- a/org.argeo.app.geo/OSGI-INF/wfsHttpHandler.xml +++ b/org.argeo.app.geo/OSGI-INF/wfsHttpHandler.xml @@ -6,5 +6,5 @@ - + diff --git a/org.argeo.app.geo/src/org/argeo/app/api/geo/FeatureAdapter.java b/org.argeo.app.geo/src/org/argeo/app/api/geo/FeatureAdapter.java index 69689a9..1dffbab 100644 --- a/org.argeo.app.geo/src/org/argeo/app/api/geo/FeatureAdapter.java +++ b/org.argeo.app.geo/src/org/argeo/app/api/geo/FeatureAdapter.java @@ -4,7 +4,7 @@ import javax.xml.namespace.QName; import org.argeo.api.acr.Content; import org.argeo.api.acr.search.AndFilter; -import org.argeo.app.api.EntityType; +import org.argeo.api.app.EntityType; import org.argeo.app.geo.acr.GeoEntityUtils; import org.locationtech.jts.geom.Geometry; diff --git a/org.argeo.app.geo/src/org/argeo/app/geo/acr/GeoEntityUtils.java b/org.argeo.app.geo/src/org/argeo/app/geo/acr/GeoEntityUtils.java index 162081a..2fd0ad1 100644 --- a/org.argeo.app.geo/src/org/argeo/app/geo/acr/GeoEntityUtils.java +++ b/org.argeo.app.geo/src/org/argeo/app/geo/acr/GeoEntityUtils.java @@ -17,10 +17,10 @@ import org.argeo.api.acr.Content; import org.argeo.api.acr.ContentName; import org.argeo.api.acr.DName; import org.argeo.api.acr.QNamed; +import org.argeo.api.app.EntityName; +import org.argeo.api.app.EntityType; +import org.argeo.api.app.WGS84PosName; import org.argeo.api.cms.CmsLog; -import org.argeo.app.api.EntityName; -import org.argeo.app.api.EntityType; -import org.argeo.app.api.WGS84PosName; import org.argeo.app.geo.GeoJson; import org.argeo.app.geo.JTS; import org.locationtech.jts.geom.Coordinate; diff --git a/org.argeo.app.geo/src/org/argeo/app/geo/http/WfsHttpHandler.java b/org.argeo.app.geo/src/org/argeo/app/geo/http/WfsHttpHandler.java index 47cae24..9c0f8dc 100644 --- a/org.argeo.app.geo/src/org/argeo/app/geo/http/WfsHttpHandler.java +++ b/org.argeo.app.geo/src/org/argeo/app/geo/http/WfsHttpHandler.java @@ -22,10 +22,10 @@ import org.argeo.api.acr.NamespaceUtils; import org.argeo.api.acr.ldap.LdapAttr; import org.argeo.api.acr.search.AndFilter; import org.argeo.api.acr.spi.ProvidedRepository; +import org.argeo.api.app.EntityName; +import org.argeo.api.app.EntityType; +import org.argeo.api.app.WGS84PosName; import org.argeo.api.cms.CmsLog; -import org.argeo.app.api.EntityName; -import org.argeo.app.api.EntityType; -import org.argeo.app.api.WGS84PosName; import org.argeo.app.api.geo.FeatureAdapter; import org.argeo.app.api.geo.WfsKvp; import org.argeo.app.geo.CqlUtils; diff --git a/org.argeo.app.jcr/OSGI-INF/appUserState.xml b/org.argeo.app.jcr/OSGI-INF/appUserState.xml index 481884e..c870036 100644 --- a/org.argeo.app.jcr/OSGI-INF/appUserState.xml +++ b/org.argeo.app.jcr/OSGI-INF/appUserState.xml @@ -2,7 +2,7 @@ - + diff --git a/org.argeo.app.jcr/OSGI-INF/termsManager.xml b/org.argeo.app.jcr/OSGI-INF/termsManager.xml index e6a2abd..e75fec3 100644 --- a/org.argeo.app.jcr/OSGI-INF/termsManager.xml +++ b/org.argeo.app.jcr/OSGI-INF/termsManager.xml @@ -3,6 +3,6 @@ - + diff --git a/org.argeo.app.jcr/src/org/argeo/app/jcr/CustomMaintenanceService.java b/org.argeo.app.jcr/src/org/argeo/app/jcr/CustomMaintenanceService.java index 7fd9d2e..2882be0 100644 --- a/org.argeo.app.jcr/src/org/argeo/app/jcr/CustomMaintenanceService.java +++ b/org.argeo.app.jcr/src/org/argeo/app/jcr/CustomMaintenanceService.java @@ -11,8 +11,8 @@ import javax.jcr.ItemExistsException; import javax.jcr.Node; import javax.jcr.RepositoryException; +import org.argeo.api.app.EntityType; import org.argeo.api.cms.CmsLog; -import org.argeo.app.api.EntityType; import org.argeo.jcr.JcrUtils; import org.argeo.maintenance.AbstractMaintenanceService; diff --git a/org.argeo.app.jcr/src/org/argeo/app/jcr/JcrEntityDefinition.java b/org.argeo.app.jcr/src/org/argeo/app/jcr/JcrEntityDefinition.java index 8795d02..26950a4 100644 --- a/org.argeo.app.jcr/src/org/argeo/app/jcr/JcrEntityDefinition.java +++ b/org.argeo.app.jcr/src/org/argeo/app/jcr/JcrEntityDefinition.java @@ -6,8 +6,8 @@ import javax.jcr.Repository; import javax.jcr.RepositoryException; import javax.jcr.Session; -import org.argeo.app.api.EntityConstants; -import org.argeo.app.api.EntityDefinition; +import org.argeo.api.app.EntityConstants; +import org.argeo.api.app.EntityDefinition; import org.argeo.cms.jcr.CmsJcrUtils; import org.argeo.jcr.Jcr; import org.osgi.framework.BundleContext; diff --git a/org.argeo.app.jcr/src/org/argeo/app/jcr/SuiteJcrUtils.java b/org.argeo.app.jcr/src/org/argeo/app/jcr/SuiteJcrUtils.java index b846e0e..82589f2 100644 --- a/org.argeo.app.jcr/src/org/argeo/app/jcr/SuiteJcrUtils.java +++ b/org.argeo.app.jcr/src/org/argeo/app/jcr/SuiteJcrUtils.java @@ -13,12 +13,12 @@ import javax.jcr.security.Privilege; import javax.security.auth.x500.X500Principal; import org.argeo.api.acr.ldap.LdapAttr; +import org.argeo.api.app.AppUserState; +import org.argeo.api.app.EntityType; import org.argeo.api.cms.CmsConstants; import org.argeo.api.cms.CmsSession; -import org.argeo.app.api.AppUserState; -import org.argeo.app.api.EntityType; +import org.argeo.api.cms.auth.RoleNameUtils; import org.argeo.app.core.SuiteUtils; -import org.argeo.cms.RoleNameUtils; import org.argeo.jcr.JcrException; import org.argeo.jcr.JcrUtils; diff --git a/org.argeo.app.jcr/src/org/argeo/app/jcr/docbook/DbkJcrUtils.java b/org.argeo.app.jcr/src/org/argeo/app/jcr/docbook/DbkJcrUtils.java index 4454905..c7692dd 100644 --- a/org.argeo.app.jcr/src/org/argeo/app/jcr/docbook/DbkJcrUtils.java +++ b/org.argeo.app.jcr/src/org/argeo/app/jcr/docbook/DbkJcrUtils.java @@ -13,8 +13,8 @@ import javax.jcr.Node; import javax.jcr.NodeIterator; import javax.jcr.RepositoryException; +import org.argeo.api.app.EntityType; import org.argeo.api.cms.CmsLog; -import org.argeo.app.api.EntityType; import org.argeo.app.docbook.DbkAttr; import org.argeo.app.docbook.DbkType; import org.argeo.jcr.Jcr; diff --git a/org.argeo.app.jcr/src/org/argeo/app/jcr/odk/OdkJcrUtils.java b/org.argeo.app.jcr/src/org/argeo/app/jcr/odk/OdkJcrUtils.java index 881523f..3b608e1 100644 --- a/org.argeo.app.jcr/src/org/argeo/app/jcr/odk/OdkJcrUtils.java +++ b/org.argeo.app.jcr/src/org/argeo/app/jcr/odk/OdkJcrUtils.java @@ -15,9 +15,9 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; import javax.jcr.nodetype.NodeType; +import org.argeo.api.app.EntityMimeType; +import org.argeo.api.app.EntityType; import org.argeo.api.cms.CmsLog; -import org.argeo.app.api.EntityMimeType; -import org.argeo.app.api.EntityType; import org.argeo.app.odk.OdkNames; import org.argeo.app.odk.OrxListName; import org.argeo.app.odk.OrxManifestName; diff --git a/org.argeo.app.jcr/src/org/argeo/app/jcr/terms/SuiteTerm.java b/org.argeo.app.jcr/src/org/argeo/app/jcr/terms/SuiteTerm.java index db4e4a6..958b545 100644 --- a/org.argeo.app.jcr/src/org/argeo/app/jcr/terms/SuiteTerm.java +++ b/org.argeo.app.jcr/src/org/argeo/app/jcr/terms/SuiteTerm.java @@ -3,7 +3,7 @@ package org.argeo.app.jcr.terms; import java.util.ArrayList; import java.util.List; -import org.argeo.app.api.Term; +import org.argeo.api.app.Term; /** * A single term. Helper to optimise {@link SuiteTermsManager} implementation. diff --git a/org.argeo.app.jcr/src/org/argeo/app/jcr/terms/SuiteTermsManager.java b/org.argeo.app.jcr/src/org/argeo/app/jcr/terms/SuiteTermsManager.java index eba0529..30ecb76 100644 --- a/org.argeo.app.jcr/src/org/argeo/app/jcr/terms/SuiteTermsManager.java +++ b/org.argeo.app.jcr/src/org/argeo/app/jcr/terms/SuiteTermsManager.java @@ -13,12 +13,12 @@ import javax.jcr.Repository; import javax.jcr.RepositoryException; import javax.jcr.Session; +import org.argeo.api.app.EntityNames; +import org.argeo.api.app.EntityType; +import org.argeo.api.app.Term; +import org.argeo.api.app.TermsManager; +import org.argeo.api.app.Typology; import org.argeo.api.cms.CmsConstants; -import org.argeo.app.api.EntityNames; -import org.argeo.app.api.EntityType; -import org.argeo.app.api.Term; -import org.argeo.app.api.TermsManager; -import org.argeo.app.api.Typology; import org.argeo.cms.jcr.CmsJcrUtils; import org.argeo.jcr.Jcr; import org.argeo.jcr.JcrException; diff --git a/org.argeo.app.jcr/src/org/argeo/app/jcr/terms/SuiteTypology.java b/org.argeo.app.jcr/src/org/argeo/app/jcr/terms/SuiteTypology.java index 0040abb..b0095be 100644 --- a/org.argeo.app.jcr/src/org/argeo/app/jcr/terms/SuiteTypology.java +++ b/org.argeo.app.jcr/src/org/argeo/app/jcr/terms/SuiteTypology.java @@ -5,8 +5,8 @@ import java.util.List; import javax.jcr.Node; -import org.argeo.app.api.Term; -import org.argeo.app.api.Typology; +import org.argeo.api.app.Term; +import org.argeo.api.app.Typology; import org.argeo.jcr.Jcr; /** A typology. Helper to optimise {@link SuiteTermsManager} implementation. */ diff --git a/org.argeo.app.jcr/src/org/argeo/internal/app/jcr/AppUserStateImpl.java b/org.argeo.app.jcr/src/org/argeo/internal/app/jcr/AppUserStateImpl.java index 5b481f7..11c42d3 100644 --- a/org.argeo.app.jcr/src/org/argeo/internal/app/jcr/AppUserStateImpl.java +++ b/org.argeo.app.jcr/src/org/argeo/internal/app/jcr/AppUserStateImpl.java @@ -5,9 +5,9 @@ import javax.jcr.Node; import org.argeo.api.acr.Content; import org.argeo.api.acr.ContentRepository; import org.argeo.api.acr.ContentSession; +import org.argeo.api.app.AppUserState; import org.argeo.api.cms.CmsConstants; import org.argeo.api.cms.CmsSession; -import org.argeo.app.api.AppUserState; import org.argeo.app.jcr.SuiteJcrUtils; import org.argeo.cms.acr.ContentUtils; import org.argeo.cms.jcr.acr.JcrContentProvider; diff --git a/org.argeo.app.jcr/src/org/argeo/internal/app/jcr/SuiteMaintenanceService.java b/org.argeo.app.jcr/src/org/argeo/internal/app/jcr/SuiteMaintenanceService.java index ceeb4f5..b0198a0 100644 --- a/org.argeo.app.jcr/src/org/argeo/internal/app/jcr/SuiteMaintenanceService.java +++ b/org.argeo.app.jcr/src/org/argeo/internal/app/jcr/SuiteMaintenanceService.java @@ -8,8 +8,8 @@ import javax.jcr.Session; import javax.jcr.nodetype.NodeType; import javax.jcr.security.Privilege; +import org.argeo.api.app.EntityType; import org.argeo.api.cms.CmsConstants; -import org.argeo.app.api.EntityType; import org.argeo.jcr.JcrUtils; import org.argeo.maintenance.AbstractMaintenanceService; diff --git a/org.argeo.app.servlet.odk/OSGI-INF/odkSubmissionServlet.xml b/org.argeo.app.servlet.odk/OSGI-INF/odkSubmissionServlet.xml index f2d312e..29ff8ba 100644 --- a/org.argeo.app.servlet.odk/OSGI-INF/odkSubmissionServlet.xml +++ b/org.argeo.app.servlet.odk/OSGI-INF/odkSubmissionServlet.xml @@ -8,5 +8,5 @@ - + diff --git a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormListServlet.java b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormListServlet.java index 5310542..965082c 100644 --- a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormListServlet.java +++ b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormListServlet.java @@ -16,9 +16,9 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.argeo.api.app.EntityType; import org.argeo.api.cms.CmsConstants; import org.argeo.api.cms.CmsLog; -import org.argeo.app.api.EntityType; import org.argeo.app.odk.OrxListName; import org.argeo.app.odk.OrxManifestName; import org.argeo.cms.auth.RemoteAuthUtils; diff --git a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkManifestServlet.java b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkManifestServlet.java index de88a23..e5e2de6 100644 --- a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkManifestServlet.java +++ b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkManifestServlet.java @@ -29,9 +29,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.io.output.NullOutputStream; -import org.argeo.app.api.EntityMimeType; -import org.argeo.app.api.EntityType; -import org.argeo.app.api.WGS84PosName; +import org.argeo.api.app.EntityMimeType; +import org.argeo.api.app.EntityType; +import org.argeo.api.app.WGS84PosName; import org.argeo.app.geo.GeoShapeUtils; import org.argeo.app.odk.OrxManifestName; import org.argeo.cms.auth.RemoteAuthUtils; diff --git a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkSubmissionServlet.java b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkSubmissionServlet.java index da79b5e..68e701d 100644 --- a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkSubmissionServlet.java +++ b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkSubmissionServlet.java @@ -21,9 +21,9 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.Part; import org.argeo.api.acr.Content; +import org.argeo.api.app.AppUserState; import org.argeo.api.cms.CmsLog; import org.argeo.api.cms.CmsSession; -import org.argeo.app.api.AppUserState; import org.argeo.app.image.ImageProcessor; import org.argeo.app.odk.OrxType; import org.argeo.app.xforms.FormSubmissionListener; diff --git a/org.argeo.app.servlet.publish/bnd.bnd b/org.argeo.app.servlet.publish/bnd.bnd index 1e0191d..935672f 100644 --- a/org.argeo.app.servlet.publish/bnd.bnd +++ b/org.argeo.app.servlet.publish/bnd.bnd @@ -3,7 +3,7 @@ org.apache.xmlgraphics.image.loader,\ org.osgi.service.http.context,\ javax.jcr.nodetype,\ org.osgi.framework,\ -org.argeo.app.api,\ +org.argeo.api.app,\ org.argeo.cms.acr.xml,\ javax.servlet.*;version="[3,5)",\ * diff --git a/org.argeo.suite.knowledge/OSGI-INF/swtArgeoApp.xml b/org.argeo.suite.knowledge/OSGI-INF/swtArgeoApp.xml index 1d93582..314a0e4 100644 --- a/org.argeo.suite.knowledge/OSGI-INF/swtArgeoApp.xml +++ b/org.argeo.suite.knowledge/OSGI-INF/swtArgeoApp.xml @@ -10,5 +10,5 @@ - + diff --git a/org.argeo.suite.knowledge/OSGI-INF/termsEntryArea.xml b/org.argeo.suite.knowledge/OSGI-INF/termsEntryArea.xml index 07b259d..187f6e2 100644 --- a/org.argeo.suite.knowledge/OSGI-INF/termsEntryArea.xml +++ b/org.argeo.suite.knowledge/OSGI-INF/termsEntryArea.xml @@ -6,5 +6,5 @@ - + diff --git a/org.argeo.suite.knowledge/bnd.bnd b/org.argeo.suite.knowledge/bnd.bnd index 7824184..ef68882 100644 --- a/org.argeo.suite.knowledge/bnd.bnd +++ b/org.argeo.suite.knowledge/bnd.bnd @@ -7,7 +7,7 @@ OSGI-INF/termsEntryArea.xml,\ OSGI-INF/termsLayer.xml,\ Import-Package:\ -org.argeo.app.api,\ +org.argeo.api.app,\ org.argeo.cms.swt.acr;resolution:=optional,\ org.argeo.app.swt.ux;resolution:=optional,\ org.argeo.app.swt.terms;resolution:=optional,\ diff --git a/swt/org.argeo.app.swt/bnd.bnd b/swt/org.argeo.app.swt/bnd.bnd index 21c1d25..1e979d6 100644 --- a/swt/org.argeo.app.swt/bnd.bnd +++ b/swt/org.argeo.app.swt/bnd.bnd @@ -2,6 +2,6 @@ Import-Package:\ org.eclipse.swt,\ org.argeo.api.cms.ux,\ org.argeo.cms.ux.acr,\ -org.argeo.app.api,\ +org.argeo.api.app,\ org.argeo.cms.osgi,\ * \ No newline at end of file diff --git a/swt/org.argeo.app.swt/src/org/argeo/app/swt/docbook/DbkImageManager.java b/swt/org.argeo.app.swt/src/org/argeo/app/swt/docbook/DbkImageManager.java index 7154652..6d22d9f 100644 --- a/swt/org.argeo.app.swt/src/org/argeo/app/swt/docbook/DbkImageManager.java +++ b/swt/org.argeo.app.swt/src/org/argeo/app/swt/docbook/DbkImageManager.java @@ -11,10 +11,10 @@ import java.nio.charset.StandardCharsets; import org.argeo.api.acr.Content; import org.argeo.api.acr.DName; import org.argeo.api.acr.spi.ProvidedContent; +import org.argeo.api.app.EntityNames; +import org.argeo.api.app.EntityType; import org.argeo.api.cms.ux.Cms2DSize; import org.argeo.api.cms.ux.CmsImageManager; -import org.argeo.app.api.EntityNames; -import org.argeo.app.api.EntityType; import org.argeo.app.docbook.DbkAttr; import org.argeo.app.docbook.DbkType; import org.argeo.cms.acr.SvgAttrs; diff --git a/swt/org.argeo.app.swt/src/org/argeo/app/swt/space/SpaceEntryArea.java b/swt/org.argeo.app.swt/src/org/argeo/app/swt/space/SpaceEntryArea.java index 2c28a79..fabab76 100644 --- a/swt/org.argeo.app.swt/src/org/argeo/app/swt/space/SpaceEntryArea.java +++ b/swt/org.argeo.app.swt/src/org/argeo/app/swt/space/SpaceEntryArea.java @@ -6,8 +6,8 @@ import java.util.List; import org.argeo.api.acr.Content; import org.argeo.api.acr.NamespaceUtils; import org.argeo.api.acr.spi.ProvidedContent; +import org.argeo.api.app.EntityType; import org.argeo.api.cms.ux.CmsView; -import org.argeo.app.api.EntityType; import org.argeo.cms.swt.CmsSwtUtils; import org.argeo.cms.swt.acr.SwtUiProvider; import org.argeo.cms.swt.widgets.SwtTreeView; diff --git a/swt/org.argeo.app.swt/src/org/argeo/app/swt/terms/AbstractTermsPart.java b/swt/org.argeo.app.swt/src/org/argeo/app/swt/terms/AbstractTermsPart.java index 2ca2a57..bab73db 100644 --- a/swt/org.argeo.app.swt/src/org/argeo/app/swt/terms/AbstractTermsPart.java +++ b/swt/org.argeo.app.swt/src/org/argeo/app/swt/terms/AbstractTermsPart.java @@ -1,10 +1,10 @@ package org.argeo.app.swt.terms; import org.argeo.api.acr.Content; +import org.argeo.api.app.Term; +import org.argeo.api.app.TermsManager; +import org.argeo.api.app.Typology; import org.argeo.api.cms.ux.CmsIcon; -import org.argeo.app.api.Term; -import org.argeo.app.api.TermsManager; -import org.argeo.app.api.Typology; import org.argeo.cms.Localized; import org.argeo.cms.swt.CmsSwtTheme; import org.argeo.cms.swt.CmsSwtUtils; diff --git a/swt/org.argeo.app.swt/src/org/argeo/app/swt/terms/MultiTermsPart.java b/swt/org.argeo.app.swt/src/org/argeo/app/swt/terms/MultiTermsPart.java index 80b6f72..252b597 100644 --- a/swt/org.argeo.app.swt/src/org/argeo/app/swt/terms/MultiTermsPart.java +++ b/swt/org.argeo.app.swt/src/org/argeo/app/swt/terms/MultiTermsPart.java @@ -5,9 +5,9 @@ import java.util.List; import org.argeo.api.acr.Content; import org.argeo.api.acr.NamespaceUtils; +import org.argeo.api.app.Term; +import org.argeo.api.app.TermsManager; import org.argeo.api.cms.CmsLog; -import org.argeo.app.api.Term; -import org.argeo.app.api.TermsManager; import org.argeo.app.ux.SuiteStyle; import org.argeo.cms.swt.CmsSwtUtils; import org.argeo.cms.swt.MouseDoubleClick; diff --git a/swt/org.argeo.app.swt/src/org/argeo/app/swt/terms/SingleTermPart.java b/swt/org.argeo.app.swt/src/org/argeo/app/swt/terms/SingleTermPart.java index 0a1abda..c824173 100644 --- a/swt/org.argeo.app.swt/src/org/argeo/app/swt/terms/SingleTermPart.java +++ b/swt/org.argeo.app.swt/src/org/argeo/app/swt/terms/SingleTermPart.java @@ -3,8 +3,8 @@ package org.argeo.app.swt.terms; import java.util.List; import org.argeo.api.acr.Content; -import org.argeo.app.api.Term; -import org.argeo.app.api.TermsManager; +import org.argeo.api.app.Term; +import org.argeo.api.app.TermsManager; import org.argeo.app.ux.SuiteStyle; import org.argeo.cms.swt.CmsSwtUtils; import org.argeo.cms.swt.MouseDoubleClick; diff --git a/swt/org.argeo.app.swt/src/org/argeo/app/swt/terms/TermsEntryArea.java b/swt/org.argeo.app.swt/src/org/argeo/app/swt/terms/TermsEntryArea.java index 912c43f..8c645ad 100644 --- a/swt/org.argeo.app.swt/src/org/argeo/app/swt/terms/TermsEntryArea.java +++ b/swt/org.argeo.app.swt/src/org/argeo/app/swt/terms/TermsEntryArea.java @@ -3,9 +3,9 @@ package org.argeo.app.swt.terms; import org.argeo.api.acr.Content; import org.argeo.api.acr.NamespaceUtils; import org.argeo.api.acr.spi.ProvidedContent; +import org.argeo.api.app.EntityType; +import org.argeo.api.app.TermsManager; import org.argeo.api.cms.ux.CmsView; -import org.argeo.app.api.EntityType; -import org.argeo.app.api.TermsManager; import org.argeo.app.ux.SuiteUxEvent; import org.argeo.cms.swt.CmsSwtUtils; import org.argeo.cms.swt.acr.SwtUiProvider; diff --git a/swt/org.argeo.app.swt/src/org/argeo/app/swt/ux/DefaultLeadPane.java b/swt/org.argeo.app.swt/src/org/argeo/app/swt/ux/DefaultLeadPane.java index 2b17dee..a46112b 100644 --- a/swt/org.argeo.app.swt/src/org/argeo/app/swt/ux/DefaultLeadPane.java +++ b/swt/org.argeo.app.swt/src/org/argeo/app/swt/ux/DefaultLeadPane.java @@ -9,10 +9,10 @@ import java.util.Set; import java.util.TreeMap; import org.argeo.api.acr.Content; +import org.argeo.api.app.RankedObject; import org.argeo.api.cms.CmsLog; import org.argeo.api.cms.ux.CmsIcon; import org.argeo.api.cms.ux.CmsView; -import org.argeo.app.api.RankedObject; import org.argeo.app.core.SuiteUtils; import org.argeo.app.ux.SuiteIcon; import org.argeo.app.ux.SuiteStyle; diff --git a/swt/org.argeo.app.swt/src/org/argeo/app/swt/ux/SwtArgeoApp.java b/swt/org.argeo.app.swt/src/org/argeo/app/swt/ux/SwtArgeoApp.java index 2864163..d123aa0 100644 --- a/swt/org.argeo.app.swt/src/org/argeo/app/swt/ux/SwtArgeoApp.java +++ b/swt/org.argeo.app.swt/src/org/argeo/app/swt/ux/SwtArgeoApp.java @@ -22,6 +22,11 @@ import javax.xml.namespace.QName; import org.argeo.api.acr.Content; import org.argeo.api.acr.ContentRepository; import org.argeo.api.acr.spi.ProvidedSession; +import org.argeo.api.app.AppUserState; +import org.argeo.api.app.EntityConstants; +import org.argeo.api.app.EntityName; +import org.argeo.api.app.EntityType; +import org.argeo.api.app.RankedObject; import org.argeo.api.cms.CmsConstants; import org.argeo.api.cms.CmsEvent; import org.argeo.api.cms.CmsEventSubscriber; @@ -30,11 +35,6 @@ import org.argeo.api.cms.CmsSession; import org.argeo.api.cms.ux.CmsTheme; import org.argeo.api.cms.ux.CmsUi; import org.argeo.api.cms.ux.CmsView; -import org.argeo.app.api.AppUserState; -import org.argeo.app.api.EntityConstants; -import org.argeo.app.api.EntityName; -import org.argeo.app.api.EntityType; -import org.argeo.app.api.RankedObject; import org.argeo.app.ux.AbstractArgeoApp; import org.argeo.app.ux.AppUi; import org.argeo.app.ux.SuiteUxEvent; diff --git a/swt/org.argeo.app.ui/OSGI-INF/cmsApp.xml b/swt/org.argeo.app.ui/OSGI-INF/cmsApp.xml index 604f9f9..2c299a3 100644 --- a/swt/org.argeo.app.ui/OSGI-INF/cmsApp.xml +++ b/swt/org.argeo.app.ui/OSGI-INF/cmsApp.xml @@ -10,5 +10,5 @@ - + diff --git a/swt/org.argeo.app.ui/src/org/argeo/app/ui/RecentItems.java b/swt/org.argeo.app.ui/src/org/argeo/app/ui/RecentItems.java index 3cc6210..c9bcd5a 100644 --- a/swt/org.argeo.app.ui/src/org/argeo/app/ui/RecentItems.java +++ b/swt/org.argeo.app.ui/src/org/argeo/app/ui/RecentItems.java @@ -15,7 +15,7 @@ import javax.jcr.observation.EventListener; import javax.jcr.query.Query; import javax.jcr.query.QueryResult; -import org.argeo.app.api.EntityType; +import org.argeo.api.app.EntityType; import org.argeo.app.jcr.XPathUtils; import org.argeo.app.ui.widgets.DelayedText; import org.argeo.app.ux.SuiteIcon; diff --git a/swt/org.argeo.app.ui/src/org/argeo/app/ui/SuiteUiUtils.java b/swt/org.argeo.app.ui/src/org/argeo/app/ui/SuiteUiUtils.java index 62463c7..f5cfba5 100644 --- a/swt/org.argeo.app.ui/src/org/argeo/app/ui/SuiteUiUtils.java +++ b/swt/org.argeo.app.ui/src/org/argeo/app/ui/SuiteUiUtils.java @@ -13,10 +13,10 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; import org.apache.commons.io.IOUtils; +import org.argeo.api.app.EntityNames; +import org.argeo.api.app.EntityType; import org.argeo.api.cms.ux.CmsEditable; import org.argeo.api.cms.ux.CmsStyle; -import org.argeo.app.api.EntityNames; -import org.argeo.app.api.EntityType; import org.argeo.app.swt.ux.SuiteSwtUtils; import org.argeo.app.ux.SuiteUxEvent; import org.argeo.cms.acr.ContentUtils; diff --git a/swt/org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkImageManager.java b/swt/org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkImageManager.java index fef7a02..3136bf3 100644 --- a/swt/org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkImageManager.java +++ b/swt/org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkImageManager.java @@ -17,10 +17,10 @@ import javax.jcr.Node; import javax.jcr.RepositoryException; import javax.jcr.nodetype.NodeType; +import org.argeo.api.app.EntityNames; +import org.argeo.api.app.EntityType; import org.argeo.api.cms.ux.Cms2DSize; import org.argeo.api.cms.ux.CmsImageManager; -import org.argeo.app.api.EntityNames; -import org.argeo.app.api.EntityType; import org.argeo.app.docbook.DbkAttr; import org.argeo.app.docbook.DbkType; import org.argeo.app.jcr.docbook.DbkJcrUtils; diff --git a/swt/org.argeo.app.ui/src/org/argeo/app/ui/forms/AbstractTermsPart.java b/swt/org.argeo.app.ui/src/org/argeo/app/ui/forms/AbstractTermsPart.java index b1cadca..788c253 100644 --- a/swt/org.argeo.app.ui/src/org/argeo/app/ui/forms/AbstractTermsPart.java +++ b/swt/org.argeo.app.ui/src/org/argeo/app/ui/forms/AbstractTermsPart.java @@ -2,10 +2,10 @@ package org.argeo.app.ui.forms; import javax.jcr.Item; +import org.argeo.api.app.Term; +import org.argeo.api.app.TermsManager; +import org.argeo.api.app.Typology; import org.argeo.api.cms.ux.CmsIcon; -import org.argeo.app.api.Term; -import org.argeo.app.api.TermsManager; -import org.argeo.app.api.Typology; import org.argeo.cms.Localized; import org.argeo.cms.swt.CmsSwtTheme; import org.argeo.cms.swt.CmsSwtUtils; diff --git a/swt/org.argeo.app.ui/src/org/argeo/app/ui/forms/MultiTermsPart.java b/swt/org.argeo.app.ui/src/org/argeo/app/ui/forms/MultiTermsPart.java index 57a6949..6978596 100644 --- a/swt/org.argeo.app.ui/src/org/argeo/app/ui/forms/MultiTermsPart.java +++ b/swt/org.argeo.app.ui/src/org/argeo/app/ui/forms/MultiTermsPart.java @@ -5,9 +5,9 @@ import java.util.List; import javax.jcr.Item; +import org.argeo.api.app.Term; +import org.argeo.api.app.TermsManager; import org.argeo.api.cms.CmsLog; -import org.argeo.app.api.Term; -import org.argeo.app.api.TermsManager; import org.argeo.cms.swt.CmsSwtUtils; import org.argeo.cms.swt.SwtEditablePart; import org.argeo.cms.swt.MouseDoubleClick; diff --git a/swt/org.argeo.app.ui/src/org/argeo/app/ui/forms/SingleTermPart.java b/swt/org.argeo.app.ui/src/org/argeo/app/ui/forms/SingleTermPart.java index 57086ad..401fe3a 100644 --- a/swt/org.argeo.app.ui/src/org/argeo/app/ui/forms/SingleTermPart.java +++ b/swt/org.argeo.app.ui/src/org/argeo/app/ui/forms/SingleTermPart.java @@ -4,8 +4,8 @@ import java.util.List; import javax.jcr.Item; -import org.argeo.app.api.Term; -import org.argeo.app.api.TermsManager; +import org.argeo.api.app.Term; +import org.argeo.api.app.TermsManager; import org.argeo.cms.swt.CmsSwtUtils; import org.argeo.cms.swt.SwtEditablePart; import org.argeo.cms.swt.MouseDoubleClick; diff --git a/swt/org.argeo.app.ui/src/org/argeo/app/ui/library/ContentEntryArea.java b/swt/org.argeo.app.ui/src/org/argeo/app/ui/library/ContentEntryArea.java index 4664758..aa939d6 100644 --- a/swt/org.argeo.app.ui/src/org/argeo/app/ui/library/ContentEntryArea.java +++ b/swt/org.argeo.app.ui/src/org/argeo/app/ui/library/ContentEntryArea.java @@ -3,9 +3,9 @@ package org.argeo.app.ui.library; import org.argeo.api.acr.Content; import org.argeo.api.acr.NamespaceUtils; import org.argeo.api.acr.spi.ProvidedContent; +import org.argeo.api.app.EntityType; import org.argeo.api.cms.CmsLog; import org.argeo.api.cms.ux.CmsView; -import org.argeo.app.api.EntityType; import org.argeo.app.ux.SuiteUxEvent; import org.argeo.cms.swt.CmsSwtUtils; import org.argeo.cms.swt.acr.SwtUiProvider; diff --git a/swt/org.argeo.app.ui/src/org/argeo/app/ui/library/JcrContentEntryArea.java b/swt/org.argeo.app.ui/src/org/argeo/app/ui/library/JcrContentEntryArea.java index 286a4cb..f2e3e3b 100644 --- a/swt/org.argeo.app.ui/src/org/argeo/app/ui/library/JcrContentEntryArea.java +++ b/swt/org.argeo.app.ui/src/org/argeo/app/ui/library/JcrContentEntryArea.java @@ -11,8 +11,8 @@ import javax.jcr.nodetype.NodeType; import javax.jcr.query.Query; import org.argeo.api.acr.Content; +import org.argeo.api.app.EntityType; import org.argeo.api.cms.CmsConstants; -import org.argeo.app.api.EntityType; import org.argeo.app.ui.SuiteUiUtils; import org.argeo.app.ui.widgets.TreeOrSearchArea; import org.argeo.app.ux.SuiteIcon; diff --git a/swt/org.argeo.app.ui/src/org/argeo/app/ui/openlayers/OpenLayersMap.java b/swt/org.argeo.app.ui/src/org/argeo/app/ui/openlayers/OpenLayersMap.java index 40b3388..c0994eb 100644 --- a/swt/org.argeo.app.ui/src/org/argeo/app/ui/openlayers/OpenLayersMap.java +++ b/swt/org.argeo.app.ui/src/org/argeo/app/ui/openlayers/OpenLayersMap.java @@ -13,11 +13,11 @@ import javax.jcr.Node; import javax.jcr.RepositoryException; import org.apache.commons.io.IOUtils; -import org.argeo.app.api.EntityNames; -import org.argeo.app.api.EntityType; import org.argeo.app.ux.SuiteUxEvent; import org.argeo.api.cms.CmsLog; import org.argeo.api.cms.ux.CmsView; +import org.argeo.api.app.EntityNames; +import org.argeo.api.app.EntityType; import org.argeo.api.cms.CmsConstants; import org.argeo.cms.swt.CmsSwtUtils; import org.eclipse.swt.SWT; diff --git a/swt/org.argeo.app.ui/src/org/argeo/app/ui/openlayers/OverviewMap.java b/swt/org.argeo.app.ui/src/org/argeo/app/ui/openlayers/OverviewMap.java index e4e63b8..f1d3900 100644 --- a/swt/org.argeo.app.ui/src/org/argeo/app/ui/openlayers/OverviewMap.java +++ b/swt/org.argeo.app.ui/src/org/argeo/app/ui/openlayers/OverviewMap.java @@ -11,8 +11,8 @@ import javax.jcr.observation.EventListener; import javax.jcr.query.Query; import org.argeo.api.acr.Content; +import org.argeo.api.app.EntityType; import org.argeo.api.cms.CmsConstants; -import org.argeo.app.api.EntityType; import org.argeo.cms.jcr.acr.JcrContentProvider; import org.argeo.cms.swt.CmsSwtUtils; import org.argeo.cms.ui.CmsUiProvider; diff --git a/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/PersonUiProvider.java b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/PersonUiProvider.java index 780512e..a7be1ef 100644 --- a/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/PersonUiProvider.java +++ b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/PersonUiProvider.java @@ -8,20 +8,20 @@ import org.argeo.api.acr.Content; import org.argeo.api.acr.QNamed; import org.argeo.api.acr.ldap.LdapAttr; import org.argeo.api.acr.ldap.LdapObj; +import org.argeo.api.app.SuiteRole; +import org.argeo.api.cms.auth.RoleNameUtils; +import org.argeo.api.cms.auth.SystemRole; import org.argeo.api.cms.directory.CmsGroup; import org.argeo.api.cms.directory.CmsUser; import org.argeo.api.cms.directory.CmsUserManager; import org.argeo.api.cms.directory.HierarchyUnit; import org.argeo.api.cms.directory.HierarchyUnit.Type; -import org.argeo.app.api.SuiteRole; import org.argeo.app.swt.ux.SuiteSwtUtils; import org.argeo.app.ux.SuiteMsg; import org.argeo.app.ux.SuiteStyle; import org.argeo.cms.CmsMsg; import org.argeo.cms.CurrentUser; import org.argeo.cms.Localized; -import org.argeo.cms.RoleNameUtils; -import org.argeo.cms.SystemRole; import org.argeo.cms.auth.CmsSystemRole; import org.argeo.cms.swt.CmsSwtUtils; import org.argeo.cms.swt.Selected; -- 2.30.2