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 2019/12/04 12:12:40 UTC
[isis] 02/09: ISIS-2205: removes IsisWrapperModule - redundant
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 cf635ca14193e804f0a712276989079727f1b46c
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 08:31:07 2019 +0000
ISIS-2205: removes IsisWrapperModule - redundant
---
.../services/wrapper/IsisWrapperModule.java | 23 ----------------------
.../org/apache/isis/runtime/spring/IsisBoot.java | 17 +++++++---------
2 files changed, 7 insertions(+), 33 deletions(-)
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/IsisWrapperModule.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/IsisWrapperModule.java
deleted file mode 100644
index 27484d6..0000000
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/IsisWrapperModule.java
+++ /dev/null
@@ -1,23 +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.runtime.services.wrapper;
-
-public final class IsisWrapperModule {
-
-}
diff --git a/core/runtime-spring/src/main/java/org/apache/isis/runtime/spring/IsisBoot.java b/core/runtime-spring/src/main/java/org/apache/isis/runtime/spring/IsisBoot.java
index 2e40215..631ab6f 100644
--- a/core/runtime-spring/src/main/java/org/apache/isis/runtime/spring/IsisBoot.java
+++ b/core/runtime-spring/src/main/java/org/apache/isis/runtime/spring/IsisBoot.java
@@ -20,6 +20,12 @@ package org.apache.isis.runtime.spring;
import javax.inject.Singleton;
+import org.apache.isis.applib.IsisApplibModule;
+import org.apache.isis.config.IsisConfigModule;
+import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
+import org.apache.isis.metamodel.IsisMetamodelModule;
+import org.apache.isis.runtime.IsisRuntimeModule;
+import org.apache.isis.runtime.services.IsisRuntimeServicesModule;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
@@ -30,14 +36,6 @@ import org.springframework.context.annotation.Import;
import org.springframework.core.OrderComparator;
import org.springframework.core.annotation.AnnotationAwareOrderComparator;
-import org.apache.isis.applib.IsisApplibModule;
-import org.apache.isis.config.IsisConfigModule;
-import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
-import org.apache.isis.metamodel.IsisMetamodelModule;
-import org.apache.isis.runtime.IsisRuntimeModule;
-import org.apache.isis.runtime.services.IsisRuntimeServicesModule;
-import org.apache.isis.runtime.services.wrapper.IsisWrapperModule;
-
@Configuration
@Import({
IsisBeanFactoryPostProcessorForSpring.class,
@@ -48,8 +46,7 @@ import org.apache.isis.runtime.services.wrapper.IsisWrapperModule;
IsisApplibModule.class,
IsisMetamodelModule.class,
IsisRuntimeModule.class,
- IsisRuntimeServicesModule.class,
- IsisWrapperModule.class
+ IsisRuntimeServicesModule.class
})
public class IsisBoot implements ApplicationContextAware {