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/01/29 19:38:43 UTC
[isis] 14/25: ISIS-2273: fixing classpath for shiro and RO viewer
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 94c5347a5f13738bc1afe20c787b0e3afcbccee2
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 29 17:59:38 2020 +0000
ISIS-2273: fixing classpath for shiro and RO viewer
---
security/shiro/pom.xml | 7 -------
...ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java | 4 ----
.../todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java | 1 -
...urceContext_ensureCompatibleAcceptHeader_ContractTest.java | 3 ---
.../viewer/context/ResourceContext_getArg_Test.java | 4 ----
.../scalars/datepicker/TextFieldWithDateTimePicker.java | 11 -----------
6 files changed, 30 deletions(-)
diff --git a/security/shiro/pom.xml b/security/shiro/pom.xml
index e17ed06..6ef0ca5 100644
--- a/security/shiro/pom.xml
+++ b/security/shiro/pom.xml
@@ -73,13 +73,6 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-config</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
<scope>test</scope>
</dependency>
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 e065079..e4665fb 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
@@ -35,7 +35,6 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.config.IsisConfiguration;
-import org.apache.isis.core.config.unittestsupport.IsisConfigurationLegacy;
import org.apache.isis.core.security.authentication.AuthenticationRequest;
import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
import org.apache.isis.security.shiro.authentication.AuthenticatorShiro;
@@ -50,9 +49,6 @@ public class ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole {
@Rule
public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
- @Mock
- private IsisConfigurationLegacy mockConfiguration;
-
private AuthenticatorShiro authenticator;
private AuthorizorShiro authorizor;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java
index 670a856..02d9fcf 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java
@@ -2,7 +2,6 @@ package org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.fixturescri
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.isis.testing.fixtures.applib.teardown.TeardownFixtureAbstract;
-import org.apache.isis.testing.fixtures.applib.legacy.teardown.TeardownFixtureAbstract2;
public class ExcelDemoToDoItem_tearDown extends TeardownFixtureAbstract {
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
index 3520507..bdccbb0 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
@@ -61,11 +61,8 @@ public abstract class ResourceContext_ensureCompatibleAcceptHeader_ContractTest
@Mock HttpServletRequest mockHttpServletRequest;
@Mock ServletContext mockServletContext;
@Mock IsisSessionFactory mockIsisSessionFactory;
- @Mock ServiceInjector mockServicesInjector;
- @Mock IsisConfigurationLegacy mockConfiguration;
@Mock IsisSession mockIsisSession;
@Mock AuthenticationSession mockAuthenticationSession;
- @Mock PersistenceSession mockPersistenceSession;
@Mock SpecificationLoader mockSpecificationLoader;
@Mock WebApplicationContext webApplicationContext;
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
index 90e05ef..2b213b4 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
@@ -56,12 +56,8 @@ public class ResourceContext_getArg_Test {
@Rule public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
- @Mock HttpHeaders mockHttpHeaders;
@Mock HttpServletRequest mockHttpServletRequest;
@Mock ServletContext mockServletContext;
- @Mock IsisSessionFactory mockIsisSessionFactory;
- @Mock ServiceInjector mockServicesInjector;
- @Mock IsisConfigurationLegacy mockConfiguration;
@Mock IsisSession mockIsisSession;
@Mock AuthenticationSession mockAuthenticationSession;
@Mock PersistenceSession mockPersistenceSession;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
index e0cd072..0582c09 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
@@ -154,16 +154,5 @@ public class TextFieldWithDateTimePicker<T> extends TextField<T> implements ICon
return $(this).chain("datetimepicker", config).get();
}
-// IsisConfigurationLegacy getConfigurationLegacy() {
-// return IsisContext.getConfigurationLegacy();
-// }
-//
-// IsisConfiguration getConfiguration() {
-// return IsisContext.getConfiguration();
-// }
-//
-// IsisSessionFactory getIsisSessionFactory() {
-// return IsisContext.getSessionFactory();
-// }
}