You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2019/06/28 16:52:07 UTC
[isis] branch v2 updated (35fdb8c -> ed0d996)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 35fdb8c ISIS-2126 fixes provisioning error by disabling the TimestampService
new eec6f6d ISIS-2126 minor renaming in 'config' Presets
new ed0d996 ISIS-2041 LogonFixture removed
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:
.../isis/applib/fixtures/CompositeFixture.java | 37 -------
.../isis/applib/fixtures/InstallableFixture.java | 8 ++
.../apache/isis/applib/fixtures/LogonFixture.java | 110 ---------------------
.../apache/isis/applib/fixtures/package-info.java | 4 -
.../main/java/org/apache/isis/config/Presets.java | 4 +-
.../org/apache/isis/config/WebAppConstants.java | 9 --
.../auth/AuthenticationSessionStrategyDefault.java | 9 +-
.../application/HelloWorldAppManifest.java | 3 +-
8 files changed, 16 insertions(+), 168 deletions(-)
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/fixtures/CompositeFixture.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/fixtures/LogonFixture.java
[isis] 02/02: ISIS-2041 LogonFixture removed
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit ed0d9967c0bcdb569a233216c171ff701f8db4df
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Jun 28 18:51:49 2019 +0200
ISIS-2041 LogonFixture removed
- yet there's no replacement, we'll figure that out later
---
.../isis/applib/fixtures/CompositeFixture.java | 37 -------
.../isis/applib/fixtures/InstallableFixture.java | 8 ++
.../apache/isis/applib/fixtures/LogonFixture.java | 110 ---------------------
.../apache/isis/applib/fixtures/package-info.java | 4 -
.../org/apache/isis/config/WebAppConstants.java | 9 --
.../auth/AuthenticationSessionStrategyDefault.java | 9 +-
6 files changed, 13 insertions(+), 164 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixtures/CompositeFixture.java b/core/applib/src/main/java/org/apache/isis/applib/fixtures/CompositeFixture.java
deleted file mode 100644
index d6f3f97..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/fixtures/CompositeFixture.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.applib.fixtures;
-
-import java.util.List;
-
-import org.apache.isis.applib.fixturescripts.FixtureScript;
-
-/**
- * @deprecated - use {@link FixtureScript} instead.
- */
-@Deprecated
-public interface CompositeFixture {
-
- /**
- * @deprecated - use {@link FixtureScript} instead.
- */
- @Deprecated
- public List<Object> getFixtures();
-}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixtures/InstallableFixture.java b/core/applib/src/main/java/org/apache/isis/applib/fixtures/InstallableFixture.java
index f99fa43..ab208f5 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixtures/InstallableFixture.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixtures/InstallableFixture.java
@@ -19,6 +19,14 @@
package org.apache.isis.applib.fixtures;
+import org.apache.isis.applib.fixturescripts.FixtureScripts;
+
+/**
+ *
+ * @deprecated replace with {@link FixtureScripts}
+ * <a href="https://issues.apache.org/jira/browse/ISIS-1684">ISIS-1684</a>
+ *
+ */
public interface InstallableFixture {
/**
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixtures/LogonFixture.java b/core/applib/src/main/java/org/apache/isis/applib/fixtures/LogonFixture.java
deleted file mode 100644
index b4393cd..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/fixtures/LogonFixture.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * 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.applib.fixtures;
-
-import java.util.List;
-
-import org.apache.isis.applib.fixturescripts.FixtureScript;
-import org.apache.isis.commons.internal.collections._Lists;
-
-/**
- * Indicates that the demo or test should be run as the specified user, with the
- * specified roles.
- *
- * <p>
- * Note: this fixture does not in itself do anything (its {@link #install()} is
- * a no-op). However, if present in the fixture list then is "noticed"
- * by the framework, and is used to automatically logon when the framework is
- * booted (providing running in prototype or exploration, not in production).
- *
- * <p>
- * To change the user during the installation of fixtures, either use
- * {@link SwitchUserFixture}.
- *
- * @see SwitchUserFixture
- * @deprecated - use {@link FixtureScript} instead.
- */
-@Deprecated
-public class LogonFixture implements InstallableFixture {
-
- private final String username;
- private final List<String> roles;
-
- /**
- * @deprecated - use {@link FixtureScript} instead.
- */
- @Deprecated
- public LogonFixture(final String username, final String... roles) {
- this(username, _Lists.of(roles));
- }
-
- /**
- * @deprecated - use {@link FixtureScript} instead.
- */
- @Deprecated
- public LogonFixture(final String username, final List<String> roles) {
- this.username = username;
- this.roles = _Lists.unmodifiable(roles);
- }
-
- /**
- * @deprecated - use {@link FixtureScript} instead.
- */
- @Deprecated
- public String getUsername() {
- return username;
- }
-
- /**
- * @deprecated - use {@link FixtureScript} instead.
- */
- @Deprecated
- public List<String> getRoles() {
- return roles;
- }
-
- /**
- * @deprecated - use {@link FixtureScript} instead.
- */
- @Deprecated
- @Override
- public final void install() {
- // does nothing; see comments above.
- }
-
- /**
- * @deprecated - use {@link FixtureScript} instead.
- */
- @Deprecated
- @Override
- public FixtureType getType() {
- return FixtureType.OTHER;
- }
-
- /**
- * @deprecated - use {@link FixtureScript} instead.
- */
- @Deprecated
- @Override
- public String toString() {
- return "LogonFixture [user: " + getUsername() + ", roles: " + getRoles() + "]";
- }
-
-}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixtures/package-info.java b/core/applib/src/main/java/org/apache/isis/applib/fixtures/package-info.java
index 429ebcc..4813ae4 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixtures/package-info.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixtures/package-info.java
@@ -41,9 +41,5 @@
* <li><p>specifying the {@link org.apache.isis.applib.fixtures.LogonFixture currently logged on} user once the fixtures have been installed</p></li>
* </ul>
*
- * <p>
- * Fixtures are typically combined into a {@link org.apache.isis.applib.fixtures.CompositeFixture composite}
- * pattern; the {@link org.apache.isis.applib.fixtures.AbstractFixture} adapter
- * class provides built-in support for this if required.
*/
package org.apache.isis.applib.fixtures;
\ No newline at end of file
diff --git a/core/config/src/main/java/org/apache/isis/config/WebAppConstants.java b/core/config/src/main/java/org/apache/isis/config/WebAppConstants.java
index 2a9663e..e962fc4 100644
--- a/core/config/src/main/java/org/apache/isis/config/WebAppConstants.java
+++ b/core/config/src/main/java/org/apache/isis/config/WebAppConstants.java
@@ -19,8 +19,6 @@
package org.apache.isis.config;
-import org.apache.isis.applib.fixtures.LogonFixture;
-
public final class WebAppConstants {
/**
@@ -30,13 +28,6 @@ public final class WebAppConstants {
public final static String HTTP_SESSION_AUTHENTICATION_SESSION_KEY = WebAppConstants.class.getPackage().getName() + ".authenticationSession";
/**
- * Key used to determine if a logon has already been performed implicitly
- * using the {@link LogonFixture}, meaning that a Logout should be followed
- * by the Logon page.
- */
- public final static String HTTP_SESSION_LOGGED_ON_PREVIOUSLY_USING_LOGON_FIXTURE_KEY = WebAppConstants.class.getPackage().getName() + ".loggedOnPreviouslyUsingLogonFixture";
-
- /**
* Property name given to the web app directory.
*/
public static final String WEB_APP_DIR = "application.webapp.dir";
diff --git a/core/runtime-web/src/main/java/org/apache/isis/webapp/auth/AuthenticationSessionStrategyDefault.java b/core/runtime-web/src/main/java/org/apache/isis/webapp/auth/AuthenticationSessionStrategyDefault.java
index d7f5631..da9ea23 100644
--- a/core/runtime-web/src/main/java/org/apache/isis/webapp/auth/AuthenticationSessionStrategyDefault.java
+++ b/core/runtime-web/src/main/java/org/apache/isis/webapp/auth/AuthenticationSessionStrategyDefault.java
@@ -37,13 +37,14 @@ import org.apache.isis.security.authentication.manager.AuthenticationManager;
* <ul>
* <li>it looks up from the {@link HttpSession} using the value
* {@link WebAppConstants#HTTP_SESSION_AUTHENTICATION_SESSION_KEY}</li>
- * <li>failing that, if a {@link LogonFixture} has been provided and not already
- * used, will provide an session for that fixture. The {@link HttpSession} also
+ * </ul>
+ *
+ * @implNote prior to version 2.0 ... failing that, if a {@link LogonFixture} has been provided and not already
+ * used, will provide a session for that fixture. The {@link HttpSession} also
* stores the value
* {@link WebAppConstants#HTTP_SESSION_LOGGED_ON_PREVIOUSLY_USING_LOGON_FIXTURE_KEY}
* in the session to track whether this has been done</li>
- * </ul>
- * <p>
+ *
*/
public class AuthenticationSessionStrategyDefault extends AuthenticationSessionStrategyAbstract {
[isis] 01/02: ISIS-2126 minor renaming in 'config' Presets
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit eec6f6dc868dec6a3259e0abf6e921c0624fb7cd
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Jun 28 18:42:10 2019 +0200
ISIS-2126 minor renaming in 'config' Presets
---
core/config/src/main/java/org/apache/isis/config/Presets.java | 4 ++--
.../src/main/java/domainapp/application/HelloWorldAppManifest.java | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/core/config/src/main/java/org/apache/isis/config/Presets.java b/core/config/src/main/java/org/apache/isis/config/Presets.java
index 2a545a1..bdfb2f1 100644
--- a/core/config/src/main/java/org/apache/isis/config/Presets.java
+++ b/core/config/src/main/java/org/apache/isis/config/Presets.java
@@ -48,7 +48,7 @@ public final class Presets {
H2InMemory(Providers::withH2InMemoryProperties),
HsqlDbInMemory(Providers::withHsqlDbInMemoryProperties),
- DataNucleus(Providers::withDataNucleusProperties),
+ DataNucleusAutoCreate(Providers::withDataNucleusProperties),
IsisIntegTest(Providers::withIsisIntegTestProperties),
NoTranslations(map->map.put("isis.services.translation.po.mode", "disable")),
;
@@ -104,7 +104,7 @@ public final class Presets {
public static final String H2InMemory = "H2InMemory";
public static final String HsqlDbInMemory = "HsqlDbInMemory";
- public static final String DataNucleus = "DataNucleus";
+ public static final String DataNucleusAutoCreate = "DataNucleusAutoCreate";
public static final String IsisIntegTest = "IsisIntegTest";
public static final String NoTranslations = "NoTranslations";
diff --git a/example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java b/example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java
index e7bf192..32109b0 100644
--- a/example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java
+++ b/example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java
@@ -24,7 +24,6 @@ import org.apache.isis.config.Presets;
import org.apache.isis.config.beans.IsisBeanScanInterceptorForSpring;
import org.apache.isis.config.beans.WebAppConfigBean;
import org.apache.isis.jdo.IsisBootDataNucleus;
-import org.apache.isis.jdo.transaction.IsisPlatformTransactionManagerForJdo;
import org.apache.isis.security.shiro.IsisBootSecurityShiro;
import org.apache.isis.viewer.restfulobjects.IsisBootWebRestfulObjects;
import org.apache.isis.viewer.wicket.viewer.IsisBootWebWicket;
@@ -48,7 +47,7 @@ import domainapp.dom.HelloWorldModule;
@PropertySource("classpath:/domainapp/application/isis-non-changing.properties"),
@PropertySource(name=Presets.H2InMemory, factory = Presets.Factory.class, value = { "" }),
@PropertySource(name=Presets.NoTranslations, factory = Presets.Factory.class, value = { "" }),
- @PropertySource(name=Presets.DataNucleus, factory = Presets.Factory.class, value = { "" }),
+ @PropertySource(name=Presets.DataNucleusAutoCreate, factory = Presets.Factory.class, value = { "" }),
})
@Import({
IsisBootWebRestfulObjects.class,