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/01 06:34:46 UTC
[isis] branch ISIS-2444 updated (22c559a -> 0595664)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch ISIS-2444
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 22c559a ISIS-2444: moves runtime-services out of the build; as not public API and need to fix up
add 642bced ISIS-2444: regenerating index
add 884ce2a chore: fix case of JavaScript
add e6a17b6 chore: fix case of GitHub
add 00d59d7 chore: fix case of JavaScript and TypeScript
new 76ef6e6 ISIS-2444: remvoes ApplicationFeatureFactory docs
new 0595664 ISIS-2444: renames CommandDtoServiceInternalDefault to CommandDtoFactoryDefault
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/algolia-search.adoc | 6 +-
.../conguide/modules/ROOT/pages/contributing.adoc | 32 ++---
.../conguide/modules/git/pages/about.adoc | 2 +-
.../what-is-apache-isis/isis-in-pictures.adoc | 2 +-
.../powered-by/gesconsultor-grc.adoc | 2 +-
.../modules/_overview/pages/about.adoc | 158 +++++++++++++++------
.../modules/applib/pages/index/Identifier.adoc | 79 ++---------
.../applib/pages/index/id/TypeIdentifier.adoc | 76 ++++++++++
...onFeatureRepository_020-examples-and-usage.adoc | 3 -
.../index/services/grid/GridLoaderService.adoc | 4 +-
.../services/wrapper/events/InteractionEvent.adoc | 4 +-
.../applib/pages/index/util/ObjectContracts.adoc | 36 +----
.../pages-to-update/ApplicationFeatureFactory.adoc | 6 -
.../AuthenticationSessionProvider.adoc | 33 -----
.../pages-to-update/ContentNegotiationService.adoc | 2 +-
.../pages-to-update/RepresentationService.adoc | 2 +-
.../secman/api/authorizor/AuthorizorSecman.adoc} | 12 +-
.../bypass/authorization/AuthorizorBypass.adoc | 6 +-
.../keycloak/authorization/AuthorizorKeycloak.adoc | 6 +-
.../index/shiro/authorization/AuthorizorShiro.adoc | 28 +---
.../index/spring/IsisModuleSecuritySpring.adoc} | 11 +-
.../authentication/AuthenticatorSpring.adoc} | 6 +-
.../webmodule/SpringSecurityFilter.adoc} | 8 +-
.../webmodule/WebModuleSpringSecurity.adoc} | 10 +-
.../pages/2020/2.0.0-M3/migrating-to-2.0.0.adoc | 4 +-
.../modules/fun/partials/_deployment-options.adoc | 2 +-
antora/supplemental-ui/index.html | 2 +-
core/config/generateConfigDocs.groovy | 7 +
.../src/main/adoc/modules/config/pages/about.adoc | 26 ++--
...sy~post.adoc => isis.security.spring~post.adoc} | 0
.../section-hooks/isis.security.spring~pre.adoc | 3 +-
.../adoc/modules/config/pages/sections/_nav.adoc | 1 +
...curity.shiro.adoc => isis.security.spring.adoc} | 17 ++-
.../config/pages/sections/isis.viewer.wicket.adoc | 56 ++++----
.../apache/isis/core/config/IsisConfiguration.java | 2 +-
core/pom.xml | 2 +-
.../IsisModuleCoreRuntimeServices.java | 10 +-
...lDefault.java => CommandDtoFactoryDefault.java} | 26 ++--
doxygen.cfg | 2 +-
examples/demo/wicket/e2e-notes.adoc | 4 +-
.../integration/typescript/basic.ts | 2 +-
examples/demo/wicket/src/test/e2e/tsconfig.json | 2 +-
extensions/vw/fullcalendar/pom.xml | 2 +-
.../src/main/java/org/wicketstuff/pdfjs/res/pdf.js | 2 +-
.../modules/kroviz/pages/DevelopmentGuide.adoc | 38 ++---
.../bootstrapping/builtin-domain-services.list | 4 +-
.../adoc/modules/starters/pages/helloworld.adoc | 2 +-
.../adoc/modules/starters/pages/simpleapp.adoc | 2 +-
.../adoc/modules/ROOT/pages/ro-spec.adoc | 2 +-
.../other-representations.adoc | 2 +-
.../ROOT/partials/security/user-registration.adoc | 2 +-
.../modules/ROOT/partials/security/web-xml.adoc | 2 +-
.../ROOT/pages/configuration-properties.adoc | 4 +-
.../ROOT/pages/customisation/auto-refresh.adoc | 2 +-
.../pages/customisation/custom-javascript.adoc | 6 +-
.../wicket/adoc/modules/ROOT/pages/extending.adoc | 2 +-
.../actionprompt/ActionPromptModalWindow.java | 2 +-
.../components/scalars/XEditableBehaviorWkt.java | 2 +-
.../wicket/ui/errors/ExceptionStackTracePanel.java | 2 +-
.../viewer/wicketapp/IsisWicketApplication.java | 2 +-
60 files changed, 386 insertions(+), 396 deletions(-)
create mode 100644 antora/components/refguide-index/modules/applib/pages/index/id/TypeIdentifier.adoc
delete mode 100644 antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks/pages-to-update/ApplicationFeatureFactory.adoc
delete mode 100644 antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks/pages-to-update/AuthenticationSessionProvider.adoc
copy antora/components/refguide-index/modules/{applib/pages/index/mixins/dto/Dto_downloadXml.adoc => extensions/pages/index/secman/api/authorizor/AuthorizorSecman.adoc} (71%)
copy antora/components/refguide-index/modules/{applib/pages/index/graph/Edge.adoc => security/pages/index/spring/IsisModuleSecuritySpring.adoc} (81%)
copy antora/components/refguide-index/modules/security/pages/index/{keycloak/authentication/AuthenticatorKeycloak.adoc => spring/authentication/AuthenticatorSpring.adoc} (92%)
copy antora/components/refguide-index/modules/security/pages/index/{keycloak/webmodule/KeycloakFilter.adoc => spring/webmodule/SpringSecurityFilter.adoc} (85%)
copy antora/components/refguide-index/modules/security/pages/index/{keycloak/webmodule/WebModuleKeycloak.adoc => spring/webmodule/WebModuleSpringSecurity.adoc} (81%)
copy core/config/src/main/adoc/modules/config/pages/section-hooks/{resteasy~post.adoc => isis.security.spring~post.adoc} (100%)
copy antora/components/refguide-index/modules/applib/pages/index/services/iactn/hooks/Interaction_010-implementation.adoc => core/config/src/main/adoc/modules/config/pages/section-hooks/isis.security.spring~pre.adoc (91%)
copy core/config/src/main/adoc/modules/config/pages/sections/{isis.security.shiro.adoc => isis.security.spring.adoc} (59%)
rename core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/{CommandDtoServiceInternalDefault.java => CommandDtoFactoryDefault.java} (93%)
[isis] 01/02: ISIS-2444: remvoes ApplicationFeatureFactory docs
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2444
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 76ef6e6c29b47ccb7389beb951ac15f68f4f4b33
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Mar 1 06:25:10 2021 +0000
ISIS-2444: remvoes ApplicationFeatureFactory docs
... there was nothing there worth mentioning
---
.../hooks/ApplicationFeatureRepository_020-examples-and-usage.adoc | 3 ---
.../hooks/pages-to-update/ApplicationFeatureFactory.adoc | 6 ------
2 files changed, 9 deletions(-)
diff --git a/antora/components/refguide-index/modules/applib/pages/index/services/appfeat/hooks/ApplicationFeatureRepository_020-examples-and-usage.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/appfeat/hooks/ApplicationFeatureRepository_020-examples-and-usage.adoc
index 276dac5..cf9ad2a 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/services/appfeat/hooks/ApplicationFeatureRepository_020-examples-and-usage.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/appfeat/hooks/ApplicationFeatureRepository_020-examples-and-usage.adoc
@@ -2,8 +2,5 @@
:Notice: 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 ag [...]
-//== See Also
-//
-//The default implementation of this service uses the internal xref:core:runtime-services:ApplicationFeatureFactory.adoc[ApplicationFeatureFactory] service to instantiate `ApplicationFeature` instances.
diff --git a/antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks/pages-to-update/ApplicationFeatureFactory.adoc b/antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks/pages-to-update/ApplicationFeatureFactory.adoc
deleted file mode 100644
index 236f25b..0000000
--- a/antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks/pages-to-update/ApplicationFeatureFactory.adoc
+++ /dev/null
@@ -1,6 +0,0 @@
-= `ApplicationFeatureFactory`
-
-:Notice: 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 ag [...]
-
-
-WARNING: TODO: this content has not yet been reviewed/updated for v2.0
[isis] 02/02: ISIS-2444: renames CommandDtoServiceInternalDefault
to CommandDtoFactoryDefault
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2444
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 0595664e1b07cb40cf466a37cab82059322261cb
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Mar 1 06:28:30 2021 +0000
ISIS-2444: renames CommandDtoServiceInternalDefault to CommandDtoFactoryDefault
---
.../AuthenticationSessionProvider.adoc | 33 ----------------------
.../IsisModuleCoreRuntimeServices.java | 10 +++----
...lDefault.java => CommandDtoFactoryDefault.java} | 26 ++++++++---------
.../bootstrapping/builtin-domain-services.list | 4 +--
4 files changed, 20 insertions(+), 53 deletions(-)
diff --git a/antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks/pages-to-update/AuthenticationSessionProvider.adoc b/antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks/pages-to-update/AuthenticationSessionProvider.adoc
deleted file mode 100644
index cd6060f..0000000
--- a/antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks/pages-to-update/AuthenticationSessionProvider.adoc
+++ /dev/null
@@ -1,33 +0,0 @@
-= `AuthenticationSessionProvider`
-
-:Notice: 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 ag [...]
-
-WARNING: TODO: this content has not yet been reviewed/updated for v2.0
-
-The (internal) `AuthenticationSessionProvider` domain service is simply responsible for obtaining the `AuthenticationSession` (being the framework's internal representation of the currently logged in user).
-
-
-
-
-== SPI and Implementation
-
-The SPI of the service is:
-
-[source,java]
-----
-public interface AuthenticationSessionProvider {
- AuthenticationSession getAuthenticationSession();
-}
-----
-
-
-The framework provides a default implementation of the service, `AuthenticationSessionProviderDefault`, which looks up
-the current `AuthenticationSession` from `IsisSessionFactory` singleton service:
-
-[source,java]
-----
-isisSessionFactory.getCurrentSession().getAuthenticationSession();
-----
-
-
-If xref:refguide:applib:index/services/sudo/SudoService.adoc[SudoService] has been used to temporarily override the user and/or roles, then this service will report the overridden values.
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java
index 6f827b9..16e93c2 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java
@@ -30,7 +30,7 @@ import org.apache.isis.core.codegen.bytebuddy.IsisModuleCoreCodegenByteBuddy;
import org.apache.isis.core.runtime.IsisModuleCoreRuntime;
import org.apache.isis.core.runtimeservices.bookmarks.BookmarkServiceDefault;
import org.apache.isis.core.runtimeservices.clock.ClockServiceDefault;
-import org.apache.isis.core.runtimeservices.command.CommandDtoServiceInternalDefault;
+import org.apache.isis.core.runtimeservices.command.CommandDtoFactoryDefault;
import org.apache.isis.core.runtimeservices.command.CommandExecutorServiceDefault;
import org.apache.isis.core.runtimeservices.confmenu.ConfigurationViewServiceDefault;
import org.apache.isis.core.runtimeservices.email.EmailServiceDefault;
@@ -77,7 +77,7 @@ import org.apache.isis.core.runtimeservices.xmlsnapshot.XmlSnapshotServiceDefaul
EntityChangesPublisherDefault.class,
EntityPropertyChangePublisherDefault.class,
ClockServiceDefault.class,
- CommandDtoServiceInternalDefault.class,
+ CommandDtoFactoryDefault.class,
CommandExecutorServiceDefault.class,
CommandPublisherDefault.class,
ConfigurationViewServiceDefault.class,
@@ -106,7 +106,7 @@ import org.apache.isis.core.runtimeservices.xmlsnapshot.XmlSnapshotServiceDefaul
WrapperFactoryDefault.class,
XmlServiceDefault.class,
XmlSnapshotServiceDefault.class,
-
+
// @Controller
RoutingServiceDefault.class,
@@ -115,7 +115,7 @@ import org.apache.isis.core.runtimeservices.xmlsnapshot.XmlSnapshotServiceDefaul
// @DomainService's
TranslationServicePoMenu.class,
-
+
// Exception Recognizers
ExceptionRecognizerForDataAccessException.class,
@@ -126,5 +126,5 @@ public class IsisModuleCoreRuntimeServices {
public OrderComparator orderComparator() {
return new AnnotationAwareOrderComparator();
}
-
+
}
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandDtoServiceInternalDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandDtoFactoryDefault.java
similarity index 93%
rename from core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandDtoServiceInternalDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandDtoFactoryDefault.java
index 82d9bfb..3c03111 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandDtoServiceInternalDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandDtoFactoryDefault.java
@@ -54,11 +54,11 @@ import org.apache.isis.schema.common.v2.OidsDto;
import lombok.val;
@Service
-@Named("isis.runtimeservices.CommandDtoServiceInternalDefault")
+@Named("isis.runtimeservices.CommandDtoFactoryDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-public class CommandDtoServiceInternalDefault implements CommandDtoFactory {
+public class CommandDtoFactoryDefault implements CommandDtoFactory {
@Inject BookmarkService bookmarkService;
@Inject ClockService clockService;
@@ -112,24 +112,24 @@ public class CommandDtoServiceInternalDefault implements CommandDtoFactory {
val actionParameters = objectAction.getParameters();
for (int paramNum = 0; paramNum < actionParameters.size(); paramNum++) {
final ObjectActionParameter actionParameter = actionParameters.getElseFail(paramNum);
-
+
final Object arg = argAdapters.get(paramNum)
.map(argAdapter->argAdapter != null? argAdapter.getPojo(): null)
.orElse(null);
-
+
// in case of non-scalar params returns the element type
val paramTypeOrElementType = actionParameter.getSpecification().getCorrespondingClass();
-
+
val paramDto = actionParameter.getFeatureType() == FeatureType.ACTION_PARAMETER_COLLECTION
? CommonDtoUtils.newParamDtoNonScalar(
- actionParameter.getName(),
- paramTypeOrElementType,
- arg,
+ actionParameter.getName(),
+ paramTypeOrElementType,
+ arg,
bookmarkService)
: CommonDtoUtils.newParamDto(
- actionParameter.getName(),
- paramTypeOrElementType,
- arg,
+ actionParameter.getName(),
+ paramTypeOrElementType,
+ arg,
bookmarkService);
CommandDtoUtils.parametersFor(actionDto)
@@ -156,7 +156,7 @@ public class CommandDtoServiceInternalDefault implements CommandDtoFactory {
}
// -- HELPER
-
+
private CommandDto asCommandDto(final UUID uniqueId, final Can<ManagedObject> targetAdapters) {
val dto = new CommandDto();
@@ -174,6 +174,6 @@ public class CommandDtoServiceInternalDefault implements CommandDtoFactory {
}
return dto;
}
-
+
}
diff --git a/regressiontests/stable/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-domain-services.list b/regressiontests/stable/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-domain-services.list
index 3f31129..d47e452 100644
--- a/regressiontests/stable/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-domain-services.list
+++ b/regressiontests/stable/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-domain-services.list
@@ -30,11 +30,11 @@ org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts
ServiceRegistryDefault
UserServiceDefault$SudoServiceSpi
org.apache.isis.persistence.jdo.datanucleus5.metrics.MetricsServiceForJdo
-org.apache.isis.core.runtimeservices.command.CommandDtoServiceInternalDefault
+CommandDtoFactoryDefault
org.apache.isis.core.runtimeservices.confmenu.ConfigurationViewServiceDefault
org.apache.isis.core.runtimeservices.email.EmailServiceDefault
org.apache.isis.core.runtimeservices.i18n.po.TranslationServicePoMenu
org.apache.isis.core.runtimeservices.ixn.InteractionDtoServiceInternalDefault
org.apache.isis.core.runtimeservices.sudo.SudoServiceDefault
org.apache.isis.core.runtimeservices.userprof.UserProfileServiceDefault
-org.apache.isis.core.runtimeservices.userreg.EmailNotificationServiceDefault
\ No newline at end of file
+org.apache.isis.core.runtimeservices.userreg.EmailNotificationServiceDefault