You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/12/04 15:09:57 UTC
[isis] 01/03: ISIS-2207: moves o.a.isis.schema classes (in applib)
under o.a.isis.applib
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit bacccc6c5490edfc7796493dce5d496951087fff
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 14:13:59 2019 +0000
ISIS-2207: moves o.a.isis.schema classes (in applib) under o.a.isis.applib
---
.../main/java/org/apache/isis/applib/domain/DomainObjectList.java | 2 +-
.../utils => applib}/jaxbadapters/PersistentEntitiesAdapter.java | 2 +-
.../utils => applib}/jaxbadapters/PersistentEntityAdapter.java | 2 +-
.../services/conmap/command/ContentMappingServiceForCommandDto.java | 2 +-
.../java/org/apache/isis/applib/services/iactn/Interaction.java | 2 +-
.../org/apache/isis/applib/services/jaxb/JaxbServiceDefault.java | 4 ++--
.../org/apache/isis/applib/services/publish/PublisherService.java | 3 ++-
.../isis/applib/services/publish/PublisherServiceLogging.java | 4 ++--
.../isis/{schema/utils => applib/util/schema}/ChangesDtoUtils.java | 2 +-
.../isis/{schema/utils => applib/util/schema}/CommandDtoUtils.java | 2 +-
.../isis/{schema/utils => applib/util/schema}/CommonDtoUtils.java | 2 +-
.../{schema/utils => applib/util/schema}/InteractionDtoUtils.java | 2 +-
.../utils => applib/util/schema}/MemberExecutionDtoUtils.java | 2 +-
.../java/org/apache/isis/schema/utils/CommandDtoUtils_Test.java | 2 ++
.../test/java/org/apache/isis/schema/utils/CommonDtoUtils_Test.java | 1 +
.../apache/isis/schema/utils/CommonDtoUtils_setValueOn_Test.java | 1 +
.../schema/utils/InteractionDtoUtilsTest_deriveLogicalMemberId.java | 1 +
.../src/test/java/org/apache/isis/schema/utils/Roundtrip.java | 1 +
.../org/apache/isis/metamodel/facets/jaxb/JaxbFacetFactory.java | 2 +-
.../apache/isis/metamodel/services/metamodel/MetaModelExporter.java | 2 +-
.../isis/metamodel/specloader/SpecificationLoaderDefault.java | 2 +-
.../isis/metamodel/specloader/specimpl/ObjectMemberAbstract.java | 3 +--
.../java/org/apache/isis/jdo/objectadapter/ObjectAdapterLegacy.java | 2 +-
.../runtime/services/background/CommandExecutorServiceDefault.java | 4 ++--
.../runtime/services/command/CommandDtoServiceInternalDefault.java | 4 ++--
.../runtime/services/ixn/InteractionDtoServiceInternalDefault.java | 4 ++--
.../isis/runtime/system/session/IsisSessionFactoryDefault.java | 6 +++---
.../jaxrs/resteasy/conneg/RestfulObjectsJaxbWriterForXml.java | 2 +-
.../fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java | 2 +-
.../java/org/apache/isis/extensions/restclient/ResponseDigest.java | 2 +-
migration-notes.adoc | 4 ++++
31 files changed, 43 insertions(+), 33 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java b/core/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java
index bdc6a17..fa76e1e 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java
@@ -35,7 +35,7 @@ import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.schema.utils.jaxbadapters.PersistentEntitiesAdapter;
+import org.apache.isis.applib.jaxbadapters.PersistentEntitiesAdapter;
@XmlRootElement(name = "list")
@XmlType(
diff --git a/core/applib/src/main/java/org/apache/isis/schema/utils/jaxbadapters/PersistentEntitiesAdapter.java b/core/applib/src/main/java/org/apache/isis/applib/jaxbadapters/PersistentEntitiesAdapter.java
similarity index 97%
rename from core/applib/src/main/java/org/apache/isis/schema/utils/jaxbadapters/PersistentEntitiesAdapter.java
rename to core/applib/src/main/java/org/apache/isis/applib/jaxbadapters/PersistentEntitiesAdapter.java
index fb752d7..c01e22a 100644
--- a/core/applib/src/main/java/org/apache/isis/schema/utils/jaxbadapters/PersistentEntitiesAdapter.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/jaxbadapters/PersistentEntitiesAdapter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.isis.schema.utils.jaxbadapters;
+package org.apache.isis.applib.jaxbadapters;
import java.util.List;
diff --git a/core/applib/src/main/java/org/apache/isis/schema/utils/jaxbadapters/PersistentEntityAdapter.java b/core/applib/src/main/java/org/apache/isis/applib/jaxbadapters/PersistentEntityAdapter.java
similarity index 97%
rename from core/applib/src/main/java/org/apache/isis/schema/utils/jaxbadapters/PersistentEntityAdapter.java
rename to core/applib/src/main/java/org/apache/isis/applib/jaxbadapters/PersistentEntityAdapter.java
index 571f7a4..7ec8d64 100644
--- a/core/applib/src/main/java/org/apache/isis/schema/utils/jaxbadapters/PersistentEntityAdapter.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/jaxbadapters/PersistentEntityAdapter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.isis.schema.utils.jaxbadapters;
+package org.apache.isis.applib.jaxbadapters;
import javax.inject.Inject;
import javax.xml.bind.annotation.adapters.XmlAdapter;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandDto.java b/core/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandDto.java
index 4e487c4..84fecd7 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandDto.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandDto.java
@@ -37,7 +37,7 @@ import org.apache.isis.applib.services.command.CommandWithDto;
import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.schema.cmd.v1.CommandDto;
import org.apache.isis.schema.common.v1.PeriodDto;
-import org.apache.isis.schema.utils.CommandDtoUtils;
+import org.apache.isis.applib.util.schema.CommandDtoUtils;
import org.apache.isis.schema.utils.jaxbadapters.JavaSqlTimestampXmlGregorianCalendarAdapter;
@DomainService(nature = NatureOfService.DOMAIN)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java b/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
index a8f45d6..f8a8704 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
@@ -51,7 +51,7 @@ import org.apache.isis.schema.ixn.v1.MemberExecutionDto;
import org.apache.isis.schema.ixn.v1.MetricsDto;
import org.apache.isis.schema.ixn.v1.ObjectCountsDto;
import org.apache.isis.schema.ixn.v1.PropertyEditDto;
-import org.apache.isis.schema.utils.MemberExecutionDtoUtils;
+import org.apache.isis.applib.util.schema.MemberExecutionDtoUtils;
import org.apache.isis.schema.utils.jaxbadapters.JavaSqlTimestampXmlGregorianCalendarAdapter;
/**
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbServiceDefault.java b/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbServiceDefault.java
index eb94b52..9d6cf0d 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbServiceDefault.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbServiceDefault.java
@@ -34,8 +34,8 @@ import org.apache.isis.applib.domain.DomainObjectList;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.schema.utils.jaxbadapters.PersistentEntitiesAdapter;
-import org.apache.isis.schema.utils.jaxbadapters.PersistentEntityAdapter;
+import org.apache.isis.applib.jaxbadapters.PersistentEntitiesAdapter;
+import org.apache.isis.applib.jaxbadapters.PersistentEntityAdapter;
@Service
public class JaxbServiceDefault extends JaxbService.Simple {
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherService.java b/core/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherService.java
index 6dc8f51..a23bedd 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherService.java
@@ -19,6 +19,7 @@
package org.apache.isis.applib.services.publish;
import org.apache.isis.applib.services.iactn.Interaction;
+import org.apache.isis.applib.util.schema.InteractionDtoUtils;
/**
* Replaces {@link PublishingService}.
@@ -31,7 +32,7 @@ public interface PublisherService {
/**
* Most implementations are expected to use {@link Interaction.Execution#getDto()} to create a serializable
- * XML representation of the execution. The easiest way to do this is using {@link org.apache.isis.schema.utils.InteractionDtoUtils#newInteractionDto(Interaction.Execution)}. There is
+ * XML representation of the execution. The easiest way to do this is using {@link InteractionDtoUtils#newInteractionDto(Interaction.Execution)}. There is
* some flexibility here, though.
*/
void publish(final Interaction.Execution<?, ?> execution);
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherServiceLogging.java b/core/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherServiceLogging.java
index 91bedd0..8d69942 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherServiceLogging.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherServiceLogging.java
@@ -23,8 +23,8 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.services.iactn.Interaction;
import org.apache.isis.schema.chg.v1.ChangesDto;
import org.apache.isis.schema.ixn.v1.InteractionDto;
-import org.apache.isis.schema.utils.ChangesDtoUtils;
-import org.apache.isis.schema.utils.InteractionDtoUtils;
+import org.apache.isis.applib.util.schema.ChangesDtoUtils;
+import org.apache.isis.applib.util.schema.InteractionDtoUtils;
import lombok.extern.log4j.Log4j2;
diff --git a/core/applib/src/main/java/org/apache/isis/schema/utils/ChangesDtoUtils.java b/core/applib/src/main/java/org/apache/isis/applib/util/schema/ChangesDtoUtils.java
similarity index 98%
rename from core/applib/src/main/java/org/apache/isis/schema/utils/ChangesDtoUtils.java
rename to core/applib/src/main/java/org/apache/isis/applib/util/schema/ChangesDtoUtils.java
index 5583fc6..7412d5f 100644
--- a/core/applib/src/main/java/org/apache/isis/schema/utils/ChangesDtoUtils.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/util/schema/ChangesDtoUtils.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.schema.utils;
+package org.apache.isis.applib.util.schema;
import java.io.CharArrayWriter;
import java.io.IOException;
diff --git a/core/applib/src/main/java/org/apache/isis/schema/utils/CommandDtoUtils.java b/core/applib/src/main/java/org/apache/isis/applib/util/schema/CommandDtoUtils.java
similarity index 99%
rename from core/applib/src/main/java/org/apache/isis/schema/utils/CommandDtoUtils.java
rename to core/applib/src/main/java/org/apache/isis/applib/util/schema/CommandDtoUtils.java
index 9e77e1a..07373ba 100644
--- a/core/applib/src/main/java/org/apache/isis/schema/utils/CommandDtoUtils.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/util/schema/CommandDtoUtils.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.schema.utils;
+package org.apache.isis.applib.util.schema;
import java.io.CharArrayWriter;
import java.io.IOException;
diff --git a/core/applib/src/main/java/org/apache/isis/schema/utils/CommonDtoUtils.java b/core/applib/src/main/java/org/apache/isis/applib/util/schema/CommonDtoUtils.java
similarity index 99%
rename from core/applib/src/main/java/org/apache/isis/schema/utils/CommonDtoUtils.java
rename to core/applib/src/main/java/org/apache/isis/applib/util/schema/CommonDtoUtils.java
index f8975c5..57e9839 100644
--- a/core/applib/src/main/java/org/apache/isis/schema/utils/CommonDtoUtils.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/util/schema/CommonDtoUtils.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.schema.utils;
+package org.apache.isis.applib.util.schema;
import java.math.BigDecimal;
import java.math.BigInteger;
diff --git a/core/applib/src/main/java/org/apache/isis/schema/utils/InteractionDtoUtils.java b/core/applib/src/main/java/org/apache/isis/applib/util/schema/InteractionDtoUtils.java
similarity index 99%
rename from core/applib/src/main/java/org/apache/isis/schema/utils/InteractionDtoUtils.java
rename to core/applib/src/main/java/org/apache/isis/applib/util/schema/InteractionDtoUtils.java
index e474535..7fc73df 100644
--- a/core/applib/src/main/java/org/apache/isis/schema/utils/InteractionDtoUtils.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/util/schema/InteractionDtoUtils.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.schema.utils;
+package org.apache.isis.applib.util.schema;
import java.io.CharArrayWriter;
import java.io.IOException;
diff --git a/core/applib/src/main/java/org/apache/isis/schema/utils/MemberExecutionDtoUtils.java b/core/applib/src/main/java/org/apache/isis/applib/util/schema/MemberExecutionDtoUtils.java
similarity index 99%
rename from core/applib/src/main/java/org/apache/isis/schema/utils/MemberExecutionDtoUtils.java
rename to core/applib/src/main/java/org/apache/isis/applib/util/schema/MemberExecutionDtoUtils.java
index b0966a8..7b4d236 100644
--- a/core/applib/src/main/java/org/apache/isis/schema/utils/MemberExecutionDtoUtils.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/util/schema/MemberExecutionDtoUtils.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.schema.utils;
+package org.apache.isis.applib.util.schema;
import java.io.StringReader;
import java.io.StringWriter;
diff --git a/core/applib/src/test/java/org/apache/isis/schema/utils/CommandDtoUtils_Test.java b/core/applib/src/test/java/org/apache/isis/schema/utils/CommandDtoUtils_Test.java
index c81e9d4..740ddfa 100644
--- a/core/applib/src/test/java/org/apache/isis/schema/utils/CommandDtoUtils_Test.java
+++ b/core/applib/src/test/java/org/apache/isis/schema/utils/CommandDtoUtils_Test.java
@@ -18,6 +18,8 @@
*/
package org.apache.isis.schema.utils;
+import org.apache.isis.applib.util.schema.CommandDtoUtils;
+import org.apache.isis.applib.util.schema.CommonDtoUtils;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/applib/src/test/java/org/apache/isis/schema/utils/CommonDtoUtils_Test.java b/core/applib/src/test/java/org/apache/isis/schema/utils/CommonDtoUtils_Test.java
index 5001389..39f440f 100644
--- a/core/applib/src/test/java/org/apache/isis/schema/utils/CommonDtoUtils_Test.java
+++ b/core/applib/src/test/java/org/apache/isis/schema/utils/CommonDtoUtils_Test.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.schema.utils;
+import org.apache.isis.applib.util.schema.CommonDtoUtils;
import org.jmock.auto.Mock;
import org.junit.Assert;
import org.junit.Rule;
diff --git a/core/applib/src/test/java/org/apache/isis/schema/utils/CommonDtoUtils_setValueOn_Test.java b/core/applib/src/test/java/org/apache/isis/schema/utils/CommonDtoUtils_setValueOn_Test.java
index c325b6e..b7df201 100644
--- a/core/applib/src/test/java/org/apache/isis/schema/utils/CommonDtoUtils_setValueOn_Test.java
+++ b/core/applib/src/test/java/org/apache/isis/schema/utils/CommonDtoUtils_setValueOn_Test.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.schema.utils;
+import org.apache.isis.applib.util.schema.CommonDtoUtils;
import org.jmock.auto.Mock;
import org.junit.Assert;
import org.junit.Before;
diff --git a/core/applib/src/test/java/org/apache/isis/schema/utils/InteractionDtoUtilsTest_deriveLogicalMemberId.java b/core/applib/src/test/java/org/apache/isis/schema/utils/InteractionDtoUtilsTest_deriveLogicalMemberId.java
index 5b64bf3..94f595c 100644
--- a/core/applib/src/test/java/org/apache/isis/schema/utils/InteractionDtoUtilsTest_deriveLogicalMemberId.java
+++ b/core/applib/src/test/java/org/apache/isis/schema/utils/InteractionDtoUtilsTest_deriveLogicalMemberId.java
@@ -16,6 +16,7 @@
*/
package org.apache.isis.schema.utils;
+import org.apache.isis.applib.util.schema.InteractionDtoUtils;
import org.junit.Test;
import org.apache.isis.applib.services.bookmark.Bookmark;
diff --git a/core/applib/src/test/java/org/apache/isis/schema/utils/Roundtrip.java b/core/applib/src/test/java/org/apache/isis/schema/utils/Roundtrip.java
index c31e4f7..dda566c 100644
--- a/core/applib/src/test/java/org/apache/isis/schema/utils/Roundtrip.java
+++ b/core/applib/src/test/java/org/apache/isis/schema/utils/Roundtrip.java
@@ -26,6 +26,7 @@ import java.util.Date;
import java.util.List;
import java.util.UUID;
+import org.apache.isis.applib.util.schema.InteractionDtoUtils;
import org.hamcrest.Matchers;
import org.joda.time.DateTime;
import org.joda.time.LocalDate;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/jaxb/JaxbFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/jaxb/JaxbFacetFactory.java
index 7c5997e..081e628 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/jaxb/JaxbFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/jaxb/JaxbFacetFactory.java
@@ -274,7 +274,7 @@ implements MetaModelRefiner {
validator.onFailure(
property,
property.getIdentifier(),
- "JAXB view model '%s' property '%s' is of type '%s' but that type is not annotated with @XmlJavaTypeAdapter. The type must be annotated with @XmlJavaTypeAdapter(org.apache.isis.schema.utils.jaxbadapters.PersistentEntityAdapter.class) or equivalent.",
+ "JAXB view model '%s' property '%s' is of type '%s' but that type is not annotated with @XmlJavaTypeAdapter. The type must be annotated with @XmlJavaTypeAdapter(org.apache.isis.applib.jaxbadapters.PersistentEntityAdapter.class) or equivalent.",
objectSpec.getFullIdentifier(),
property.getId(),
propertyType.getName());
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/MetaModelExporter.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/MetaModelExporter.java
index 15bf530..f2d80a8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/MetaModelExporter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/MetaModelExporter.java
@@ -55,7 +55,7 @@ import org.apache.isis.schema.metamodel.v1.Param;
import org.apache.isis.schema.metamodel.v1.Property;
import org.apache.isis.schema.metamodel.v1.ScalarParam;
import org.apache.isis.schema.metamodel.v1.VectorParam;
-import org.apache.isis.schema.utils.CommonDtoUtils;
+import org.apache.isis.applib.util.schema.CommonDtoUtils;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
index a0e53d2..ff7e1d4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
@@ -56,7 +56,7 @@ import org.apache.isis.metamodel.specloader.specimpl.dflt.ObjectSpecificationDef
import org.apache.isis.metamodel.specloader.specimpl.standalonelist.ObjectSpecificationOnStandaloneList;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorAbstract;
import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
-import org.apache.isis.schema.utils.CommonDtoUtils;
+import org.apache.isis.applib.util.schema.CommonDtoUtils;
import org.springframework.stereotype.Service;
import lombok.Getter;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectMemberAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectMemberAbstract.java
index a60ab74..54d2499 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectMemberAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectMemberAbstract.java
@@ -27,7 +27,6 @@ import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.command.CommandContext;
import org.apache.isis.metamodel.MetaModelContext;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.commons.StringExtensions;
import org.apache.isis.metamodel.consent.Consent;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
@@ -56,7 +55,7 @@ import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
import org.apache.isis.metamodel.spec.feature.ObjectMember;
import org.apache.isis.schema.cmd.v1.CommandDto;
-import org.apache.isis.schema.utils.CommandDtoUtils;
+import org.apache.isis.applib.util.schema.CommandDtoUtils;
import lombok.val;
diff --git a/core/persistence/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterLegacy.java b/core/persistence/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterLegacy.java
index 22999b5..1392c26 100644
--- a/core/persistence/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterLegacy.java
+++ b/core/persistence/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterLegacy.java
@@ -31,7 +31,7 @@ import org.apache.isis.schema.common.v1.CollectionDto;
import org.apache.isis.schema.common.v1.OidDto;
import org.apache.isis.schema.common.v1.ValueDto;
import org.apache.isis.schema.common.v1.ValueType;
-import org.apache.isis.schema.utils.CommonDtoUtils;
+import org.apache.isis.applib.util.schema.CommonDtoUtils;
/**
* TODO Interim class, expected to be removed, need to smoketest the CommandExecutorServiceDefault first
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/CommandExecutorServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/CommandExecutorServiceDefault.java
index 0ea132c..618893d 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/CommandExecutorServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/CommandExecutorServiceDefault.java
@@ -63,8 +63,8 @@ import org.apache.isis.schema.common.v1.InteractionType;
import org.apache.isis.schema.common.v1.OidDto;
import org.apache.isis.schema.common.v1.OidsDto;
import org.apache.isis.schema.common.v1.ValueWithTypeDto;
-import org.apache.isis.schema.utils.CommandDtoUtils;
-import org.apache.isis.schema.utils.CommonDtoUtils;
+import org.apache.isis.applib.util.schema.CommandDtoUtils;
+import org.apache.isis.applib.util.schema.CommonDtoUtils;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandDtoServiceInternalDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandDtoServiceInternalDefault.java
index 065dbde..c3c0600 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandDtoServiceInternalDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandDtoServiceInternalDefault.java
@@ -45,8 +45,8 @@ import org.apache.isis.schema.cmd.v1.PropertyDto;
import org.apache.isis.schema.common.v1.InteractionType;
import org.apache.isis.schema.common.v1.OidsDto;
import org.apache.isis.schema.common.v1.ValueWithTypeDto;
-import org.apache.isis.schema.utils.CommandDtoUtils;
-import org.apache.isis.schema.utils.CommonDtoUtils;
+import org.apache.isis.applib.util.schema.CommandDtoUtils;
+import org.apache.isis.applib.util.schema.CommonDtoUtils;
import lombok.val;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/ixn/InteractionDtoServiceInternalDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/ixn/InteractionDtoServiceInternalDefault.java
index dd2311a..6cc581c 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/ixn/InteractionDtoServiceInternalDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/ixn/InteractionDtoServiceInternalDefault.java
@@ -42,8 +42,8 @@ import org.apache.isis.schema.cmd.v1.PropertyDto;
import org.apache.isis.schema.common.v1.ValueWithTypeDto;
import org.apache.isis.schema.ixn.v1.ActionInvocationDto;
import org.apache.isis.schema.ixn.v1.PropertyEditDto;
-import org.apache.isis.schema.utils.CommandDtoUtils;
-import org.apache.isis.schema.utils.InteractionDtoUtils;
+import org.apache.isis.applib.util.schema.CommandDtoUtils;
+import org.apache.isis.applib.util.schema.InteractionDtoUtils;
@DomainService(
nature = NatureOfService.DOMAIN
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSessionFactoryDefault.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSessionFactoryDefault.java
index 0d95f10..bc1d006 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSessionFactoryDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSessionFactoryDefault.java
@@ -40,9 +40,9 @@ import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.runtime.system.context.session.RuntimeEventService;
import org.apache.isis.runtime.system.internal.IsisLocaleInitializer;
import org.apache.isis.runtime.system.internal.IsisTimeZoneInitializer;
-import org.apache.isis.schema.utils.ChangesDtoUtils;
-import org.apache.isis.schema.utils.CommandDtoUtils;
-import org.apache.isis.schema.utils.InteractionDtoUtils;
+import org.apache.isis.applib.util.schema.ChangesDtoUtils;
+import org.apache.isis.applib.util.schema.CommandDtoUtils;
+import org.apache.isis.applib.util.schema.InteractionDtoUtils;
import org.apache.isis.security.authentication.AuthenticationSession;
import org.apache.isis.security.authentication.manager.AuthenticationManager;
import org.apache.isis.security.authorization.manager.AuthorizationManager;
diff --git a/core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrs/resteasy/conneg/RestfulObjectsJaxbWriterForXml.java b/core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrs/resteasy/conneg/RestfulObjectsJaxbWriterForXml.java
index 0a6caf1..7fba0d6 100644
--- a/core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrs/resteasy/conneg/RestfulObjectsJaxbWriterForXml.java
+++ b/core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrs/resteasy/conneg/RestfulObjectsJaxbWriterForXml.java
@@ -30,7 +30,7 @@ import javax.xml.bind.Marshaller;
import org.jboss.resteasy.plugins.providers.jaxb.JAXBXmlRootElementProvider;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.schema.utils.jaxbadapters.PersistentEntityAdapter;
+import org.apache.isis.applib.jaxbadapters.PersistentEntityAdapter;
import lombok.val;
diff --git a/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java b/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java
index 7161957..a670484 100644
--- a/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java
+++ b/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java
@@ -24,7 +24,7 @@ import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
import org.apache.isis.applib.value.Money;
import org.apache.isis.applib.value.Password;
-import org.apache.isis.schema.utils.jaxbadapters.PersistentEntityAdapter;
+import org.apache.isis.applib.jaxbadapters.PersistentEntityAdapter;
import org.joda.time.LocalDateTime;
import lombok.Getter;
diff --git a/extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/ResponseDigest.java b/extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/ResponseDigest.java
index ebaa1cd..16b45c8 100644
--- a/extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/ResponseDigest.java
+++ b/extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/ResponseDigest.java
@@ -34,7 +34,7 @@ import com.fasterxml.jackson.databind.JsonMappingException;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.resources._Json;
-import org.apache.isis.schema.utils.CommonDtoUtils;
+import org.apache.isis.applib.util.schema.CommonDtoUtils;
import lombok.val;
diff --git a/migration-notes.adoc b/migration-notes.adoc
index 882ed88..16926c0 100644
--- a/migration-notes.adoc
+++ b/migration-notes.adoc
@@ -6,6 +6,10 @@ Search also for: "TODO: v2: " in the .adoc documentation.
== 2.0.0-M2 to 2.0.0-M3
+* `o.a.isis.schema.utils.Xxx` in the applib have moved to `o.a.isis.applib.util.schema`
+* `o.a.isis.schema.utils.jaxbadapters.Xxx` in the applib have moved to `o.a.isis.applib.jaxbadapters`
+
+
=== Server-Sent-Event (SSE) Support (ISIS-2102)
Experimental feature to allow for submission of background-tasks, that themselfes may fire UI-events to update eg. a progress-bar.