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 2021/03/20 07:36:21 UTC
[isis] branch master updated (b5944af -> 04384de)
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 b5944af ISIS-2582: properly deserialize ComponentHintKey
add 8f8d1ff ISIS-2450: fixing up config docs
add f002e71 ISIS-2450: fixes unit tests
add 66e9e6c ISIS-2450: updates to relnotes, and cutting-a-release
add d42f493 ISIS-2450: updates config docs
add 4971106 ISIS-2450: updates projdoc tooling
add 771d8a3 ISIS-2450: bumps hardcoded version to 2.0.0-M5
new 4347601 ISIS-2450: registers extracted out RestfulPathProvider
new 04384de ISIS-2450: fixes download script to verify releases
The 2 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:
.../modules/ROOT/pages/cutting-a-release.adoc | 150 ++++-
.../ROOT/pages/post-release-successful.adoc | 24 +
.../components/docs/modules/ROOT/pages/about.adoc | 6 +-
.../modules/_overview/pages/about.adoc | 194 +++++-
.../index/services/appfeat/ApplicationFeature.adoc | 6 +
.../appfeat/ApplicationFeatureRepository.adoc | 3 +-
.../index/services/iactn/ActionInvocation.adoc | 2 +-
.../pages/index/services/iactn/PropertyEdit.adoc | 2 +-
.../applib/pages/index/util/ReasonBuffer.adoc | 2 +-
.../applib/pages/index/util/ReasonBuffer2.adoc | 6 +-
.../modules/applib/pages/index/util/Reasons.adoc | 2 +-
.../commons/pages/index/collections/Can.adoc | 16 +
.../index/cors/impl/IsisModuleExtCorsImpl.adoc | 2 +-
.../webmodule/WebModuleJaxrsResteasy4.adoc | 2 +-
.../{migrating-to-2.0.0.adoc => mignotes.adoc} | 2 -
.../pages/{2020 => 2021}/2.0.0-M5/mignotes.adoc | 7 +-
.../pages/{2020 => 2021}/2.0.0-M5/relnotes.adoc | 0
.../relnotes/modules/ROOT/pages/about.adoc | 21 +-
antora/supplemental-ui/index.html | 96 ++-
core/config/generateConfigDocs.groovy | 25 +-
...datanucleus~post.adoc => datanucleus~post.adoc} | 0
...anucleus-conf~pre.adoc => datanucleus~pre.adoc} | 0
...s-conf~post.adoc => isis.core.config~post.adoc} | 0
...anucleus~pre.adoc => isis.core.config~pre.adoc} | 0
.../adoc/modules/config/pages/sections/Other.adoc | 99 +++
.../adoc/modules/config/pages/sections/_nav.adoc | 7 +-
.../modules/config/pages/sections/datanucleus.adoc | 171 ++++++
...sis.core.runtime.adoc => isis.core.config.adoc} | 22 +-
.../pages/sections/isis.core.runtime-services.adoc | 2 +-
.../config/pages/sections/isis.core.runtime.adoc | 2 +-
.../config/pages/sections/isis.value-types.adoc | 9 -
.../pages/sections/isis.viewer.restfulobjects.adoc | 9 +
.../config/pages/sections/isis.viewer.wicket.adoc | 52 +-
.../pages/sections/jdo-datanucleus-conf.adoc | 293 ---------
.../config/pages/sections/jdo-datanucleus.adoc | 28 -
.../modules/config/pages/sections/resteasy.adoc | 45 +-
.../isis/core/config/DatanucleusConfiguration.java | 263 ++++++++
.../apache/isis/core/config/IsisConfiguration.java | 55 +-
.../isis/core/config/IsisModuleCoreConfig.java | 12 +-
.../apache/isis/core/config/JdoDatanucleus.java | 250 --------
.../isis/core/config/RestEasyConfiguration.java | 35 +-
.../core/config/applib/RestfulPathProvider.java | 33 +-
.../config/environment/IsisSystemEnvironment.java | 44 +-
.../additional-spring-configuration-metadata.json | 40 +-
.../config/IsisConfigurationLegacy.java | 4 +-
.../confmenu/ConfigurationViewServiceDefault.java | 28 +-
.../cors/impl/IsisModuleExtCorsImpl.java | 18 +-
.../cors/impl/IsisModuleExtCorsImplTest.java | 15 +-
scripts/verify-isis-release.sh | 59 +-
security/adoc/modules/ROOT/pages/about.adoc | 2 +-
.../pages/about/configuring-isis-to-use-shiro.adoc | 4 +-
.../pages/about/enhanced-wildcard-permission.adoc | 2 +-
.../adoc/modules/shiro/pages/about/ini-realm.adoc | 4 +-
.../adoc/modules/shiro/pages/about/jdbc-realm.adoc | 8 +-
.../adoc/modules/shiro/pages/about/ldap-realm.adoc | 34 +-
.../simpleapp-modules-dependencies.pptx | Bin 47706 -> 48246 bytes
.../images/simpleapp/flyway/tables-created.png | Bin 0 -> 73788 bytes
.../simpleapp/simpleapp-modules-dependencies.png | Bin 64551 -> 64728 bytes
starters/adoc/modules/starters/pages/about.adoc | 20 +-
...orld-script.adoc => helloworld-script-jdo.adoc} | 4 +-
...orld-script.adoc => helloworld-script-jpa.adoc} | 4 +-
.../adoc/modules/starters/pages/helloworld.adoc | 251 ++++----
...leapp-script.adoc => simpleapp-script-jdo.adoc} | 4 +-
...leapp-script.adoc => simpleapp-script-jpa.adoc} | 4 +-
.../adoc/modules/starters/pages/simpleapp.adoc | 672 ++++++++++++++-------
.../webmodule/WebModuleJaxrsResteasy4.java | 10 +-
66 files changed, 1850 insertions(+), 1336 deletions(-)
rename antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M3/{migrating-to-2.0.0.adoc => mignotes.adoc} (99%)
rename antora/components/relnotes/modules/ROOT/pages/{2020 => 2021}/2.0.0-M5/mignotes.adoc (99%)
rename antora/components/relnotes/modules/ROOT/pages/{2020 => 2021}/2.0.0-M5/relnotes.adoc (100%)
rename core/config/src/main/adoc/modules/config/pages/section-hooks/{jdo-datanucleus~post.adoc => datanucleus~post.adoc} (100%)
rename core/config/src/main/adoc/modules/config/pages/section-hooks/{jdo-datanucleus-conf~pre.adoc => datanucleus~pre.adoc} (100%)
rename core/config/src/main/adoc/modules/config/pages/section-hooks/{jdo-datanucleus-conf~post.adoc => isis.core.config~post.adoc} (100%)
rename core/config/src/main/adoc/modules/config/pages/section-hooks/{jdo-datanucleus~pre.adoc => isis.core.config~pre.adoc} (100%)
create mode 100644 core/config/src/main/adoc/modules/config/pages/sections/datanucleus.adoc
copy core/config/src/main/adoc/modules/config/pages/sections/{isis.core.runtime.adoc => isis.core.config.adoc} (61%)
delete mode 100644 core/config/src/main/adoc/modules/config/pages/sections/jdo-datanucleus-conf.adoc
delete mode 100644 core/config/src/main/adoc/modules/config/pages/sections/jdo-datanucleus.adoc
create mode 100644 core/config/src/main/java/org/apache/isis/core/config/DatanucleusConfiguration.java
delete mode 100644 core/config/src/main/java/org/apache/isis/core/config/JdoDatanucleus.java
copy incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/decorator/disabling/DisablingDecoratorForButton.java => core/config/src/main/java/org/apache/isis/core/config/applib/RestfulPathProvider.java (58%)
create mode 100644 starters/adoc/modules/starters/images/simpleapp/flyway/tables-created.png
copy starters/adoc/modules/starters/pages/{helloworld-script.adoc => helloworld-script-jdo.adoc} (93%)
rename starters/adoc/modules/starters/pages/{helloworld-script.adoc => helloworld-script-jpa.adoc} (93%)
copy starters/adoc/modules/starters/pages/{simpleapp-script.adoc => simpleapp-script-jdo.adoc} (87%)
rename starters/adoc/modules/starters/pages/{simpleapp-script.adoc => simpleapp-script-jpa.adoc} (87%)
[isis] 01/02: ISIS-2450: registers extracted out RestfulPathProvider
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 434760144f9d16ebd1560d1a9ffc780d49488a84
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Mar 20 07:12:30 2021 +0000
ISIS-2450: registers extracted out RestfulPathProvider
(cherry picked from commit f32c7213f2da2302614bfd6d7e9c889502b4a606)
---
.../isis/core/config/IsisModuleCoreConfig.java | 3 +-
.../isis/core/config/RestEasyConfiguration.java | 11 ------
.../core/config/applib/RestfulPathProvider.java | 46 ++++++++++++++++++++++
3 files changed, 48 insertions(+), 12 deletions(-)
diff --git a/core/config/src/main/java/org/apache/isis/core/config/IsisModuleCoreConfig.java b/core/config/src/main/java/org/apache/isis/core/config/IsisModuleCoreConfig.java
index 477af11..6f6c96c 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/IsisModuleCoreConfig.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/IsisModuleCoreConfig.java
@@ -23,10 +23,10 @@ import java.util.Map;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.isis.core.config.applib.RestfulPathProvider;
import org.apache.isis.core.config.beans.IsisBeanFactoryPostProcessorForSpring;
import org.apache.isis.core.config.beans.IsisBeanTypeRegistryDefault;
import org.apache.isis.core.config.converters.PatternsConverter;
@@ -46,6 +46,7 @@ import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
IsisLocaleInitializer.class,
IsisTimeZoneInitializer.class,
PatternOptionalStringConstraintValidator.class,
+ RestfulPathProvider.class,
// @Service's
DataSourceIntrospectionService.class,
diff --git a/core/config/src/main/java/org/apache/isis/core/config/RestEasyConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/RestEasyConfiguration.java
index ae41e6e..32fcf93 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/RestEasyConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/RestEasyConfiguration.java
@@ -52,17 +52,6 @@ import lombok.Setter;
@Validated
public class RestEasyConfiguration {
- @Component
- @RequiredArgsConstructor(onConstructor_ = {@Inject})
- public static class RestfulPathProviderImpl implements Object_openRestApi.RestfulPathProvider {
-
- private final RestEasyConfiguration restEasyConfiguration;
- @Override
- public Optional<String> getRestfulPath() {
- return Optional.ofNullable(restEasyConfiguration.getJaxrs().getDefaultPath());
- }
- }
-
@Getter
private final Jaxrs jaxrs = new Jaxrs();
@Data
diff --git a/core/config/src/main/java/org/apache/isis/core/config/applib/RestfulPathProvider.java b/core/config/src/main/java/org/apache/isis/core/config/applib/RestfulPathProvider.java
new file mode 100644
index 0000000..9253d84
--- /dev/null
+++ b/core/config/src/main/java/org/apache/isis/core/config/applib/RestfulPathProvider.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.core.config.applib;
+
+import java.util.Optional;
+
+import javax.inject.Inject;
+
+import org.springframework.stereotype.Component;
+
+import org.apache.isis.applib.mixins.rest.Object_openRestApi;
+import org.apache.isis.core.config.RestEasyConfiguration;
+
+import lombok.RequiredArgsConstructor;
+
+/**
+ * Exposes the path that the Restful Objects viewer's REST API has been
+ * configured for, to the {@link Object_openRestApi} mixin action.
+ */
+@Component
+@RequiredArgsConstructor(onConstructor_ = {@Inject})
+public class RestfulPathProvider implements Object_openRestApi.RestfulPathProvider {
+
+ private final RestEasyConfiguration restEasyConfiguration;
+
+ @Override
+ public Optional<String> getRestfulPath() {
+ return Optional.ofNullable(restEasyConfiguration.getJaxrs().getDefaultPath());
+ }
+}
[isis] 02/02: ISIS-2450: fixes download script to verify releases
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 04384de6f9168baf00434dfea1987e7a24082683
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Mar 20 07:01:32 2021 +0000
ISIS-2450: fixes download script to verify releases
(cherry picked from commit 3a5f81274cfa6f4afd99abaf241a5d395b8b21f0)
---
scripts/verify-isis-release.sh | 59 +++++++++++++++++++-----------------------
1 file changed, 26 insertions(+), 33 deletions(-)
diff --git a/scripts/verify-isis-release.sh b/scripts/verify-isis-release.sh
index 6ca4cc8..adc7b49 100755
--- a/scripts/verify-isis-release.sh
+++ b/scripts/verify-isis-release.sh
@@ -93,38 +93,19 @@ _build(){
popd
}
-_download_simpleapp(){
- APP=simpleapp
- BRANCH=release-$VERSION-$RC
-
- rm -rf test-$APP
- mkdir test-$APP
- pushd test-$APP
+_download_app(){
+ APP=$1
+ BRANCH=$2
REPO=isis-app-$APP
- curl "https://codeload.github.com/apache/$REPO/zip/$BRANCH" | jar xv
- mv $REPO-$BRANCH $REPO
-
- pushd $REPO
- _execmustpass mvn clean install
- popd; popd
-}
-
-_download_helloworld(){
- APP=helloworld
- BRANCH=release-$VERSION-$RC
+ DIR=$REPO-$BRANCH
- rm -rf test-$APP
- mkdir test-$APP
- pushd test-$APP
-
- REPO=isis-app-$APP
+ rm -rf $DIR
curl "https://codeload.github.com/apache/$REPO/zip/$BRANCH" | jar xv
- mv $REPO-$BRANCH $REPO
- pushd $REPO
+ pushd $DIR
_execmustpass mvn clean install
- popd; popd
+ popd
}
@@ -166,21 +147,33 @@ _download
_verify
_unpack
_build
-_download_simpleapp
-_download_helloworld
+_download_app helloworld jdo
+_download_app helloworld jpa
+_download_app simpleapp jdo
+_download_app simpleapp jpa
# print instructions for final testing
clear
cat <<EOF
-# Test out helloworld using:
-pushd test-helloworld/isis-app-helloworld
+# Test out helloworld (jdo) using:
+pushd isis-app-helloworld-jdo
mvn spring-boot:run
popd
-# Test out simpleapp using:
-pushd test-simpleapp/isis-app-simpleapp
-mvn -pl webapp spring-boot:run
+# Test out helloworld (jpa) using:
+pushd isis-app-helloworld-jpa
+mvn spring-boot:run
+popd
+
+# Test out simpleapp (jdo) using:
+pushd isis-app-simpleapp-jdo
+mvn spring-boot:run
+popd
+
+# Test out simpleapp (jpa) using:
+pushd isis-app-simpleapp-jpa
+mvn spring-boot:run
popd
EOF