[isis] 18/34: rebase 2.0.0-M2 on top of 2.0.0-M1 (master)
This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch dev/2.0.0-M2 in repository https://gitbox.apache.org/repos/asf/isis.git commit 3e17e56a14d4002c2b2200feeddfbec589faf322 Author: Andi Huber AuthorDate: Mon Feb 19 13:33:41 2018 +0100 rebase 2.0.0-M2 on top of 2.0.0-M1 (master) --- .../apache/isis/core/runtime/services/ServiceInstantiator.java | 10 +- .../runtime/systemusinginstallers/IsisComponentProvider.java | 5 - .../isis/viewer/wicket/viewer/IsisWicketApplication.java | 2 +- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java index 02e229e..199e3b3 100644 --- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java +++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java @@ -28,11 +28,6 @@ import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.enterprise.context.RequestScoped; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.apache.isis.applib.internal.context._Context; import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.commons.exceptions.IsisException; @@ -42,6 +37,11 @@ import org.apache.isis.core.commons.lang.ArrayExtensions; import org.apache.isis.core.commons.lang.MethodExtensions; import org.apache.isis.core.metamodel.services.ServicesInjector; import org.apache.isis.core.metamodel.specloader.classsubstitutor.JavassistEnhanced; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import javassist.util.proxy.MethodFilter; import javassist.util.proxy.MethodHandler; diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java index b637fe4..7d9322b 100644 --- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java +++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java @@ -19,16 +19,13 @@ package org.apache.isis.core.runtime.systemusinginstallers; -import java.lang.annotation.Annotation; import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import java.util.stream.Stream; import javax.annotation.Nullable; -import javax.jdo.annotations.PersistenceCapable; import com.google.common.base.Function; import com.google.common.base.Joiner; @@ -37,8 +34,6 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import org.reflections.Reflections; - import org.apache.isis.applib.AppManifest; import org.apache.isis.applib.annotation.DomainObject; import org.apache.isis.applib.annotation.DomainService; diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java index 3347ca4..e3376e6 100644 --- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java +++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java @@ -859,7 +859,7 @@ public class IsisWicketApplication } getServletContext().setAttribute(WebAppConstants.ISIS_SESSION_FACTORY, null); super.onDestroy(); -IsisContext.destroy(); +IsisContext.clear(); } catch(final RuntimeException ex) { // symmetry with #init() LOG.error("Failed to destroy", ex); -- To stop receiving notification emails like this one, please contact ahu...@apache.org.
[isis] 18/34: rebase 2.0.0-M2 on top of 2.0.0-M1 (master)
This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch dev/2.0.0-M2 in repository https://gitbox.apache.org/repos/asf/isis.git commit 497976c3fe30815866dadbd15818416775c88e99 Author: Andi Huber AuthorDate: Mon Feb 19 13:33:41 2018 +0100 rebase 2.0.0-M2 on top of 2.0.0-M1 (master) --- .../apache/isis/core/runtime/services/ServiceInstantiator.java | 10 +- .../runtime/systemusinginstallers/IsisComponentProvider.java | 5 - .../isis/viewer/wicket/viewer/IsisWicketApplication.java | 2 +- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java index 02e229e..199e3b3 100644 --- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java +++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java @@ -28,11 +28,6 @@ import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.enterprise.context.RequestScoped; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.apache.isis.applib.internal.context._Context; import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.commons.exceptions.IsisException; @@ -42,6 +37,11 @@ import org.apache.isis.core.commons.lang.ArrayExtensions; import org.apache.isis.core.commons.lang.MethodExtensions; import org.apache.isis.core.metamodel.services.ServicesInjector; import org.apache.isis.core.metamodel.specloader.classsubstitutor.JavassistEnhanced; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import javassist.util.proxy.MethodFilter; import javassist.util.proxy.MethodHandler; diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java index b637fe4..7d9322b 100644 --- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java +++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java @@ -19,16 +19,13 @@ package org.apache.isis.core.runtime.systemusinginstallers; -import java.lang.annotation.Annotation; import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import java.util.stream.Stream; import javax.annotation.Nullable; -import javax.jdo.annotations.PersistenceCapable; import com.google.common.base.Function; import com.google.common.base.Joiner; @@ -37,8 +34,6 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import org.reflections.Reflections; - import org.apache.isis.applib.AppManifest; import org.apache.isis.applib.annotation.DomainObject; import org.apache.isis.applib.annotation.DomainService; diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java index 3347ca4..e3376e6 100644 --- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java +++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java @@ -859,7 +859,7 @@ public class IsisWicketApplication } getServletContext().setAttribute(WebAppConstants.ISIS_SESSION_FACTORY, null); super.onDestroy(); -IsisContext.destroy(); +IsisContext.clear(); } catch(final RuntimeException ex) { // symmetry with #init() LOG.error("Failed to destroy", ex); -- To stop receiving notification emails like this one, please contact ahu...@apache.org.