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:56 UTC
[isis] branch master updated (4005272 -> 76a12b9)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 4005272 ISIS-2094: removes 2 unnecessary supplemental-models.xml files
new bacccc6 ISIS-2207: moves o.a.isis.schema classes (in applib) under o.a.isis.applib
new 266693b ISIS-2207: fixes unit tests, also the (commented out) excel and fakedata fixtures and integtests.
new 76a12b9 ISIS-2148: builds core in parallel
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
core/applib/pom.xml | 9 ++++
.../isis/applib/domain/DomainObjectList.java | 2 +-
.../jaxbadapters/PersistentEntitiesAdapter.java | 2 +-
.../jaxbadapters/PersistentEntityAdapter.java | 2 +-
.../ContentMappingServiceForCommandDto.java | 2 +-
.../isis/applib/services/iactn/Interaction.java | 2 +-
.../applib/services/jaxb/JaxbServiceDefault.java | 4 +-
.../applib/services/publish/PublisherService.java | 3 +-
.../services/publish/PublisherServiceLogging.java | 4 +-
.../util/schema}/ChangesDtoUtils.java | 2 +-
.../util/schema}/CommandDtoUtils.java | 2 +-
.../util/schema}/CommonDtoUtils.java | 2 +-
.../util/schema}/InteractionDtoUtils.java | 2 +-
.../util/schema}/MemberExecutionDtoUtils.java | 2 +-
.../services/urlencoding}/MementosTest.java | 3 +-
.../xmlsnapshot/XmlSnapshotServiceAbstractTest.xml | 0
.../util/schema}/CommandDtoUtils_Test.java | 4 +-
.../util/schema}/CommonDtoUtils_Test.java | 2 +-
.../schema}/CommonDtoUtils_setValueOn_Test.java | 3 +-
...eractionDtoUtilsTest_deriveLogicalMemberId.java | 3 +-
.../utils => applib/util/schema}/Roundtrip.java | 3 +-
.../utils => applib/util/schema}/Vertical.java | 2 +-
.../metamodel/facets/jaxb/JaxbFacetFactory.java | 2 +-
.../services/metamodel/MetaModelExporter.java | 2 +-
.../specloader/SpecificationLoaderDefault.java | 2 +-
.../specloader/specimpl/ObjectMemberAbstract.java | 3 +-
.../jdo/objectadapter/ObjectAdapterLegacy.java | 2 +-
.../IsisPlatformTransactionManagerForJdo.java | 13 ++++--
.../background/CommandExecutorServiceDefault.java | 4 +-
.../command/CommandDtoServiceInternalDefault.java | 4 +-
.../ixn/InteractionDtoServiceInternalDefault.java | 4 +-
.../system/session/IsisSessionFactoryDefault.java | 6 +--
.../conneg/RestfulObjectsJaxbWriterForXml.java | 2 +-
.../testdomain/ldap/LdapEmbeddedServerTest.java | 5 +--
.../excel/fixtures/ExcelFixturesModule.java | 4 +-
.../ExcelUploadServiceForDemoToDoItem.java | 9 +++-
.../demoapp/todomodule/dom/ExcelDemoToDoItem.java | 2 +-
.../ExcelDemoToDoItem_recreate5_forSven.java | 1 -
.../integtests/ExcelModuleIntegTestAbstract.java | 6 ++-
.../demomodule/dom/FakeDataDemoObjectWithAll.java | 2 +-
.../FakeDataModuleIntegTestAbstract.java | 7 +--
.../fakedata/integtests/tests/Smoke_IntegTest.java | 50 +++++++++++-----------
.../fixtures/fixturescripts/FixtureScripts.java | 19 +++++---
.../isis/extensions/restclient/ResponseDigest.java | 2 +-
migration-notes.adoc | 4 ++
scripts/ci/build-core.sh | 1 +
46 files changed, 128 insertions(+), 88 deletions(-)
rename core/applib/src/main/java/org/apache/isis/{schema/utils => applib}/jaxbadapters/PersistentEntitiesAdapter.java (97%)
rename core/applib/src/main/java/org/apache/isis/{schema/utils => applib}/jaxbadapters/PersistentEntityAdapter.java (97%)
rename core/applib/src/main/java/org/apache/isis/{schema/utils => applib/util/schema}/ChangesDtoUtils.java (98%)
rename core/applib/src/main/java/org/apache/isis/{schema/utils => applib/util/schema}/CommandDtoUtils.java (99%)
rename core/applib/src/main/java/org/apache/isis/{schema/utils => applib/util/schema}/CommonDtoUtils.java (99%)
rename core/applib/src/main/java/org/apache/isis/{schema/utils => applib/util/schema}/InteractionDtoUtils.java (99%)
rename core/applib/src/main/java/org/apache/isis/{schema/utils => applib/util/schema}/MemberExecutionDtoUtils.java (99%)
rename core/applib/src/test/java/org/apache/isis/{commons/internal/memento => applib/services/urlencoding}/MementosTest.java (98%)
rename core/applib/src/test/{resources => java}/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.xml (100%)
rename core/applib/src/test/java/org/apache/isis/{schema/utils => applib/util/schema}/CommandDtoUtils_Test.java (93%)
rename core/applib/src/test/java/org/apache/isis/{schema/utils => applib/util/schema}/CommonDtoUtils_Test.java (98%)
rename core/applib/src/test/java/org/apache/isis/{schema/utils => applib/util/schema}/CommonDtoUtils_setValueOn_Test.java (97%)
rename core/applib/src/test/java/org/apache/isis/{schema/utils => applib/util/schema}/InteractionDtoUtilsTest_deriveLogicalMemberId.java (92%)
rename core/applib/src/test/java/org/apache/isis/{schema/utils => applib/util/schema}/Roundtrip.java (99%)
rename core/applib/src/test/java/org/apache/isis/{schema/utils => applib/util/schema}/Vertical.java (95%)
[isis] 02/03: ISIS-2207: fixes unit tests,
also the (commented out) excel and fakedata fixtures and integtests.
Posted by da...@apache.org.
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 266693b252386cc609c281f7354ea65c16f5c0c7
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 15:04:19 2019 +0000
ISIS-2207: fixes unit tests, also the (commented out) excel and fakedata fixtures and integtests.
---
core/applib/pom.xml | 9 ++++
.../services/urlencoding}/MementosTest.java | 3 +-
.../xmlsnapshot/XmlSnapshotServiceAbstractTest.xml | 0
.../util/schema}/CommandDtoUtils_Test.java | 2 +-
.../util/schema}/CommonDtoUtils_Test.java | 3 +-
.../schema}/CommonDtoUtils_setValueOn_Test.java | 2 +-
...eractionDtoUtilsTest_deriveLogicalMemberId.java | 2 +-
.../utils => applib/util/schema}/Roundtrip.java | 2 +-
.../utils => applib/util/schema}/Vertical.java | 2 +-
.../IsisPlatformTransactionManagerForJdo.java | 13 ++++--
.../testdomain/ldap/LdapEmbeddedServerTest.java | 5 +--
.../excel/fixtures/ExcelFixturesModule.java | 4 +-
.../ExcelUploadServiceForDemoToDoItem.java | 9 +++-
.../demoapp/todomodule/dom/ExcelDemoToDoItem.java | 2 +-
.../ExcelDemoToDoItem_recreate5_forSven.java | 1 -
.../integtests/ExcelModuleIntegTestAbstract.java | 6 ++-
.../FakeDataModuleIntegTestAbstract.java | 7 +--
.../fakedata/integtests/tests/Smoke_IntegTest.java | 50 +++++++++++-----------
.../fixtures/fixturescripts/FixtureScripts.java | 19 +++++---
19 files changed, 85 insertions(+), 56 deletions(-)
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 6209156..3701624 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -56,6 +56,15 @@
</excludes>
</resource>
</resources>
+ <testResources>
+ <testResource>
+ <filtering>false</filtering>
+ <directory>src/test/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
</build>
<dependencies>
diff --git a/core/applib/src/test/java/org/apache/isis/commons/internal/memento/MementosTest.java b/core/applib/src/test/java/org/apache/isis/applib/services/urlencoding/MementosTest.java
similarity index 98%
rename from core/applib/src/test/java/org/apache/isis/commons/internal/memento/MementosTest.java
rename to core/applib/src/test/java/org/apache/isis/applib/services/urlencoding/MementosTest.java
index 5a121ef..00ec629 100644
--- a/core/applib/src/test/java/org/apache/isis/commons/internal/memento/MementosTest.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/services/urlencoding/MementosTest.java
@@ -17,13 +17,14 @@
* under the License.
*/
-package org.apache.isis.commons.internal.memento;
+package org.apache.isis.applib.services.urlencoding;
import java.io.Serializable;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Date;
+import org.apache.isis.commons.internal.memento._Mementos;
import org.joda.time.LocalDate;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/applib/src/test/resources/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.xml b/core/applib/src/test/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.xml
similarity index 100%
rename from core/applib/src/test/resources/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.xml
rename to core/applib/src/test/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.xml
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/applib/util/schema/CommandDtoUtils_Test.java
similarity index 98%
rename from core/applib/src/test/java/org/apache/isis/schema/utils/CommandDtoUtils_Test.java
rename to core/applib/src/test/java/org/apache/isis/applib/util/schema/CommandDtoUtils_Test.java
index 740ddfa..04eadb4 100644
--- a/core/applib/src/test/java/org/apache/isis/schema/utils/CommandDtoUtils_Test.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/util/schema/CommandDtoUtils_Test.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 org.apache.isis.applib.util.schema.CommandDtoUtils;
import org.apache.isis.applib.util.schema.CommonDtoUtils;
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/applib/util/schema/CommonDtoUtils_Test.java
similarity index 97%
rename from core/applib/src/test/java/org/apache/isis/schema/utils/CommonDtoUtils_Test.java
rename to core/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_Test.java
index 39f440f..ea6d1ec 100644
--- a/core/applib/src/test/java/org/apache/isis/schema/utils/CommonDtoUtils_Test.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_Test.java
@@ -16,9 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.schema.utils;
+package org.apache.isis.applib.util.schema;
-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/applib/util/schema/CommonDtoUtils_setValueOn_Test.java
similarity index 98%
rename from core/applib/src/test/java/org/apache/isis/schema/utils/CommonDtoUtils_setValueOn_Test.java
rename to core/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_setValueOn_Test.java
index b7df201..793a093 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/applib/util/schema/CommonDtoUtils_setValueOn_Test.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 org.apache.isis.applib.util.schema.CommonDtoUtils;
import org.jmock.auto.Mock;
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/applib/util/schema/InteractionDtoUtilsTest_deriveLogicalMemberId.java
similarity index 96%
rename from core/applib/src/test/java/org/apache/isis/schema/utils/InteractionDtoUtilsTest_deriveLogicalMemberId.java
rename to core/applib/src/test/java/org/apache/isis/applib/util/schema/InteractionDtoUtilsTest_deriveLogicalMemberId.java
index 94f595c..884db79 100644
--- a/core/applib/src/test/java/org/apache/isis/schema/utils/InteractionDtoUtilsTest_deriveLogicalMemberId.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/util/schema/InteractionDtoUtilsTest_deriveLogicalMemberId.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;
+package org.apache.isis.applib.util.schema;
import org.apache.isis.applib.util.schema.InteractionDtoUtils;
import org.junit.Test;
diff --git a/core/applib/src/test/java/org/apache/isis/schema/utils/Roundtrip.java b/core/applib/src/test/java/org/apache/isis/applib/util/schema/Roundtrip.java
similarity index 99%
rename from core/applib/src/test/java/org/apache/isis/schema/utils/Roundtrip.java
rename to core/applib/src/test/java/org/apache/isis/applib/util/schema/Roundtrip.java
index dda566c..bb5ae47 100644
--- a/core/applib/src/test/java/org/apache/isis/schema/utils/Roundtrip.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/util/schema/Roundtrip.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;
+package org.apache.isis.applib.util.schema;
import java.io.CharArrayReader;
import java.io.CharArrayWriter;
diff --git a/core/applib/src/test/java/org/apache/isis/schema/utils/Vertical.java b/core/applib/src/test/java/org/apache/isis/applib/util/schema/Vertical.java
similarity index 95%
rename from core/applib/src/test/java/org/apache/isis/schema/utils/Vertical.java
rename to core/applib/src/test/java/org/apache/isis/applib/util/schema/Vertical.java
index ed8fa23..beec16c 100644
--- a/core/applib/src/test/java/org/apache/isis/schema/utils/Vertical.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/util/schema/Vertical.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;
enum Vertical {
UP, DOWN
diff --git a/core/persistence/jdo/common/src/main/java/org/apache/isis/jdo/persistence/IsisPlatformTransactionManagerForJdo.java b/core/persistence/jdo/common/src/main/java/org/apache/isis/jdo/persistence/IsisPlatformTransactionManagerForJdo.java
index bf4c692..23ac79f 100644
--- a/core/persistence/jdo/common/src/main/java/org/apache/isis/jdo/persistence/IsisPlatformTransactionManagerForJdo.java
+++ b/core/persistence/jdo/common/src/main/java/org/apache/isis/jdo/persistence/IsisPlatformTransactionManagerForJdo.java
@@ -20,6 +20,7 @@ package org.apache.isis.jdo.persistence;
import javax.inject.Inject;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionException;
@@ -38,13 +39,19 @@ import org.apache.isis.security.authentication.AuthenticationSession;
import lombok.val;
import lombok.extern.log4j.Log4j2;
-@Service @Log4j2
+@Service @Log4j2 @Qualifier("jdo")
public class IsisPlatformTransactionManagerForJdo extends AbstractPlatformTransactionManager {
private static final long serialVersionUID = 1L;
- @Inject private IsisSessionFactory isisSessionFactory;
- @Inject private ServiceRegistry serviceRegistry;
+ private final IsisSessionFactory isisSessionFactory;
+ private final ServiceRegistry serviceRegistry;
+
+ @Inject
+ public IsisPlatformTransactionManagerForJdo(IsisSessionFactory isisSessionFactory, ServiceRegistry serviceRegistry) {
+ this.isisSessionFactory = isisSessionFactory;
+ this.serviceRegistry = serviceRegistry;
+ }
@Override
protected Object doGetTransaction() throws TransactionException {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/ldap/LdapEmbeddedServerTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/ldap/LdapEmbeddedServerTest.java
index 7c5ea12..d4f2960 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/ldap/LdapEmbeddedServerTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/ldap/LdapEmbeddedServerTest.java
@@ -39,9 +39,8 @@ import lombok.val;
@Smoketest
@SpringBootTest(
classes = {LdapServerService.class},
- properties = {
- "logging.config=log4j2-test.xml",
- })
+ properties = {"logging.config=log4j2-test.xml" }
+)
class LdapEmbeddedServerTest {
@Inject LdapServerService ldapServerService;
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/ExcelFixturesModule.java b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/ExcelFixturesModule.java
index e33faba..bb340dc 100644
--- a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/ExcelFixturesModule.java
+++ b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/ExcelFixturesModule.java
@@ -1,5 +1,6 @@
package org.apache.isis.extensions.excel.fixtures;
+import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
import org.apache.isis.extensions.fixtures.modules.Module;
import org.apache.isis.extensions.excel.ExcelModule;
@@ -10,7 +11,8 @@ import org.springframework.context.annotation.Import;
@Configuration
@Import({
- ExcelModule.class
+ ExcelModule.class,
+ IsisExtFixturesModule.class
})
@ComponentScan
public class ExcelFixturesModule implements Module {
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
index b9e5205..1ef80fd 100644
--- a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
+++ b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
@@ -22,6 +22,13 @@ import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturehandl
)
public class ExcelUploadServiceForDemoToDoItem {
+ private final FixtureScripts fixtureScripts;
+
+ @Inject
+ public ExcelUploadServiceForDemoToDoItem(FixtureScripts fixtureScripts) {
+ this.fixtureScripts = fixtureScripts;
+ }
+
public List<FixtureResult> uploadSpreadsheet(
@ParameterLayout(named = "spreadsheet")
final Blob file,
@@ -35,6 +42,4 @@ public class ExcelUploadServiceForDemoToDoItem {
return fixtureScripts.runFixtureScript(script, parameters);
}
- @Inject
- private FixtureScripts fixtureScripts;
}
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java
index caf1c00..1982133 100644
--- a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java
+++ b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java
@@ -26,12 +26,12 @@ import org.apache.isis.applib.annotation.MinLength;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.clock.Clock;
+import org.apache.isis.applib.jaxbadapters.PersistentEntityAdapter;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.title.TitleService;
import org.apache.isis.applib.util.TitleBuffer;
import org.apache.isis.applib.value.Blob;
-import org.apache.isis.schema.utils.jaxbadapters.PersistentEntityAdapter;
import lombok.Getter;
import lombok.Setter;
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_forSven.java b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_forSven.java
index ee89b9d..70aa1f0 100644
--- a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_forSven.java
+++ b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_forSven.java
@@ -4,7 +4,6 @@ public class ExcelDemoToDoItem_recreate5_forSven extends ExcelDemoToDoItem_recre
public ExcelDemoToDoItem_recreate5_forSven() {
super("sven");
- withDiscoverability(Discoverability.DISCOVERABLE);
}
}
diff --git a/extensions/lib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java b/extensions/lib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
index 03828b0..8bb0600 100644
--- a/extensions/lib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
+++ b/extensions/lib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
@@ -15,14 +15,16 @@ import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.transaction.annotation.Transactional;
-@SpringBootTest(classes = ExcelModuleIntegTestAbstract.AppManifest.class)
+@SpringBootTest(
+ classes = ExcelModuleIntegTestAbstract.AppManifest.class,
+ properties = {"logging.config=log4j2-test.xml" }
+)
@ContextConfiguration
@Transactional
public abstract class ExcelModuleIntegTestAbstract extends IsisIntegrationTestAbstractWithFixtures {
@Configuration
@PropertySources({
- @PropertySource(IsisPresets.Log4j2Test),
@PropertySource(IsisPresets.H2InMemory_withUniqueSchema),
@PropertySource(IsisPresets.NoTranslations),
@PropertySource(IsisPresets.DataNucleusAutoCreate),
diff --git a/extensions/lib/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/FakeDataModuleIntegTestAbstract.java b/extensions/lib/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
index c187531..3221164 100644
--- a/extensions/lib/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
+++ b/extensions/lib/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
@@ -16,14 +16,16 @@ import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.transaction.annotation.Transactional;
-@SpringBootTest(classes = FakeDataModuleIntegTestAbstract.AppManifest.class)
+@SpringBootTest(
+ classes = FakeDataModuleIntegTestAbstract.AppManifest.class,
+ properties = {"logging.config=log4j2-test.xml"}
+)
@ContextConfiguration
@Transactional
public abstract class FakeDataModuleIntegTestAbstract extends IsisIntegrationTestAbstractWithFixtures {
@Configuration
@PropertySources({
- @PropertySource(IsisPresets.Log4j2Test),
@PropertySource(IsisPresets.H2InMemory_withUniqueSchema),
@PropertySource(IsisPresets.NoTranslations),
@PropertySource(IsisPresets.DataNucleusAutoCreate),
@@ -33,7 +35,6 @@ public abstract class FakeDataModuleIntegTestAbstract extends IsisIntegrationTes
IsisBootSecurityBypass.class,
IsisBootDataNucleus.class,
IsisExtFixturesModule.class,
-
FakeDataFixturesModule.class
})
public static class AppManifest {
diff --git a/extensions/lib/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Smoke_IntegTest.java b/extensions/lib/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Smoke_IntegTest.java
index 15edbd2..338dff1 100644
--- a/extensions/lib/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Smoke_IntegTest.java
+++ b/extensions/lib/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Smoke_IntegTest.java
@@ -134,7 +134,7 @@ public class Smoke_IntegTest extends FakeDataModuleIntegTestAbstract {
// when
//
updateScript.setFakeDataDemoObject(fakeDataDemoObject);
- fixtureScripts.runFixtureScript(updateScript, null);
+ fixtureScripts.runFixtureScript( updateScript, null);
transactionService.flushTransaction();
@@ -189,7 +189,7 @@ public class Smoke_IntegTest extends FakeDataModuleIntegTestAbstract {
updateScript.setFakeDataDemoObject(fakeDataDemoObject);
updateScript.setSomeBoolean(true);
- fixtureScripts.runFixtureScript(updateScript, null);
+ fixtureScripts.runFixtureScript( updateScript, null);
transactionService.flushTransaction();
@@ -207,7 +207,7 @@ public class Smoke_IntegTest extends FakeDataModuleIntegTestAbstract {
updateScript.setFakeDataDemoObject(fakeDataDemoObject);
updateScript.setSomeBoolean(false);
- fixtureScripts.runFixtureScript(updateScript, null);
+ fixtureScripts.runFixtureScript( updateScript, null);
transactionService.flushTransaction();
@@ -237,7 +237,7 @@ public class Smoke_IntegTest extends FakeDataModuleIntegTestAbstract {
//
updateScript.setFakeDataDemoObject(fakeDataDemoObject);
updateScript.setSomeChar(theChar);
- fixtureScripts.runFixtureScript(updateScript, null);
+ fixtureScripts.runFixtureScript( updateScript, null);
transactionService.flushTransaction();
@@ -267,7 +267,7 @@ public class Smoke_IntegTest extends FakeDataModuleIntegTestAbstract {
//
updateScript.setFakeDataDemoObject(fakeDataDemoObject);
updateScript.setSomeByte(theByte);
- fixtureScripts.runFixtureScript(updateScript, null);
+ fixtureScripts.runFixtureScript( updateScript, null);
transactionService.flushTransaction();
@@ -298,7 +298,7 @@ public class Smoke_IntegTest extends FakeDataModuleIntegTestAbstract {
//
updateScript.setFakeDataDemoObject(fakeDataDemoObject);
updateScript.setSomeShort(theShort);
- fixtureScripts.runFixtureScript(updateScript, null);
+ fixtureScripts.runFixtureScript( updateScript, null);
transactionService.flushTransaction();
@@ -330,7 +330,7 @@ public class Smoke_IntegTest extends FakeDataModuleIntegTestAbstract {
//
updateScript.setFakeDataDemoObject(fakeDataDemoObject);
updateScript.setSomeInt(theInt);
- fixtureScripts.runFixtureScript(updateScript, null);
+ fixtureScripts.runFixtureScript( updateScript, null);
transactionService.flushTransaction();
@@ -361,7 +361,7 @@ public class Smoke_IntegTest extends FakeDataModuleIntegTestAbstract {
//
updateScript.setFakeDataDemoObject(fakeDataDemoObject);
updateScript.setSomeLong(theLong);
- fixtureScripts.runFixtureScript(updateScript, null);
+ fixtureScripts.runFixtureScript( updateScript, null);
transactionService.flushTransaction();
@@ -391,7 +391,7 @@ public class Smoke_IntegTest extends FakeDataModuleIntegTestAbstract {
//
updateScript.setFakeDataDemoObject(fakeDataDemoObject);
updateScript.setSomeFloat(theFloat);
- fixtureScripts.runFixtureScript(updateScript, null);
+ fixtureScripts.runFixtureScript( updateScript, null);
transactionService.flushTransaction();
@@ -423,7 +423,7 @@ public class Smoke_IntegTest extends FakeDataModuleIntegTestAbstract {
//
updateScript.setFakeDataDemoObject(fakeDataDemoObject);
updateScript.setSomeDouble(theDouble);
- fixtureScripts.runFixtureScript(updateScript, null);
+ fixtureScripts.runFixtureScript( updateScript, null);
transactionService.flushTransaction();
@@ -454,7 +454,7 @@ public class Smoke_IntegTest extends FakeDataModuleIntegTestAbstract {
//
updateScript.setFakeDataDemoObject(fakeDataDemoObject);
updateScript.setSomeString(theString);
- fixtureScripts.runFixtureScript(updateScript, null);
+ fixtureScripts.runFixtureScript( updateScript, null);
transactionService.flushTransaction();
@@ -484,7 +484,7 @@ public class Smoke_IntegTest extends FakeDataModuleIntegTestAbstract {
//
updateScript.setFakeDataDemoObject(fakeDataDemoObject);
updateScript.setSomePassword(thePassword);
- fixtureScripts.runFixtureScript(updateScript, null);
+ fixtureScripts.runFixtureScript( updateScript, null);
transactionService.flushTransaction();
@@ -515,7 +515,7 @@ public class Smoke_IntegTest extends FakeDataModuleIntegTestAbstract {
//
updateScript.setFakeDataDemoObject(fakeDataDemoObject);
updateScript.setSomeBigDecimal(theBigDecimal);
- fixtureScripts.runFixtureScript(updateScript, null);
+ fixtureScripts.runFixtureScript( updateScript, null);
transactionService.flushTransaction();
@@ -545,7 +545,7 @@ public class Smoke_IntegTest extends FakeDataModuleIntegTestAbstract {
//
updateScript.setFakeDataDemoObject(fakeDataDemoObject);
updateScript.setSomeBigInteger(theBigInteger);
- fixtureScripts.runFixtureScript(updateScript, null);
+ fixtureScripts.runFixtureScript( updateScript, null);
transactionService.flushTransaction();
@@ -575,7 +575,7 @@ public class Smoke_IntegTest extends FakeDataModuleIntegTestAbstract {
updateScript.setFakeDataDemoObject(fakeDataDemoObject);
updateScript.setSomeBlob(theBlob);
- fixtureScripts.runFixtureScript(updateScript, null);
+ fixtureScripts.runFixtureScript( updateScript, null);
transactionService.flushTransaction();
@@ -606,7 +606,7 @@ public class Smoke_IntegTest extends FakeDataModuleIntegTestAbstract {
updateScript.setFakeDataDemoObject(fakeDataDemoObject);
updateScript.setSomeClob(theClob);
- fixtureScripts.runFixtureScript(updateScript, null);
+ fixtureScripts.runFixtureScript( updateScript, null);
transactionService.flushTransaction();
@@ -636,7 +636,7 @@ public class Smoke_IntegTest extends FakeDataModuleIntegTestAbstract {
updateScript.setFakeDataDemoObject(fakeDataDemoObject);
updateScript.setSomeJavaUtilDate(theDate);
- fixtureScripts.runFixtureScript(updateScript, null);
+ fixtureScripts.runFixtureScript( updateScript, null);
transactionService.flushTransaction();
@@ -667,7 +667,7 @@ public class Smoke_IntegTest extends FakeDataModuleIntegTestAbstract {
updateScript.setFakeDataDemoObject(fakeDataDemoObject);
updateScript.setSomeJavaSqlDate(theDate);
- fixtureScripts.runFixtureScript(updateScript, null);
+ fixtureScripts.runFixtureScript( updateScript, null);
transactionService.flushTransaction();
@@ -698,7 +698,7 @@ public class Smoke_IntegTest extends FakeDataModuleIntegTestAbstract {
updateScript.setFakeDataDemoObject(fakeDataDemoObject);
updateScript.setSomeJavaSqlTimestamp(theTimestamp);
- fixtureScripts.runFixtureScript(updateScript, null);
+ fixtureScripts.runFixtureScript( updateScript, null);
transactionService.flushTransaction();
@@ -729,7 +729,7 @@ public class Smoke_IntegTest extends FakeDataModuleIntegTestAbstract {
updateScript.setFakeDataDemoObject(fakeDataDemoObject);
updateScript.setSomeJodaDateTime(theDate);
- fixtureScripts.runFixtureScript(updateScript, null);
+ fixtureScripts.runFixtureScript( updateScript, null);
transactionService.flushTransaction();
@@ -759,7 +759,7 @@ public class Smoke_IntegTest extends FakeDataModuleIntegTestAbstract {
updateScript.setFakeDataDemoObject(fakeDataDemoObject);
updateScript.setSomeJodaLocalDate(theDate);
- fixtureScripts.runFixtureScript(updateScript, null);
+ fixtureScripts.runFixtureScript( updateScript, null);
transactionService.flushTransaction();
@@ -790,7 +790,7 @@ public class Smoke_IntegTest extends FakeDataModuleIntegTestAbstract {
updateScript.setFakeDataDemoObject(fakeDataDemoObject);
updateScript.setSomeUrl(theUrl);
- fixtureScripts.runFixtureScript(updateScript, null);
+ fixtureScripts.runFixtureScript( updateScript, null);
transactionService.flushTransaction();
@@ -821,7 +821,7 @@ public class Smoke_IntegTest extends FakeDataModuleIntegTestAbstract {
updateScript.setFakeDataDemoObject(fakeDataDemoObject);
updateScript.setSomeUuid(theUuid);
- fixtureScripts.runFixtureScript(updateScript, null);
+ fixtureScripts.runFixtureScript( updateScript, null);
transactionService.flushTransaction();
@@ -855,7 +855,7 @@ public class Smoke_IntegTest extends FakeDataModuleIntegTestAbstract {
updateScript.setFakeDataDemoObject(fakeDataDemoObject);
updateScript.setSomeMoney(theMoney);
- fixtureScripts.runFixtureScript(updateScript, null);
+ fixtureScripts.runFixtureScript( updateScript, null);
transactionService.flushTransaction();
@@ -888,7 +888,7 @@ public class Smoke_IntegTest extends FakeDataModuleIntegTestAbstract {
updateScript.setFakeDataDemoObject(fakeDataDemoObject);
updateScript.setSomeEnumOf3(theEnumConstant);
- fixtureScripts.runFixtureScript(updateScript, null);
+ fixtureScripts.runFixtureScript( updateScript, null);
transactionService.flushTransaction();
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScripts.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScripts.java
index 06223f8..5803a09 100644
--- a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScripts.java
+++ b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScripts.java
@@ -236,9 +236,7 @@ public class FixtureScripts extends AbstractService {
)
@MemberOrder(sequence="10")
public List<FixtureResult> runFixtureScript(
- @ParameterLayout(
- named = "Fixture script"
- )
+ @ParameterLayout(named = "Fixture script")
final String fixtureScriptName,
@ParameterLayout(
named = "Parameters",
@@ -247,15 +245,22 @@ public class FixtureScripts extends AbstractService {
multiLine = 10)
@Parameter(optionality = Optionality.OPTIONAL)
final String parameters) {
+ final FixtureScript fixtureScript = fixtureScriptByFriendlyName.get(fixtureScriptName);
+ return runFixtureScript(fixtureScript, parameters);
+ }
+
+ @Programmatic
+ public List<FixtureResult> runFixtureScript(
+ final FixtureScript fixtureScript,
+ final String parameters) {
try {
eventBusService.post(new FixturesInstallingEvent(this));
- // if this method is called programmatically, the caller may have simply new'd up the fixture script
- // (rather than use container.newTransientInstance(...). To allow this use case, we need to ensure that
+ // the caller may have simply new'd up the fixture script. To allow this use case, we need to ensure that
// domain services are injected into the fixture script.
- serviceInjector.injectServicesInto(fixtureScriptName);
+ serviceInjector.injectServicesInto(fixtureScript);
- return fixtureScriptByFriendlyName.get(fixtureScriptName).run(parameters);
+ return fixtureScript.run(parameters);
} finally {
eventBusService.post(new FixturesInstalledEvent(this));
}
[isis] 01/03: ISIS-2207: moves o.a.isis.schema classes (in applib)
under o.a.isis.applib
Posted by da...@apache.org.
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.
[isis] 03/03: ISIS-2148: builds core in parallel
Posted by da...@apache.org.
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 76a12b9b2bc5a5e4ab0dfceef73737957c45b838
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 15:05:43 2019 +0000
ISIS-2148: builds core in parallel
---
scripts/ci/build-core.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/ci/build-core.sh b/scripts/ci/build-core.sh
index 1d931da..53f045f 100644
--- a/scripts/ci/build-core.sh
+++ b/scripts/ci/build-core.sh
@@ -40,6 +40,7 @@ fi
cd $PROJECT_ROOT_PATH/core-parent
mvn -s $SETTINGS_XML \
$BATCH_MODE \
+ -T1C \
$MVN_STAGES \
$MVN_ADDITIONAL_OPTS \
$*