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 2020/02/11 08:30:42 UTC
[isis] branch master updated (0e3c0e5 -> a8b19fa)
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 0e3c0e5 ISIS-2275: improving layout docs
new 7e79dbb ISIS-2062: use redirect-facility
new 432e882 ISIS-2062: docs
new 334001e ISIS-2062: fixes up redirects from old URLs.
new 4a603f2 ISIS-2062: docs
new d48925f ISIS-2062: docs
new bf1ea0a ISIS-2284: fixes the ExceptionMapperForObjectNotFound - was using wrong ObjectNotFoundException
new aafbf21 ISIS-2284: adds overload to ExceptionMapperAbstract superclass so that
new 0e71564 ISIS-2284: ExceptionMapperForObjectNotFound uses overload to explicitly
new e331998 ISIS-2284: (possibly unnecessary) - annotate all ExceptionMapperFor...
new d0683ff ISIS-2284: deprecates classes that seem to be unused.
new 623f83e ISIS-2284: removes some commented out code
new b4ea2c7 ISIS-2158: minor code tidy-up : use constructor injection for IsisConfiguration
new 5f49ca8 ISIS-2158: removes field dependency of FixtureScript on FixtureScripts
new f795f7b ISIS-2158: adds missing @Inject annotation on constructor ...
new a8b19fa ISIS-2158: removes commented out code
The 15 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:
antora/playbooks/site-comguide.yml | 4 ----
antora/playbooks/site-conguide.yml | 4 ----
antora/playbooks/site-core.yml | 4 ----
antora/playbooks/site-docs.yml | 4 ----
antora/playbooks/site-extensions.yml | 4 ----
antora/playbooks/site-incubator.yml | 4 ----
antora/playbooks/site-legacy.yml | 4 ----
antora/playbooks/site-mappings.yml | 4 ----
antora/playbooks/site-persistence.yml | 4 ----
antora/playbooks/site-refguide.yml | 4 ----
antora/playbooks/site-relnotes.yml | 4 ----
antora/playbooks/site-security.yml | 5 ----
antora/playbooks/site-setupguide.yml | 4 ----
antora/playbooks/site-subdomains.yml | 4 ----
antora/playbooks/site-testing.yml | 4 ----
antora/playbooks/site-userguide.yml | 4 ----
antora/playbooks/site-valuetypes.yml | 4 ----
antora/playbooks/site-vro.yml | 4 ----
antora/playbooks/site-vw.yml | 4 ----
antora/playbooks/site.yml | 3 ---
antora/redirects/guides/antora.yml | 6 -----
antora/redirects/guides/modules/ROOT/nav.adoc | 1 -
.../redirects/guides/modules/ROOT/pages/about.adoc | 4 ----
antora/redirects/guides/modules/ugvro/nav.adoc | 3 ---
.../guides/modules/ugvro/pages/ugvro.adoc | 5 ----
antora/redirects/guides/modules/ugvw/nav.adoc | 1 -
.../redirects/guides/modules/ugvw/pages/ugvw.adoc | 5 ----
antora/supplemental-ui/support.html | 6 ++---
antora/supplemental-ui/ui.yml | 1 +
.../apache/isis/core/config/IsisConfiguration.java | 8 +++++--
...ion_getMaxTitleLengthInParentedTables_Test.java | 2 +-
...n_getMaxTitleLengthInStandaloneTables_Test.java | 2 +-
.../persistence/ObjectNotFoundException.java | 7 +++++-
.../persistence/ObjectPersistenceException.java | 5 ++++
.../persistence/PojoRecreationException.java | 5 ++++
.../persistence/PojoRefreshException.java | 5 ++++
.../metamodel/MetaModelContext_forTesting.java | 3 +--
.../ViewModelSemanticCheckingFacetFactoryTest.java | 2 +-
...romptStyleFacetFromPropertyAnnotation_Test.java | 2 +-
.../SpecificationLoaderTestAbstract.java | 3 +--
scripts/ci/_adoc-antora.sh | 6 ++---
...AuthenticatorOrAuthorizorTest_authenticate.java | 2 +-
...ticatorOrAuthorizorTest_isVisibleInAnyRole.java | 2 +-
.../spring/applib/service/SpringBeansService.java | 2 ++
.../applib/fixturescripts/FixtureScript.java | 5 ++--
.../applib/fixturescripts/FixtureScripts.java | 6 ++---
.../applib/services/FixturesLifecycleService.java | 6 -----
.../adoc/modules/ROOT/pages/about.adoc | 3 +++
.../viewer/mappers/ExceptionMapperAbstract.java | 5 +++-
.../mappers/ExceptionMapperForObjectNotFound.java | 10 ++++++--
...xceptionMapperForRestfulObjectsApplication.java | 10 ++++----
.../ExceptionMapperForRuntimeException.java | 27 +++++-----------------
viewers/wicket/adoc/modules/ROOT/pages/about.adoc | 3 ++-
53 files changed, 79 insertions(+), 164 deletions(-)
delete mode 100644 antora/redirects/guides/antora.yml
delete mode 100644 antora/redirects/guides/modules/ROOT/nav.adoc
delete mode 100644 antora/redirects/guides/modules/ROOT/pages/about.adoc
delete mode 100644 antora/redirects/guides/modules/ugvro/nav.adoc
delete mode 100644 antora/redirects/guides/modules/ugvro/pages/ugvro.adoc
delete mode 100644 antora/redirects/guides/modules/ugvw/nav.adoc
delete mode 100644 antora/redirects/guides/modules/ugvw/pages/ugvw.adoc
[isis] 15/15: ISIS-2158: removes commented out code
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 a8b19fa2113c1ba131f0a62e156a751822e984e7
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Feb 11 08:16:40 2020 +0000
ISIS-2158: removes commented out code
---
.../testing/fixtures/applib/services/FixturesLifecycleService.java | 6 ------
1 file changed, 6 deletions(-)
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/FixturesLifecycleService.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/FixturesLifecycleService.java
index fc65623..49badf9 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/FixturesLifecycleService.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/FixturesLifecycleService.java
@@ -56,12 +56,6 @@ public class FixturesLifecycleService {
FixtureClock.initialize();
}
- //
- // installFixturesIfRequired
- //
- // final FixturesInstallerFromConfiguration fixtureInstaller =
- // new FixturesInstallerFromConfiguration();
- // fixtureInstaller.installFixtures();
}
[isis] 12/15: ISIS-2158: minor code tidy-up : use constructor
injection for IsisConfiguration
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 b4ea2c7cc52ac5e3ed9514c7520a3c1337813551
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Feb 11 08:15:16 2020 +0000
ISIS-2158: minor code tidy-up : use constructor injection for IsisConfiguration
---
.../main/java/org/apache/isis/core/config/IsisConfiguration.java | 8 ++++++--
.../IsisConfiguration_getMaxTitleLengthInParentedTables_Test.java | 2 +-
...sisConfiguration_getMaxTitleLengthInStandaloneTables_Test.java | 2 +-
.../apache/isis/core/metamodel/MetaModelContext_forTesting.java | 3 +--
.../facets/object/ViewModelSemanticCheckingFacetFactoryTest.java | 2 +-
.../promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java | 2 +-
.../metamodel/specloader/SpecificationLoaderTestAbstract.java | 3 +--
.../shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java | 2 +-
.../ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java | 2 +-
9 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
index 3c6f6f1..839540d 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
@@ -78,8 +78,12 @@ import lombok.Value;
public class IsisConfiguration {
public static final String ROOT_PREFIX = "isis";
- @Autowired private ConfigurableEnvironment environment;
-
+
+ private final ConfigurableEnvironment environment;
+ public IsisConfiguration(final ConfigurableEnvironment environment) {
+ this.environment = environment;
+ }
+
@Inject @Named("isis-settings") private Map<String, String> isisSettings;
public Map<String, String> getAsMap() { return Collections.unmodifiableMap(isisSettings); }
diff --git a/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_getMaxTitleLengthInParentedTables_Test.java b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_getMaxTitleLengthInParentedTables_Test.java
index 049f7a1..1018905 100644
--- a/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_getMaxTitleLengthInParentedTables_Test.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_getMaxTitleLengthInParentedTables_Test.java
@@ -10,7 +10,7 @@ public class IsisConfiguration_getMaxTitleLengthInParentedTables_Test {
@Before
public void setUp() throws Exception {
- configuration = new IsisConfiguration();
+ configuration = new IsisConfiguration(null);
}
@Test
diff --git a/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_getMaxTitleLengthInStandaloneTables_Test.java b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_getMaxTitleLengthInStandaloneTables_Test.java
index 6434437..41dbe5c 100644
--- a/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_getMaxTitleLengthInStandaloneTables_Test.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_getMaxTitleLengthInStandaloneTables_Test.java
@@ -10,7 +10,7 @@ public class IsisConfiguration_getMaxTitleLengthInStandaloneTables_Test {
@Before
public void setUp() throws Exception {
- configuration = new IsisConfiguration();
+ configuration = new IsisConfiguration(null);
}
@Test
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
index 19cda70..52c34ce 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
@@ -177,8 +177,7 @@ public final class MetaModelContext_forTesting implements MetaModelContext {
}
private static IsisConfiguration newIsisConfiguration() {
- val config = new IsisConfiguration();
- config.setEnvironment(new AbstractEnvironment() {
+ val config = new IsisConfiguration(new AbstractEnvironment() {
@Override
public String getProperty(String key) {
return _Config.getConfiguration().getString(key);
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
index cb8b91c..85cfcfb 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
@@ -82,7 +82,7 @@ public class ViewModelSemanticCheckingFacetFactoryTest {
_Context.clear();
_Config.clear();
- val configuration = new IsisConfiguration();
+ val configuration = new IsisConfiguration(null);
configuration.getApplib().getAnnotation().getViewModel().getValidation().getSemanticChecking().setEnable(true);
metaModelContext = MetaModelContext_forTesting.builder()
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
index b07a27b..bcba2f3 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
@@ -46,7 +46,7 @@ public class PromptStyleFacetFromPropertyAnnotation_Test {
@Rule
public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
- IsisConfiguration stubConfiguration = new IsisConfiguration();
+ IsisConfiguration stubConfiguration = new IsisConfiguration(null);
@Mock
FacetHolder mockFacetHolder;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
index 26ba76e..c1bd33b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
@@ -64,9 +64,8 @@ abstract class SpecificationLoaderTestAbstract {
}
IsisConfiguration newConfiguration() {
- val config = new IsisConfiguration(); // uses defaults!
+ val config = new IsisConfiguration(newConfigurableEnvironment()); // uses defaults!
config.getCore().getMetaModel().getIntrospector().setLockAfterFullIntrospection(false);
- config.setEnvironment(newConfigurableEnvironment());
return config;
}
diff --git a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
index 7444b9f..b6774ce 100644
--- a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
+++ b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
@@ -59,7 +59,7 @@ public class ShiroAuthenticatorOrAuthorizorTest_authenticate {
// PRODUCTION
- val configuration = new IsisConfiguration();
+ val configuration = new IsisConfiguration(null);
configuration.getSecurity().getShiro().setAutoLogoutIfAlreadyAuthenticated(false);
authenticator = new AuthenticatorShiro(configuration);
diff --git a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
index 4269c68..7216d33 100644
--- a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
+++ b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
@@ -56,7 +56,7 @@ public class ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole {
// PRODUCTION
- val configuration = new IsisConfiguration();
+ val configuration = new IsisConfiguration(null);
configuration.getSecurity().getShiro().setAutoLogoutIfAlreadyAuthenticated(false);
authenticator = new AuthenticatorShiro(configuration);
[isis] 04/15: ISIS-2062: docs
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 4a603f282f2f38fec6fd68dedccf004ce6664624
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Feb 10 10:12:15 2020 +0000
ISIS-2062: docs
---
antora/supplemental-ui/support.html | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/antora/supplemental-ui/support.html b/antora/supplemental-ui/support.html
index ced5cef..748aaad 100644
--- a/antora/supplemental-ui/support.html
+++ b/antora/supplemental-ui/support.html
@@ -1,9 +1,9 @@
<html>
<head>
- <meta http-equiv="refresh" content="0;url=http:///toc/support/mailing-list.html" />
- <title>Page Moved</title>
+ <script>
+ window.location.href="/docs/support/mailing-list.html"
+ </script>
</head>
<body>
-This page has moved. Click <a href="http:///toc/support/mailing-list.html">here</a> to go to the new page.
</body>
</html>
\ No newline at end of file
[isis] 11/15: ISIS-2284: removes some commented out code
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 623f83e6839db6e0f88063edbaaa3341e1c201d1
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Feb 10 22:48:38 2020 +0000
ISIS-2284: removes some commented out code
---
...ExceptionMapperForRestfulObjectsApplication.java | 3 ---
.../mappers/ExceptionMapperForRuntimeException.java | 21 ---------------------
2 files changed, 24 deletions(-)
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRestfulObjectsApplication.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRestfulObjectsApplication.java
index d709b14..d4c1fbb 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRestfulObjectsApplication.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRestfulObjectsApplication.java
@@ -37,9 +37,6 @@ extends ExceptionMapperAbstract<RestfulObjectsApplicationException> {
@Override
public Response toResponse(final RestfulObjectsApplicationException ex) {
- //XXX code not used, so commented out
- //final JsonRepresentation body = ex.getBody();
- //final String bodyStr = body != null ? body.toString() : null;
return buildResponse(ex);
}
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRuntimeException.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRuntimeException.java
index e565f70..30d4138 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRuntimeException.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRuntimeException.java
@@ -35,29 +35,8 @@ public class ExceptionMapperForRuntimeException extends ExceptionMapperAbstract<
@Override
public Response toResponse(final RuntimeException ex) {
-
- //TODO [2033] removed
- // final Throwable rootCause = _Exceptions.getRootCause(ex);
- // final List<Throwable> causalChain = _Exceptions.getCausalChain(ex);
- // for (Throwable throwable : causalChain) {
- // if(throwable == rootCause) {
- //
- // // since already rendered...
- // getCurrentTransaction()
- // .ifPresent(IsisTransaction::clearAbortCause);
- // }
- // }
-
return buildResponse(ex);
}
- // -- HELPER
-
- //TODO [2033] removed
- // private Optional<IsisTransaction> getCurrentTransaction() {
- // return IsisContext.getTransactionManager()
- // .map(IsisTransactionManager::getCurrentTransaction);
- // }
-
}
[isis] 09/15: ISIS-2284: (possibly unnecessary) - annotate all
ExceptionMapperFor...
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 e3319980b905d648f0b8b77057b168e3aba71f15
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Feb 10 22:45:29 2020 +0000
ISIS-2284: (possibly unnecessary) - annotate all ExceptionMapperFor...
with @Singleton, and specify @Order precedence.
---
.../viewer/mappers/ExceptionMapperForObjectNotFound.java | 6 ++++++
.../mappers/ExceptionMapperForRestfulObjectsApplication.java | 7 ++++++-
.../viewer/mappers/ExceptionMapperForRuntimeException.java | 6 ++++++
3 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForObjectNotFound.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForObjectNotFound.java
index 69b503f..e6f2ff7 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForObjectNotFound.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForObjectNotFound.java
@@ -18,15 +18,21 @@
*/
package org.apache.isis.viewer.restfulobjects.viewer.mappers;
+import javax.inject.Singleton;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
+import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
+import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.core.metamodel.adapter.oid.ObjectNotFoundException;
+import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse;
@Component
@Provider
+@Singleton
+@Order(OrderPrecedence.MIDPOINT)
public class ExceptionMapperForObjectNotFound extends ExceptionMapperAbstract<ObjectNotFoundException> {
@Override
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRestfulObjectsApplication.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRestfulObjectsApplication.java
index de6eeea..d709b14 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRestfulObjectsApplication.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRestfulObjectsApplication.java
@@ -18,16 +18,21 @@
*/
package org.apache.isis.viewer.restfulobjects.viewer.mappers;
+import javax.inject.Singleton;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
+import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
+import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.viewer.restfulobjects.rendering.RestfulObjectsApplicationException;
@Component
@Provider
-public class ExceptionMapperForRestfulObjectsApplication
+@Singleton
+@Order(OrderPrecedence.MIDPOINT)
+public class ExceptionMapperForRestfulObjectsApplication
extends ExceptionMapperAbstract<RestfulObjectsApplicationException> {
@Override
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRuntimeException.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRuntimeException.java
index 7aff4b2..e565f70 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRuntimeException.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRuntimeException.java
@@ -18,13 +18,19 @@
*/
package org.apache.isis.viewer.restfulobjects.viewer.mappers;
+import javax.inject.Singleton;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
+import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
+import org.apache.isis.applib.annotation.OrderPrecedence;
+
@Component
@Provider
+@Singleton
+@Order(OrderPrecedence.LATE)
public class ExceptionMapperForRuntimeException extends ExceptionMapperAbstract<RuntimeException> {
@Override
[isis] 07/15: ISIS-2284: adds overload to ExceptionMapperAbstract
superclass so that
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 aafbf21e67b46ac24b758b9bf9c28a2e7ed1deed
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Feb 10 22:44:11 2020 +0000
ISIS-2284: adds overload to ExceptionMapperAbstract superclass so that
... the subtype can explicitly specify the status code to use
---
.../restfulobjects/viewer/mappers/ExceptionMapperAbstract.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperAbstract.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperAbstract.java
index 8e11c23..89e9c35 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperAbstract.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperAbstract.java
@@ -47,7 +47,10 @@ public abstract class ExceptionMapperAbstract<T extends Throwable> implements Ex
protected HttpHeaders httpHeaders;
Response buildResponse(final T ex) {
- final RestfulResponse.HttpStatusCode httpStatusCode = determineStatusCode(ex);
+ return buildResponse(ex, determineStatusCode(ex));
+ }
+
+ Response buildResponse(final T ex, final RestfulResponse.HttpStatusCode httpStatusCode) {
final String message = messageFor(ex);
if(ex instanceof ExceptionWithBody) {
[isis] 03/15: ISIS-2062: fixes up redirects from old URLs.
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 334001e1b541a04d3ba5965e2e0f1f915ba68c2f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Feb 10 09:59:09 2020 +0000
ISIS-2062: fixes up redirects from old URLs.
---
antora/playbooks/site-comguide.yml | 4 ----
antora/playbooks/site-conguide.yml | 4 ----
antora/playbooks/site-core.yml | 4 ----
antora/playbooks/site-docs.yml | 4 ----
antora/playbooks/site-extensions.yml | 4 ----
antora/playbooks/site-incubator.yml | 4 ----
antora/playbooks/site-legacy.yml | 4 ----
antora/playbooks/site-mappings.yml | 4 ----
antora/playbooks/site-persistence.yml | 4 ----
antora/playbooks/site-refguide.yml | 4 ----
antora/playbooks/site-relnotes.yml | 4 ----
antora/playbooks/site-security.yml | 5 -----
antora/playbooks/site-setupguide.yml | 4 ----
antora/playbooks/site-subdomains.yml | 4 ----
antora/playbooks/site-testing.yml | 4 ----
antora/playbooks/site-userguide.yml | 4 ----
antora/playbooks/site-valuetypes.yml | 4 ----
antora/playbooks/site-vro.yml | 4 ----
antora/playbooks/site-vw.yml | 4 ----
antora/playbooks/site.yml | 3 ---
antora/redirects/guides/antora.yml | 6 ------
antora/redirects/guides/modules/ROOT/nav.adoc | 1 -
antora/redirects/guides/modules/ROOT/pages/about.adoc | 4 ----
antora/redirects/guides/modules/ugvro/nav.adoc | 3 ---
antora/redirects/guides/modules/ugvro/pages/ugvro.adoc | 4 ----
antora/redirects/guides/modules/ugvw/nav.adoc | 1 -
antora/redirects/guides/modules/ugvw/pages/ugvw.adoc | 3 ---
antora/supplemental-ui/ui.yml | 1 +
28 files changed, 1 insertion(+), 102 deletions(-)
diff --git a/antora/playbooks/site-comguide.yml b/antora/playbooks/site-comguide.yml
index 8781e5b..b4a0262 100644
--- a/antora/playbooks/site-comguide.yml
+++ b/antora/playbooks/site-comguide.yml
@@ -13,10 +13,6 @@ content:
- url: .
start_path: antora/components/comguide # comguide
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# examples
- url: .
start_path: examples/demo/src/main/adoc # docs
diff --git a/antora/playbooks/site-conguide.yml b/antora/playbooks/site-conguide.yml
index 9f2d58b..a0b0849 100644
--- a/antora/playbooks/site-conguide.yml
+++ b/antora/playbooks/site-conguide.yml
@@ -13,10 +13,6 @@ content:
- url: .
start_path: antora/components/conguide # conguide
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# examples
- url: .
start_path: examples/demo/src/main/adoc # docs
diff --git a/antora/playbooks/site-core.yml b/antora/playbooks/site-core.yml
index f15fa0c..a4350c2 100644
--- a/antora/playbooks/site-core.yml
+++ b/antora/playbooks/site-core.yml
@@ -10,10 +10,6 @@ content:
- url: .
start_path: antora/components/docs # docs
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# core
- url: .
start_path: core/adoc # core
diff --git a/antora/playbooks/site-docs.yml b/antora/playbooks/site-docs.yml
index 0b6f000..2a68198 100644
--- a/antora/playbooks/site-docs.yml
+++ b/antora/playbooks/site-docs.yml
@@ -10,10 +10,6 @@ content:
- url: .
start_path: antora/components/docs # docs
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# examples
- url: .
start_path: examples/demo/src/main/adoc # docs
diff --git a/antora/playbooks/site-extensions.yml b/antora/playbooks/site-extensions.yml
index 8a8037c..c764061 100644
--- a/antora/playbooks/site-extensions.yml
+++ b/antora/playbooks/site-extensions.yml
@@ -10,10 +10,6 @@ content:
- url: .
start_path: antora/components/docs # docs
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# examples
- url: .
start_path: examples/demo/src/main/adoc # docs
diff --git a/antora/playbooks/site-incubator.yml b/antora/playbooks/site-incubator.yml
index 9a1c2b8..7f52021 100644
--- a/antora/playbooks/site-incubator.yml
+++ b/antora/playbooks/site-incubator.yml
@@ -10,10 +10,6 @@ content:
- url: .
start_path: antora/components/docs # docs
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# examples
- url: .
start_path: examples/demo/src/main/adoc # docs
diff --git a/antora/playbooks/site-legacy.yml b/antora/playbooks/site-legacy.yml
index 836d0d1..a6eac9b 100644
--- a/antora/playbooks/site-legacy.yml
+++ b/antora/playbooks/site-legacy.yml
@@ -10,10 +10,6 @@ content:
- url: .
start_path: antora/components/docs # docs
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# examples
- url: .
start_path: examples/demo/src/main/adoc # docs
diff --git a/antora/playbooks/site-mappings.yml b/antora/playbooks/site-mappings.yml
index f4108e0..f175bdb 100644
--- a/antora/playbooks/site-mappings.yml
+++ b/antora/playbooks/site-mappings.yml
@@ -10,10 +10,6 @@ content:
- url: .
start_path: antora/components/docs # docs
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# examples
- url: .
start_path: examples/demo/src/main/adoc # docs
diff --git a/antora/playbooks/site-persistence.yml b/antora/playbooks/site-persistence.yml
index c6f2b99..36a7fe5 100644
--- a/antora/playbooks/site-persistence.yml
+++ b/antora/playbooks/site-persistence.yml
@@ -10,10 +10,6 @@ content:
- url: .
start_path: antora/components/docs # docs
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# examples
- url: .
start_path: examples/demo/src/main/adoc # docs
diff --git a/antora/playbooks/site-refguide.yml b/antora/playbooks/site-refguide.yml
index e2ec26e..6a086ee 100644
--- a/antora/playbooks/site-refguide.yml
+++ b/antora/playbooks/site-refguide.yml
@@ -10,10 +10,6 @@ content:
- url: .
start_path: antora/components/docs # docs
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# api
- url: .
start_path: api/adoc/refguide # refguide
diff --git a/antora/playbooks/site-relnotes.yml b/antora/playbooks/site-relnotes.yml
index fd56739..fd8dbc4 100644
--- a/antora/playbooks/site-relnotes.yml
+++ b/antora/playbooks/site-relnotes.yml
@@ -13,10 +13,6 @@ content:
- url: .
start_path: antora/components/relnotes # relnotes
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# examples
- url: .
start_path: examples/demo/src/main/adoc # docs
diff --git a/antora/playbooks/site-security.yml b/antora/playbooks/site-security.yml
index 1a0d0a6..1986336 100644
--- a/antora/playbooks/site-security.yml
+++ b/antora/playbooks/site-security.yml
@@ -10,11 +10,6 @@ content:
- url: .
start_path: antora/components/docs # docs
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
-
# core
- url: .
start_path: core/security/src/main/adoc # security
diff --git a/antora/playbooks/site-setupguide.yml b/antora/playbooks/site-setupguide.yml
index eb46d38..0666b04 100644
--- a/antora/playbooks/site-setupguide.yml
+++ b/antora/playbooks/site-setupguide.yml
@@ -13,10 +13,6 @@ content:
- url: .
start_path: antora/components/setupguide # setupguide
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# examples
- url: .
start_path: examples/demo/src/main/adoc # docs
diff --git a/antora/playbooks/site-subdomains.yml b/antora/playbooks/site-subdomains.yml
index 6782cdc..813a9f4 100644
--- a/antora/playbooks/site-subdomains.yml
+++ b/antora/playbooks/site-subdomains.yml
@@ -10,10 +10,6 @@ content:
- url: .
start_path: antora/components/docs # docs
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# examples
- url: .
start_path: examples/demo/src/main/adoc # docs
diff --git a/antora/playbooks/site-testing.yml b/antora/playbooks/site-testing.yml
index d75027a..462b029 100644
--- a/antora/playbooks/site-testing.yml
+++ b/antora/playbooks/site-testing.yml
@@ -10,10 +10,6 @@ content:
- url: .
start_path: antora/components/docs # docs
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# examples
- url: .
start_path: examples/demo/src/main/adoc # docs
diff --git a/antora/playbooks/site-userguide.yml b/antora/playbooks/site-userguide.yml
index f146d25..7ea398f 100644
--- a/antora/playbooks/site-userguide.yml
+++ b/antora/playbooks/site-userguide.yml
@@ -10,10 +10,6 @@ content:
- url: .
start_path: antora/components/docs # docs
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# api
- url: .
start_path: api/adoc/userguide # userguide
diff --git a/antora/playbooks/site-valuetypes.yml b/antora/playbooks/site-valuetypes.yml
index 3f2ec03..6e64be6 100644
--- a/antora/playbooks/site-valuetypes.yml
+++ b/antora/playbooks/site-valuetypes.yml
@@ -10,10 +10,6 @@ content:
- url: .
start_path: antora/components/docs # docs
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# examples
- url: .
start_path: examples/demo/src/main/adoc # docs
diff --git a/antora/playbooks/site-vro.yml b/antora/playbooks/site-vro.yml
index 14039df..9ed8e9f 100644
--- a/antora/playbooks/site-vro.yml
+++ b/antora/playbooks/site-vro.yml
@@ -10,10 +10,6 @@ content:
- url: .
start_path: antora/components/docs # docs
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# examples
- url: .
start_path: examples/demo/src/main/adoc # docs
diff --git a/antora/playbooks/site-vw.yml b/antora/playbooks/site-vw.yml
index e685c4d..4a456e0 100644
--- a/antora/playbooks/site-vw.yml
+++ b/antora/playbooks/site-vw.yml
@@ -10,10 +10,6 @@ content:
- url: .
start_path: antora/components/docs # docs
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# examples
- url: .
start_path: examples/demo/src/main/adoc # docs
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index 88be3b4..bf8842e 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -22,9 +22,6 @@ content:
- url: .
start_path: antora/components/setupguide # setupguide
branches: HEAD
-# - url: .
-# start_path: antora/redirects/guides # docs
-# branches: HEAD
# api
diff --git a/antora/redirects/guides/antora.yml b/antora/redirects/guides/antora.yml
deleted file mode 100644
index 85593c3..0000000
--- a/antora/redirects/guides/antora.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: guides
-title: "Guides (redirecting)"
-version: master
-start_page: ROOT:about.adoc
-nav:
-- modules/ROOT/nav.adoc
diff --git a/antora/redirects/guides/modules/ROOT/nav.adoc b/antora/redirects/guides/modules/ROOT/nav.adoc
deleted file mode 100644
index 08f35ec..0000000
--- a/antora/redirects/guides/modules/ROOT/nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-* xref:guides:ROOT:about.adoc[]
diff --git a/antora/redirects/guides/modules/ROOT/pages/about.adoc b/antora/redirects/guides/modules/ROOT/pages/about.adoc
deleted file mode 100644
index 9508b58..0000000
--- a/antora/redirects/guides/modules/ROOT/pages/about.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-= Redirects
-: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 [...]
-
-
diff --git a/antora/redirects/guides/modules/ugvro/nav.adoc b/antora/redirects/guides/modules/ugvro/nav.adoc
deleted file mode 100644
index 498244d..0000000
--- a/antora/redirects/guides/modules/ugvro/nav.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-* xref:guides:ugvro:ugvro.adoc[]
-
-
diff --git a/antora/redirects/guides/modules/ugvro/pages/ugvro.adoc b/antora/redirects/guides/modules/ugvro/pages/ugvro.adoc
deleted file mode 100644
index 1f1400e..0000000
--- a/antora/redirects/guides/modules/ugvro/pages/ugvro.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-= Restful Objects Viewer
-: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 [...]
-
-
diff --git a/antora/redirects/guides/modules/ugvw/nav.adoc b/antora/redirects/guides/modules/ugvw/nav.adoc
deleted file mode 100644
index 1538b85..0000000
--- a/antora/redirects/guides/modules/ugvw/nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-* xref:guides:ugvw:ugvw.adoc[]
diff --git a/antora/redirects/guides/modules/ugvw/pages/ugvw.adoc b/antora/redirects/guides/modules/ugvw/pages/ugvw.adoc
deleted file mode 100644
index fb5dcfe..0000000
--- a/antora/redirects/guides/modules/ugvw/pages/ugvw.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-= Wicket Viewer
-: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 [...]
-
diff --git a/antora/supplemental-ui/ui.yml b/antora/supplemental-ui/ui.yml
index 611ea9a..5c1feb1 100644
--- a/antora/supplemental-ui/ui.yml
+++ b/antora/supplemental-ui/ui.yml
@@ -1,5 +1,6 @@
static_files:
- index.html
+- support.html
- _headers
- robots.txt
- doap_isis.rdf
[isis] 05/15: ISIS-2062: docs
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 d48925fec27da88ba3d50d04eeb3433cac603455
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Feb 10 10:16:02 2020 +0000
ISIS-2062: docs
---
viewers/restfulobjects/adoc/modules/ROOT/pages/about.adoc | 1 +
1 file changed, 1 insertion(+)
diff --git a/viewers/restfulobjects/adoc/modules/ROOT/pages/about.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/about.adoc
index c514a68..2e2ddc8 100644
--- a/viewers/restfulobjects/adoc/modules/ROOT/pages/about.adoc
+++ b/viewers/restfulobjects/adoc/modules/ROOT/pages/about.adoc
@@ -1,4 +1,5 @@
= Restful Objects Viewer
+: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 [...]
:page-aliases: guides:ugvro:ugvro.adoc
[isis] 02/15: ISIS-2062: docs
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 432e8824606f77ce050822b9ef797928504e94f1
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Feb 10 09:50:39 2020 +0000
ISIS-2062: docs
---
antora/playbooks/site.yml | 6 +++---
antora/redirects/guides/modules/ROOT/pages/about.adoc | 2 +-
antora/redirects/guides/modules/ugvro/pages/ugvro.adoc | 1 -
antora/redirects/guides/modules/ugvw/pages/ugvw.adoc | 2 --
viewers/restfulobjects/adoc/modules/ROOT/pages/about.adoc | 2 ++
viewers/wicket/adoc/modules/ROOT/pages/about.adoc | 3 ++-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index a30dfc5..88be3b4 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -22,9 +22,9 @@ content:
- url: .
start_path: antora/components/setupguide # setupguide
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
+# - url: .
+# start_path: antora/redirects/guides # docs
+# branches: HEAD
# api
diff --git a/antora/redirects/guides/modules/ROOT/pages/about.adoc b/antora/redirects/guides/modules/ROOT/pages/about.adoc
index 18983f0..9508b58 100644
--- a/antora/redirects/guides/modules/ROOT/pages/about.adoc
+++ b/antora/redirects/guides/modules/ROOT/pages/about.adoc
@@ -1,4 +1,4 @@
= Redirects
: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 [...]
-:page-aliases: xref:docs:ROOT:about.adoc
+
diff --git a/antora/redirects/guides/modules/ugvro/pages/ugvro.adoc b/antora/redirects/guides/modules/ugvro/pages/ugvro.adoc
index 717d84e..1f1400e 100644
--- a/antora/redirects/guides/modules/ugvro/pages/ugvro.adoc
+++ b/antora/redirects/guides/modules/ugvro/pages/ugvro.adoc
@@ -1,5 +1,4 @@
= Restful Objects Viewer
: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 [...]
-:page-aliases: xref:vro:ROOT:about.adoc
diff --git a/antora/redirects/guides/modules/ugvw/pages/ugvw.adoc b/antora/redirects/guides/modules/ugvw/pages/ugvw.adoc
index 9a6dcb6..fb5dcfe 100644
--- a/antora/redirects/guides/modules/ugvw/pages/ugvw.adoc
+++ b/antora/redirects/guides/modules/ugvw/pages/ugvw.adoc
@@ -1,5 +1,3 @@
= Wicket Viewer
: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 [...]
-:page-aliases: xref:vw:ROOT:about.adoc
-
diff --git a/viewers/restfulobjects/adoc/modules/ROOT/pages/about.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/about.adoc
index 30e3a8c..c514a68 100644
--- a/viewers/restfulobjects/adoc/modules/ROOT/pages/about.adoc
+++ b/viewers/restfulobjects/adoc/modules/ROOT/pages/about.adoc
@@ -1,5 +1,7 @@
= Restful Objects Viewer
+:page-aliases: guides:ugvro:ugvro.adoc
+
Apache Isis' Restful Objects viewer is an implementation of the link:http://restfulobjects.org[Restful Objects spec],
which defines a generic way to expose a domain model through a REST (or more precisely, hypermedia) API. Having a REST
API opens up an Apache Isis domain model to a huge variety of applications, from bespoke single-page apps,
diff --git a/viewers/wicket/adoc/modules/ROOT/pages/about.adoc b/viewers/wicket/adoc/modules/ROOT/pages/about.adoc
index 2c00058..e24554d 100644
--- a/viewers/wicket/adoc/modules/ROOT/pages/about.adoc
+++ b/viewers/wicket/adoc/modules/ROOT/pages/about.adoc
@@ -1,6 +1,7 @@
= Wicket Viewer
: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 [...]
-:page-aliases: sysadmin:webservers:upgrade/service/apache.adoc
+:page-aliases: guides:ugvw:ugvw.adoc
+
The Wicket Viewer automatically exposes an Apache Isis domain object model for use by end-users. The viewer is
implemented using link:http://wicket.apache.org[Apache Wicket].
[isis] 13/15: ISIS-2158: removes field dependency of FixtureScript
on FixtureScripts
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 5f49ca85a29e342373306fef6067662cb5351370
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Feb 11 08:16:05 2020 +0000
ISIS-2158: removes field dependency of FixtureScript on FixtureScripts
... because otherwise cyclic dependencies may arise.
---
.../isis/testing/fixtures/applib/fixturescripts/FixtureScript.java | 5 +++--
.../isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java | 6 +++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScript.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScript.java
index 2d1da8b..0a06d72 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScript.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScript.java
@@ -714,7 +714,9 @@ public abstract class FixtureScript {
* Package-visibility only, not public API.
* </p>
*/
- final List<FixtureResult> run(final String parameters) {
+ final List<FixtureResult> run(
+ final String parameters,
+ final FixtureScripts fixtureScripts) {
executionContext = fixtureScripts.newExecutionContext(parameters);
executionContext.executeChildIfNotAlready(this);
return executionContext.getResults();
@@ -831,7 +833,6 @@ public abstract class FixtureScript {
// -- DEPENDENCIES
- @Inject protected FixtureScripts fixtureScripts;
@Inject protected FactoryService factoryService;
@Inject protected ServiceRegistry serviceRegistry;
@Inject protected ServiceInjector serviceInjector;
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java
index 777a019..1f95fc0 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java
@@ -259,7 +259,7 @@ public class FixtureScripts extends AbstractService {
// domain services are injected into the fixture script.
serviceInjector.injectServicesInto(fixtureScript);
- return fixtureScript.run(parameters);
+ return fixtureScript.run(parameters, this);
} finally {
eventBusService.post(new FixturesInstalledEvent(this));
}
@@ -295,7 +295,7 @@ public class FixtureScripts extends AbstractService {
protected List<FixtureResult> runScript(final FixtureScript fixtureScript, final String parameters) {
serviceInjector.injectServicesInto(fixtureScript);
- return fixtureScript.run(parameters);
+ return fixtureScript.run(parameters, this);
}
@@ -387,7 +387,7 @@ public class FixtureScripts extends AbstractService {
serviceInjector.injectServicesInto(builderScript);
- builderScript.run(null);
+ builderScript.run(null, this);
final T object = builderScript.getObject();
return object;
}
[isis] 08/15: ISIS-2284: ExceptionMapperForObjectNotFound uses
overload to explicitly
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 0e715646682e0220ec04c755f22106124ad6d417
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Feb 10 22:44:45 2020 +0000
ISIS-2284: ExceptionMapperForObjectNotFound uses overload to explicitly
specify the status code to use
---
.../restfulobjects/viewer/mappers/ExceptionMapperForObjectNotFound.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForObjectNotFound.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForObjectNotFound.java
index 07c49f8..69b503f 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForObjectNotFound.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForObjectNotFound.java
@@ -31,7 +31,7 @@ public class ExceptionMapperForObjectNotFound extends ExceptionMapperAbstract<Ob
@Override
public Response toResponse(final ObjectNotFoundException ex) {
- return buildResponse(ex);
+ return buildResponse(ex, RestfulResponse.HttpStatusCode.NOT_FOUND);
}
}
[isis] 10/15: ISIS-2284: deprecates classes that seem to be unused.
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 d0683ffc8cb856f1cd42f7ddb040a6d92f0bb1ca
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Feb 10 22:45:39 2020 +0000
ISIS-2284: deprecates classes that seem to be unused.
---
.../metamodel/exceptions/persistence/ObjectNotFoundException.java | 7 ++++++-
.../exceptions/persistence/ObjectPersistenceException.java | 5 +++++
.../metamodel/exceptions/persistence/PojoRecreationException.java | 5 +++++
.../metamodel/exceptions/persistence/PojoRefreshException.java | 5 +++++
4 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/ObjectNotFoundException.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/ObjectNotFoundException.java
index f41384f..930dd9f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/ObjectNotFoundException.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/ObjectNotFoundException.java
@@ -22,9 +22,14 @@ package org.apache.isis.core.metamodel.exceptions.persistence;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
/**
- * Indicates that the <tt>PojoRecreator</tt> was unable to instantiate a new pojo for the specified
+ * (Used to?) indicates that the <tt>PojoRecreator</tt> was unable to instantiate a new pojo for the specified
* {@link Oid}.
+
+ * TODO: v2 - review - doesn't seem to be used?
+ * There is also {@link org.apache.isis.core.metamodel.adapter.oid.ObjectNotFoundException} which may be this class' replacement.
+ * @deprecated
*/
+@Deprecated
public class ObjectNotFoundException extends ObjectPersistenceException {
private static final long serialVersionUID = 1L;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/ObjectPersistenceException.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/ObjectPersistenceException.java
index f1a9dd2..1d6e7d6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/ObjectPersistenceException.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/ObjectPersistenceException.java
@@ -21,6 +21,11 @@ package org.apache.isis.core.metamodel.exceptions.persistence;
import org.apache.isis.core.commons.exceptions.IsisException;
+/**
+ * TODO: v2 - review - doesn't seem to be used?
+ * @deprecated
+ */
+@Deprecated
public class ObjectPersistenceException extends IsisException {
private static final long serialVersionUID = 1L;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/PojoRecreationException.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/PojoRecreationException.java
index fe11f34..26ea637 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/PojoRecreationException.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/PojoRecreationException.java
@@ -21,6 +21,11 @@ package org.apache.isis.core.metamodel.exceptions.persistence;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
+/**
+ * TODO: v2 - review - doesn't seem to be used?
+ * @deprecated
+ */
+@Deprecated
public class PojoRecreationException extends ObjectPersistenceException {
private static final long serialVersionUID = 1L;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/PojoRefreshException.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/PojoRefreshException.java
index bbac79b..4839e9e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/PojoRefreshException.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/PojoRefreshException.java
@@ -21,6 +21,11 @@ package org.apache.isis.core.metamodel.exceptions.persistence;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
+/**
+ * TODO: v2 - review - doesn't seem to be used?
+ * @deprecated
+ */
+@Deprecated
public class PojoRefreshException extends ObjectNotFoundException {
private static final long serialVersionUID = 1L;
[isis] 06/15: ISIS-2284: fixes the ExceptionMapperForObjectNotFound
- was using wrong ObjectNotFoundException
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 bf1ea0a71534e9db652b4bc4eebc747975294d4b
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Feb 10 22:43:05 2020 +0000
ISIS-2284: fixes the ExceptionMapperForObjectNotFound - was using wrong ObjectNotFoundException
---
.../restfulobjects/viewer/mappers/ExceptionMapperForObjectNotFound.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForObjectNotFound.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForObjectNotFound.java
index 4b20951..07c49f8 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForObjectNotFound.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForObjectNotFound.java
@@ -23,7 +23,7 @@ import javax.ws.rs.ext.Provider;
import org.springframework.stereotype.Component;
-import org.apache.isis.core.metamodel.exceptions.persistence.ObjectNotFoundException;
+import org.apache.isis.core.metamodel.adapter.oid.ObjectNotFoundException;
@Component
@Provider
[isis] 01/15: ISIS-2062: use redirect-facility
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 7e79dbbc39622b5ee0dd56e73d806aedae9b6123
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Feb 10 09:50:01 2020 +0000
ISIS-2062: use redirect-facility
---
scripts/ci/_adoc-antora.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/ci/_adoc-antora.sh b/scripts/ci/_adoc-antora.sh
index b18e465..9c7b37c 100644
--- a/scripts/ci/_adoc-antora.sh
+++ b/scripts/ci/_adoc-antora.sh
@@ -40,8 +40,8 @@ if [ -z "$ANTORA_CMD" ]; then
fi
echo "running antora ..."
-echo "$ANTORA_CMD --stacktrace $PLAYBOOK"
-$ANTORA_CMD --stacktrace $PLAYBOOK
+echo "$ANTORA_CMD --redirect-facility static --stacktrace $PLAYBOOK"
+$ANTORA_CMD --redirect-facility static --stacktrace $PLAYBOOK
# clean up
-rm $PLAYBOOK
\ No newline at end of file
+rm $PLAYBOOK
[isis] 14/15: ISIS-2158: adds missing @Inject annotation on
constructor ...
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 f795f7b03ee26540e8eb4917587e43e883c71a49
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Feb 11 08:16:28 2020 +0000
ISIS-2158: adds missing @Inject annotation on constructor ...
... to quieten IntelliJ warning
---
.../isis/subdomains/spring/applib/service/SpringBeansService.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/SpringBeansService.java b/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/SpringBeansService.java
index 7f091a7..d3d6209 100644
--- a/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/SpringBeansService.java
+++ b/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/SpringBeansService.java
@@ -21,6 +21,7 @@ package org.apache.isis.subdomains.spring.applib.service;
import java.util.HashMap;
import java.util.Map;
+import javax.inject.Inject;
import javax.inject.Named;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -44,6 +45,7 @@ public class SpringBeansService {
private final ConfigurableApplicationContext context;
+ @Inject
public SpringBeansService(final ConfigurableApplicationContext context) {
this.context = context;
}