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/05 00:01:31 UTC
[isis] branch master updated (0aea935 -> 46ab88d)
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 0aea935 ISIS-2213: updates .pptx
new a75ea85 ISIS-2213: reorgs classes in isis-schema
new 1b11caf ISIS-2213: renames isis-runtime-spring to isis-webboot-springboot
new 78dea09 ISIS-2213: moves core/runtime-spring dir to core/webboot-springboot
new 46ab88d ISIS-2213: also updates git.propertiesDir etc. for webboot-springboot
The 4 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:
.../main/java/org/apache/isis/applib/IsisApplibModule.java | 5 +++++
.../conmap/command/ContentMappingServiceForCommandDto.java | 2 +-
.../org/apache/isis/applib/services/iactn/Interaction.java | 2 +-
.../org/apache/isis/applib/util/schema/CommonDtoUtils.java | 10 +++++-----
core/detached-tests/pom.xml | 2 +-
core/persistence/jdo/datanucleus-5/pom.xml | 4 ++--
core/pom.xml | 6 +++---
.../runtime/services/publish/PublishedObjectsDefault.java | 2 +-
.../main/java/org/apache/isis/schema/IsisSchemaModule.java | 9 +++------
.../JavaSqlTimestampXmlGregorianCalendarAdapter.java | 2 +-
.../{utils => }/jaxbadapters/JodaDateTimeStringAdapter.java | 2 +-
.../JodaDateTimeXMLGregorianCalendarAdapter.java | 2 +-
.../jaxbadapters/JodaLocalDateStringAdapter.java | 2 +-
.../jaxbadapters/JodaLocalDateTimeStringAdapter.java | 2 +-
.../JodaLocalDateTimeXMLGregorianCalendarAdapter.java | 2 +-
.../JodaLocalDateXMLGregorianCalendarAdapter.java | 2 +-
.../jaxbadapters/JodaLocalTimeStringAdapter.java | 2 +-
.../JodaLocalTimeXMLGregorianCalendarAdapter.java | 2 +-
.../isis/schema/{utils => }/jaxbadapters/Strings.java | 2 +-
.../schema/{utils => }/jaxbadapters/XmlCalendarFactory.java | 2 +-
core/testsupport/integtestsupport/pom.xml | 2 +-
core/{runtime-spring => webboot-springboot}/pom.xml | 13 ++++++++-----
.../src/main/doc/antora.yml | 0
.../src/main/doc/modules/runtime-spring/_attributes.adoc | 0
.../src/main/doc/modules/runtime-spring/nav.adoc | 0
.../main/doc/modules/runtime-spring/pages}/_attributes.adoc | 0
.../src/main/doc/modules/runtime-spring/pages/about.adoc | 0
.../doc/modules/runtime-spring/partials}/_attributes.adoc | 0
.../doc/modules/runtime-spring/partials/module-nav.adoc | 0
.../main/java/org/apache/isis/runtime/spring/IsisBoot.java | 0
extensions/testing/specsupport/pom.xml | 2 +-
legacy/testsupport/mavenplugin/pom.xml | 2 +-
mavendeps/webapp/pom.xml | 2 +-
33 files changed, 45 insertions(+), 40 deletions(-)
copy extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/IsisBootSecmanModel.java => core/schema/src/main/java/org/apache/isis/schema/IsisSchemaModule.java (84%)
rename core/schema/src/main/java/org/apache/isis/schema/{utils => }/jaxbadapters/JavaSqlTimestampXmlGregorianCalendarAdapter.java (98%)
rename core/schema/src/main/java/org/apache/isis/schema/{utils => }/jaxbadapters/JodaDateTimeStringAdapter.java (97%)
rename core/schema/src/main/java/org/apache/isis/schema/{utils => }/jaxbadapters/JodaDateTimeXMLGregorianCalendarAdapter.java (97%)
rename core/schema/src/main/java/org/apache/isis/schema/{utils => }/jaxbadapters/JodaLocalDateStringAdapter.java (97%)
rename core/schema/src/main/java/org/apache/isis/schema/{utils => }/jaxbadapters/JodaLocalDateTimeStringAdapter.java (97%)
rename core/schema/src/main/java/org/apache/isis/schema/{utils => }/jaxbadapters/JodaLocalDateTimeXMLGregorianCalendarAdapter.java (97%)
rename core/schema/src/main/java/org/apache/isis/schema/{utils => }/jaxbadapters/JodaLocalDateXMLGregorianCalendarAdapter.java (97%)
rename core/schema/src/main/java/org/apache/isis/schema/{utils => }/jaxbadapters/JodaLocalTimeStringAdapter.java (97%)
rename core/schema/src/main/java/org/apache/isis/schema/{utils => }/jaxbadapters/JodaLocalTimeXMLGregorianCalendarAdapter.java (97%)
rename core/schema/src/main/java/org/apache/isis/schema/{utils => }/jaxbadapters/Strings.java (94%)
rename core/schema/src/main/java/org/apache/isis/schema/{utils => }/jaxbadapters/XmlCalendarFactory.java (98%)
rename core/{runtime-spring => webboot-springboot}/pom.xml (85%)
rename core/{runtime-spring => webboot-springboot}/src/main/doc/antora.yml (100%)
rename core/{runtime-spring => webboot-springboot}/src/main/doc/modules/runtime-spring/_attributes.adoc (100%)
rename core/{runtime-spring => webboot-springboot}/src/main/doc/modules/runtime-spring/nav.adoc (100%)
rename core/{runtime-spring/src/main/doc/modules/runtime-spring/partials => webboot-springboot/src/main/doc/modules/runtime-spring/pages}/_attributes.adoc (100%)
rename core/{runtime-spring => webboot-springboot}/src/main/doc/modules/runtime-spring/pages/about.adoc (100%)
rename core/{runtime-spring/src/main/doc/modules/runtime-spring/pages => webboot-springboot/src/main/doc/modules/runtime-spring/partials}/_attributes.adoc (100%)
rename core/{runtime-spring => webboot-springboot}/src/main/doc/modules/runtime-spring/partials/module-nav.adoc (100%)
rename core/{runtime-spring => webboot-springboot}/src/main/java/org/apache/isis/runtime/spring/IsisBoot.java (100%)
[isis] 01/04: ISIS-2213: reorgs classes in isis-schema
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 a75ea855422df3f7d011a8079655a8e88d64679e
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 23:48:28 2019 +0000
ISIS-2213: reorgs classes in isis-schema
and adds IsisSchemaModule
---
.../src/main/java/org/apache/isis/applib/IsisApplibModule.java | 5 +++++
.../conmap/command/ContentMappingServiceForCommandDto.java | 2 +-
.../org/apache/isis/applib/services/iactn/Interaction.java | 2 +-
.../org/apache/isis/applib/util/schema/CommonDtoUtils.java | 10 +++++-----
.../isis/runtime/services/publish/PublishedObjectsDefault.java | 2 +-
.../{utils/jaxbadapters/Strings.java => IsisSchemaModule.java} | 10 +++++-----
.../JavaSqlTimestampXmlGregorianCalendarAdapter.java | 2 +-
.../{utils => }/jaxbadapters/JodaDateTimeStringAdapter.java | 2 +-
.../jaxbadapters/JodaDateTimeXMLGregorianCalendarAdapter.java | 2 +-
.../{utils => }/jaxbadapters/JodaLocalDateStringAdapter.java | 2 +-
.../jaxbadapters/JodaLocalDateTimeStringAdapter.java | 2 +-
.../JodaLocalDateTimeXMLGregorianCalendarAdapter.java | 2 +-
.../jaxbadapters/JodaLocalDateXMLGregorianCalendarAdapter.java | 2 +-
.../{utils => }/jaxbadapters/JodaLocalTimeStringAdapter.java | 2 +-
.../jaxbadapters/JodaLocalTimeXMLGregorianCalendarAdapter.java | 2 +-
.../apache/isis/schema/{utils => }/jaxbadapters/Strings.java | 2 +-
.../schema/{utils => }/jaxbadapters/XmlCalendarFactory.java | 2 +-
17 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java b/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
index 45533c7..64a7033 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
@@ -18,10 +18,15 @@
*/
package org.apache.isis.applib;
+import org.apache.isis.schema.IsisSchemaModule;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
@Configuration
+@Import({
+ IsisSchemaModule.class
+})
@ComponentScan
public class IsisApplibModule {
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 84fecd7..0e52ae5 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
@@ -38,7 +38,7 @@ 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.applib.util.schema.CommandDtoUtils;
-import org.apache.isis.schema.utils.jaxbadapters.JavaSqlTimestampXmlGregorianCalendarAdapter;
+import org.apache.isis.schema.jaxbadapters.JavaSqlTimestampXmlGregorianCalendarAdapter;
@DomainService(nature = NatureOfService.DOMAIN)
public class ContentMappingServiceForCommandDto implements ContentMappingService {
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 f8a8704..5b1b4e4 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
@@ -52,7 +52,7 @@ 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.applib.util.schema.MemberExecutionDtoUtils;
-import org.apache.isis.schema.utils.jaxbadapters.JavaSqlTimestampXmlGregorianCalendarAdapter;
+import org.apache.isis.schema.jaxbadapters.JavaSqlTimestampXmlGregorianCalendarAdapter;
/**
* Represents an action invocation or property modification, resulting in some state change of the system. It captures
diff --git a/core/applib/src/main/java/org/apache/isis/applib/util/schema/CommonDtoUtils.java b/core/applib/src/main/java/org/apache/isis/applib/util/schema/CommonDtoUtils.java
index 57e9839..16c618f 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/util/schema/CommonDtoUtils.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/util/schema/CommonDtoUtils.java
@@ -51,11 +51,11 @@ 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.common.v1.ValueWithTypeDto;
-import org.apache.isis.schema.utils.jaxbadapters.JavaSqlTimestampXmlGregorianCalendarAdapter;
-import org.apache.isis.schema.utils.jaxbadapters.JodaDateTimeXMLGregorianCalendarAdapter;
-import org.apache.isis.schema.utils.jaxbadapters.JodaLocalDateTimeXMLGregorianCalendarAdapter;
-import org.apache.isis.schema.utils.jaxbadapters.JodaLocalDateXMLGregorianCalendarAdapter;
-import org.apache.isis.schema.utils.jaxbadapters.JodaLocalTimeXMLGregorianCalendarAdapter;
+import org.apache.isis.schema.jaxbadapters.JavaSqlTimestampXmlGregorianCalendarAdapter;
+import org.apache.isis.schema.jaxbadapters.JodaDateTimeXMLGregorianCalendarAdapter;
+import org.apache.isis.schema.jaxbadapters.JodaLocalDateTimeXMLGregorianCalendarAdapter;
+import org.apache.isis.schema.jaxbadapters.JodaLocalDateXMLGregorianCalendarAdapter;
+import org.apache.isis.schema.jaxbadapters.JodaLocalTimeXMLGregorianCalendarAdapter;
import static org.apache.isis.commons.internal.collections._Maps.entry;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/publish/PublishedObjectsDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/publish/PublishedObjectsDefault.java
index e0514ce..1647af4 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/publish/PublishedObjectsDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/publish/PublishedObjectsDefault.java
@@ -39,7 +39,7 @@ import org.apache.isis.schema.chg.v1.ChangesDto;
import org.apache.isis.schema.chg.v1.ObjectsDto;
import org.apache.isis.schema.common.v1.OidDto;
import org.apache.isis.schema.common.v1.OidsDto;
-import org.apache.isis.schema.utils.jaxbadapters.JavaSqlTimestampXmlGregorianCalendarAdapter;
+import org.apache.isis.schema.jaxbadapters.JavaSqlTimestampXmlGregorianCalendarAdapter;
import lombok.ToString;
diff --git a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/Strings.java b/core/schema/src/main/java/org/apache/isis/schema/IsisSchemaModule.java
similarity index 80%
copy from core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/Strings.java
copy to core/schema/src/main/java/org/apache/isis/schema/IsisSchemaModule.java
index 617dd51..bb6acf2 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/Strings.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/IsisSchemaModule.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.isis.schema;
-package org.apache.isis.schema.utils.jaxbadapters;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
-class Strings {
+@Configuration
+public class IsisSchemaModule {
- public static boolean isNullOrEmpty(String x) {
- return x == null || x.isEmpty();
- }
}
diff --git a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JavaSqlTimestampXmlGregorianCalendarAdapter.java b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JavaSqlTimestampXmlGregorianCalendarAdapter.java
similarity index 98%
rename from core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JavaSqlTimestampXmlGregorianCalendarAdapter.java
rename to core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JavaSqlTimestampXmlGregorianCalendarAdapter.java
index 38673c2..ce32e0e 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JavaSqlTimestampXmlGregorianCalendarAdapter.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JavaSqlTimestampXmlGregorianCalendarAdapter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.schema.utils.jaxbadapters;
+package org.apache.isis.schema.jaxbadapters;
import java.sql.Timestamp;
import java.util.GregorianCalendar;
diff --git a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaDateTimeStringAdapter.java b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaDateTimeStringAdapter.java
similarity index 97%
rename from core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaDateTimeStringAdapter.java
rename to core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaDateTimeStringAdapter.java
index bdc8c52..facaa11 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaDateTimeStringAdapter.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaDateTimeStringAdapter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.schema.utils.jaxbadapters;
+package org.apache.isis.schema.jaxbadapters;
import javax.xml.bind.annotation.adapters.XmlAdapter;
diff --git a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaDateTimeXMLGregorianCalendarAdapter.java b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaDateTimeXMLGregorianCalendarAdapter.java
similarity index 97%
rename from core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaDateTimeXMLGregorianCalendarAdapter.java
rename to core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaDateTimeXMLGregorianCalendarAdapter.java
index f2d919d..d1313fe 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaDateTimeXMLGregorianCalendarAdapter.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaDateTimeXMLGregorianCalendarAdapter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.schema.utils.jaxbadapters;
+package org.apache.isis.schema.jaxbadapters;
import java.util.Date;
import java.util.GregorianCalendar;
diff --git a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalDateStringAdapter.java b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateStringAdapter.java
similarity index 97%
rename from core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalDateStringAdapter.java
rename to core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateStringAdapter.java
index af6e513..b708493 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalDateStringAdapter.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateStringAdapter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.schema.utils.jaxbadapters;
+package org.apache.isis.schema.jaxbadapters;
import javax.xml.bind.annotation.adapters.XmlAdapter;
diff --git a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalDateTimeStringAdapter.java b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateTimeStringAdapter.java
similarity index 97%
rename from core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalDateTimeStringAdapter.java
rename to core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateTimeStringAdapter.java
index 9bbb079..ec7fb21 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalDateTimeStringAdapter.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateTimeStringAdapter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.schema.utils.jaxbadapters;
+package org.apache.isis.schema.jaxbadapters;
import javax.xml.bind.annotation.adapters.XmlAdapter;
diff --git a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalDateTimeXMLGregorianCalendarAdapter.java b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateTimeXMLGregorianCalendarAdapter.java
similarity index 97%
rename from core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalDateTimeXMLGregorianCalendarAdapter.java
rename to core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateTimeXMLGregorianCalendarAdapter.java
index bc30291..17fa65e 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalDateTimeXMLGregorianCalendarAdapter.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateTimeXMLGregorianCalendarAdapter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.schema.utils.jaxbadapters;
+package org.apache.isis.schema.jaxbadapters;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import javax.xml.datatype.XMLGregorianCalendar;
diff --git a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalDateXMLGregorianCalendarAdapter.java b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateXMLGregorianCalendarAdapter.java
similarity index 97%
rename from core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalDateXMLGregorianCalendarAdapter.java
rename to core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateXMLGregorianCalendarAdapter.java
index dd627dc..3103614 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalDateXMLGregorianCalendarAdapter.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateXMLGregorianCalendarAdapter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.schema.utils.jaxbadapters;
+package org.apache.isis.schema.jaxbadapters;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import javax.xml.datatype.XMLGregorianCalendar;
diff --git a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalTimeStringAdapter.java b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalTimeStringAdapter.java
similarity index 97%
rename from core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalTimeStringAdapter.java
rename to core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalTimeStringAdapter.java
index e57de01..ebbc743 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalTimeStringAdapter.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalTimeStringAdapter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.schema.utils.jaxbadapters;
+package org.apache.isis.schema.jaxbadapters;
import javax.xml.bind.annotation.adapters.XmlAdapter;
diff --git a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalTimeXMLGregorianCalendarAdapter.java b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalTimeXMLGregorianCalendarAdapter.java
similarity index 97%
rename from core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalTimeXMLGregorianCalendarAdapter.java
rename to core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalTimeXMLGregorianCalendarAdapter.java
index f30f9e3..9fa1c7d 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalTimeXMLGregorianCalendarAdapter.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalTimeXMLGregorianCalendarAdapter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.schema.utils.jaxbadapters;
+package org.apache.isis.schema.jaxbadapters;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import javax.xml.datatype.XMLGregorianCalendar;
diff --git a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/Strings.java b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/Strings.java
similarity index 94%
rename from core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/Strings.java
rename to core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/Strings.java
index 617dd51..780960d 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/Strings.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/Strings.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.schema.utils.jaxbadapters;
+package org.apache.isis.schema.jaxbadapters;
class Strings {
diff --git a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/XmlCalendarFactory.java b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/XmlCalendarFactory.java
similarity index 98%
rename from core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/XmlCalendarFactory.java
rename to core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/XmlCalendarFactory.java
index c28843c..ab3358a 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/XmlCalendarFactory.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/XmlCalendarFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.schema.utils.jaxbadapters;
+package org.apache.isis.schema.jaxbadapters;
import java.util.function.Function;
[isis] 04/04: ISIS-2213: also updates git.propertiesDir etc. for
webboot-springboot
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 46ab88dec47e9f19da07b95dfa477059bef7345f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 23:55:22 2019 +0000
ISIS-2213: also updates git.propertiesDir etc. for webboot-springboot
---
core/webboot-springboot/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/webboot-springboot/pom.xml b/core/webboot-springboot/pom.xml
index c93b66f..e5b0fd8 100644
--- a/core/webboot-springboot/pom.xml
+++ b/core/webboot-springboot/pom.xml
@@ -34,8 +34,8 @@
</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.runtime.spring</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/runtime/spring</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.webboot.springboot</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/webboot/springboot</git-plugin.propertiesDir>
</properties>
<build>
[isis] 02/04: ISIS-2213: renames isis-runtime-spring to
isis-webboot-springboot
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 1b11caf754e5be21fdfe582062b80f29e666cf9e
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 23:52:04 2019 +0000
ISIS-2213: renames isis-runtime-spring to isis-webboot-springboot
---
core/detached-tests/pom.xml | 2 +-
core/persistence/jdo/datanucleus-5/pom.xml | 4 ++--
core/pom.xml | 4 ++--
core/runtime-spring/pom.xml | 9 ++++++---
core/testsupport/integtestsupport/pom.xml | 2 +-
extensions/testing/specsupport/pom.xml | 2 +-
legacy/testsupport/mavenplugin/pom.xml | 2 +-
mavendeps/webapp/pom.xml | 2 +-
8 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/core/detached-tests/pom.xml b/core/detached-tests/pom.xml
index eca33ff..cca451a 100644
--- a/core/detached-tests/pom.xml
+++ b/core/detached-tests/pom.xml
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime-spring</artifactId>
+ <artifactId>isis-webboot-springboot</artifactId>
<scope>test</scope>
</dependency>
diff --git a/core/persistence/jdo/datanucleus-5/pom.xml b/core/persistence/jdo/datanucleus-5/pom.xml
index 0b0985f..3038a3a 100644
--- a/core/persistence/jdo/datanucleus-5/pom.xml
+++ b/core/persistence/jdo/datanucleus-5/pom.xml
@@ -104,7 +104,7 @@
<!--
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime-spring</artifactId>
+ <artifactId>isis-webboot-springboot</artifactId>
</dependency>
-->
@@ -126,7 +126,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime-spring</artifactId>
+ <artifactId>isis-webboot-springboot</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/core/pom.xml b/core/pom.xml
index 82fa4a3..f8964de 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -772,12 +772,12 @@
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime-spring</artifactId>
+ <artifactId>isis-webboot-springboot</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime-spring</artifactId>
+ <artifactId>isis-webboot-springboot</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/core/runtime-spring/pom.xml b/core/runtime-spring/pom.xml
index bbfe42e..c93b66f 100644
--- a/core/runtime-spring/pom.xml
+++ b/core/runtime-spring/pom.xml
@@ -26,9 +26,12 @@
<version>2.0.0-M3-SNAPSHOT</version>
</parent>
- <artifactId>isis-runtime-spring</artifactId>
- <name>Apache Isis Core - Runtime Spring Boot</name>
- <description>Defines the main Spring @Configuration, which transitively depends on the rest of core. Viewers don't have dependencies on this module.</description>
+ <artifactId>isis-webboot-springboot</artifactId>
+ <name>Apache Isis Core - Web Boot using Spring Boot</name>
+ <description>
+ Defines the main Spring @Configuration, which transitively depends on the rest of core.
+ Viewers don't have dependencies on this module.
+ </description>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.runtime.spring</jar-plugin.automaticModuleName>
diff --git a/core/testsupport/integtestsupport/pom.xml b/core/testsupport/integtestsupport/pom.xml
index d995f10..2be8f26 100644
--- a/core/testsupport/integtestsupport/pom.xml
+++ b/core/testsupport/integtestsupport/pom.xml
@@ -158,7 +158,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime-spring</artifactId>
+ <artifactId>isis-webboot-springboot</artifactId>
</dependency>
</dependencies>
diff --git a/extensions/testing/specsupport/pom.xml b/extensions/testing/specsupport/pom.xml
index 29485ba..62c1687 100644
--- a/extensions/testing/specsupport/pom.xml
+++ b/extensions/testing/specsupport/pom.xml
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime-spring</artifactId>
+ <artifactId>isis-webboot-springboot</artifactId>
</dependency>
<!-- ISIS EXTENSIONS -->
diff --git a/legacy/testsupport/mavenplugin/pom.xml b/legacy/testsupport/mavenplugin/pom.xml
index 1f51f83..226f6bd 100644
--- a/legacy/testsupport/mavenplugin/pom.xml
+++ b/legacy/testsupport/mavenplugin/pom.xml
@@ -94,7 +94,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime-spring</artifactId>
+ <artifactId>isis-webboot-springboot</artifactId>
</dependency>
diff --git a/mavendeps/webapp/pom.xml b/mavendeps/webapp/pom.xml
index 52b2fe5..a894f81 100644
--- a/mavendeps/webapp/pom.xml
+++ b/mavendeps/webapp/pom.xml
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime-spring</artifactId>
+ <artifactId>isis-webboot-springboot</artifactId>
</dependency>
</dependencies>
[isis] 03/04: ISIS-2213: moves core/runtime-spring dir to
core/webboot-springboot
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 78dea091a519a0cb83fa01da5fdb584c5e6ab107
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 23:54:53 2019 +0000
ISIS-2213: moves core/runtime-spring dir to core/webboot-springboot
---
core/pom.xml | 2 +-
core/{runtime-spring => webboot-springboot}/pom.xml | 0
core/{runtime-spring => webboot-springboot}/src/main/doc/antora.yml | 0
.../src/main/doc/modules/runtime-spring/_attributes.adoc | 0
.../src/main/doc/modules/runtime-spring/nav.adoc | 0
.../src/main/doc/modules/runtime-spring/pages}/_attributes.adoc | 0
.../src/main/doc/modules/runtime-spring/pages/about.adoc | 0
.../src/main/doc/modules/runtime-spring/partials}/_attributes.adoc | 0
.../src/main/doc/modules/runtime-spring/partials/module-nav.adoc | 0
.../src/main/java/org/apache/isis/runtime/spring/IsisBoot.java | 0
10 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/pom.xml b/core/pom.xml
index f8964de..a4cab47 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1838,8 +1838,8 @@
<module>metamodel</module>
<module>runtime</module>
<module>runtime-services</module>
- <module>runtime-spring</module>
<module>webapp</module>
+ <module>webboot-springboot</module>
<module>testsupport/unittestsupport</module>
<module>testsupport/integtestsupport</module>
diff --git a/core/runtime-spring/pom.xml b/core/webboot-springboot/pom.xml
similarity index 100%
rename from core/runtime-spring/pom.xml
rename to core/webboot-springboot/pom.xml
diff --git a/core/runtime-spring/src/main/doc/antora.yml b/core/webboot-springboot/src/main/doc/antora.yml
similarity index 100%
rename from core/runtime-spring/src/main/doc/antora.yml
rename to core/webboot-springboot/src/main/doc/antora.yml
diff --git a/core/runtime-spring/src/main/doc/modules/runtime-spring/_attributes.adoc b/core/webboot-springboot/src/main/doc/modules/runtime-spring/_attributes.adoc
similarity index 100%
rename from core/runtime-spring/src/main/doc/modules/runtime-spring/_attributes.adoc
rename to core/webboot-springboot/src/main/doc/modules/runtime-spring/_attributes.adoc
diff --git a/core/runtime-spring/src/main/doc/modules/runtime-spring/nav.adoc b/core/webboot-springboot/src/main/doc/modules/runtime-spring/nav.adoc
similarity index 100%
rename from core/runtime-spring/src/main/doc/modules/runtime-spring/nav.adoc
rename to core/webboot-springboot/src/main/doc/modules/runtime-spring/nav.adoc
diff --git a/core/runtime-spring/src/main/doc/modules/runtime-spring/partials/_attributes.adoc b/core/webboot-springboot/src/main/doc/modules/runtime-spring/pages/_attributes.adoc
similarity index 100%
rename from core/runtime-spring/src/main/doc/modules/runtime-spring/partials/_attributes.adoc
rename to core/webboot-springboot/src/main/doc/modules/runtime-spring/pages/_attributes.adoc
diff --git a/core/runtime-spring/src/main/doc/modules/runtime-spring/pages/about.adoc b/core/webboot-springboot/src/main/doc/modules/runtime-spring/pages/about.adoc
similarity index 100%
rename from core/runtime-spring/src/main/doc/modules/runtime-spring/pages/about.adoc
rename to core/webboot-springboot/src/main/doc/modules/runtime-spring/pages/about.adoc
diff --git a/core/runtime-spring/src/main/doc/modules/runtime-spring/pages/_attributes.adoc b/core/webboot-springboot/src/main/doc/modules/runtime-spring/partials/_attributes.adoc
similarity index 100%
rename from core/runtime-spring/src/main/doc/modules/runtime-spring/pages/_attributes.adoc
rename to core/webboot-springboot/src/main/doc/modules/runtime-spring/partials/_attributes.adoc
diff --git a/core/runtime-spring/src/main/doc/modules/runtime-spring/partials/module-nav.adoc b/core/webboot-springboot/src/main/doc/modules/runtime-spring/partials/module-nav.adoc
similarity index 100%
rename from core/runtime-spring/src/main/doc/modules/runtime-spring/partials/module-nav.adoc
rename to core/webboot-springboot/src/main/doc/modules/runtime-spring/partials/module-nav.adoc
diff --git a/core/runtime-spring/src/main/java/org/apache/isis/runtime/spring/IsisBoot.java b/core/webboot-springboot/src/main/java/org/apache/isis/runtime/spring/IsisBoot.java
similarity index 100%
rename from core/runtime-spring/src/main/java/org/apache/isis/runtime/spring/IsisBoot.java
rename to core/webboot-springboot/src/main/java/org/apache/isis/runtime/spring/IsisBoot.java