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/05/17 09:14:53 UTC

[isis] branch 2112_SpringBoot updated: ISIS-2112: migrate 'isis-maven-plugin' to launch a Spring Context

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch 2112_SpringBoot
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/2112_SpringBoot by this push:
     new 0ece2c5  ISIS-2112: migrate 'isis-maven-plugin' to launch a Spring Context
0ece2c5 is described below

commit 0ece2c5efc172ba34993e4fecadf86be92c42f9d
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri May 17 11:14:48 2019 +0200

    ISIS-2112: migrate 'isis-maven-plugin' to launch a Spring Context
    
    - just a stub yet, but a FIXME[2112] marker is in place
    - also making auth/bypass a convenient config bean -> IsisSecurityBoot
    - 'simpleapp' successfully builds now
    
    
    Task-Url: https://issues.apache.org/jira/browse/ISIS-2112
---
 .../isis/testdomain/jdo/JdoTestDomainModule.java   | 47 ++---------------
 core/maven-plugin/pom.xml                          | 37 +++++++++++--
 .../isis/tool/mavenplugin/IsisMojoAbstract.java    | 60 +++++++---------------
 .../isis/tool/mavenplugin/IsisMojoSwagger.java     |  3 +-
 .../isis/tool/mavenplugin/IsisMojoValidate.java    | 10 ++--
 .../apache/isis/tool/mavenplugin/IsisMojoXsd.java  |  3 +-
 .../IsisMavenPlugin_SpringContextConfig.java       | 52 +++++++++++++++++++
 .../IsisMavenPlugin_SpringContextLauncher.java}    | 28 +++++-----
 .../isis/tool/mavenplugin/util/Xpp3Doms.java       |  7 +--
 .../isis/core/security/IsisSecurityBoot.java       | 45 ++++------------
 .../manager}/AuthorizationManagerStandard.java     | 17 +++---
 ...sisWicketModule.java => IsisWebWicketBoot.java} |  4 +-
 .../application/HelloWorldAppManifest.java         |  7 +--
 13 files changed, 151 insertions(+), 169 deletions(-)

diff --git a/core/detached-tests/src/test/java/org/apache/isis/testdomain/jdo/JdoTestDomainModule.java b/core/detached-tests/src/test/java/org/apache/isis/testdomain/jdo/JdoTestDomainModule.java
index f3cf1d3..52c71ad 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/testdomain/jdo/JdoTestDomainModule.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/testdomain/jdo/JdoTestDomainModule.java
@@ -21,62 +21,23 @@ import javax.inject.Singleton;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.PropertySource;
 
-import org.apache.isis.applib.services.fixturespec.FixtureScriptsSpecificationProvider;
 import org.apache.isis.config.beans.WebAppConfigBean;
-import org.apache.isis.core.runtime.authorization.standard.AuthorizationManagerStandard;
-import org.apache.isis.core.security.authentication.bypass.AuthenticatorBypass;
-import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
-import org.apache.isis.core.security.authentication.standard.AuthenticationManagerStandard;
-import org.apache.isis.core.security.authorization.bypass.AuthorizorBypass;
-import org.apache.isis.core.security.authorization.manager.AuthorizationManager;
-import org.apache.isis.core.security.authorization.standard.Authorizor;
+import org.apache.isis.core.security.IsisSecurityBoot;
 
 @Configuration
-//@PropertySource("classpath:/org/apache/isis/testdomain/jdo/isis-non-changing.properties")
+//@PropertySource("classpath:/org/apache/isis/testdomain/jdo/isis-non-changing.properties") XXX bug on jdk-11
 @PropertySource("file:src/test/java/org/apache/isis/testdomain/jdo/isis-non-changing.properties")
+@Import({IsisSecurityBoot.class})
 public class JdoTestDomainModule {
     
-    /**
-    * The standard authentication manager, configured with the 'bypass' authenticator 
-    * (allows all requests through).
-    * <p>
-    * integration tests ignore appManifest for authentication and authorization.
-    */
-   @Bean @Produces @Singleton
-   public AuthenticationManager authenticationManagerWithBypass() {
-       final AuthenticationManagerStandard authenticationManager = new AuthenticationManagerStandard();
-       authenticationManager.addAuthenticator(new AuthenticatorBypass());
-       return authenticationManager;
-   }
-   
-   @Bean @Produces @Singleton
-   public AuthorizationManager authorizationManagerWithBypass() {
-       final AuthorizationManagerStandard authorizationManager = new AuthorizationManagerStandard() {
-           {
-               authorizor = new AuthorizorBypass();
-           }  
-       };
-       return authorizationManager;
-   }
-   
-   @Bean @Produces @Singleton
-   public Authorizor autorizor() {
-       return new AuthorizorBypass();
-   }
-
    @Bean @Produces @Singleton
    public WebAppConfigBean webAppConfigBean() {
        return WebAppConfigBean.builder()
                //.menubarsLayoutXml(new ClassPathResource(path, clazz))
                .build();
    }
-   
-   
-   //@Bean @Produces @Singleton // as used in simple-app
-   public FixtureScriptsSpecificationProvider fixtureScriptsSpecificationProvider() {
-       return null;
-   }
     
 }
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index 48211e5..d75d70d 100644
--- a/core/maven-plugin/pom.xml
+++ b/core/maven-plugin/pom.xml
@@ -82,8 +82,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
-                <!-- override to allow build on jdk9+ -->
-                <version>3.5.2</version>
                 <configuration>
                     <goalPrefix>configurator</goalPrefix>
                 </configuration>
@@ -111,7 +109,12 @@
 
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-runtime</artifactId>
+            <artifactId>isis-core-runtime-services</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.isis.core</groupId>
+            <artifactId>isis-core-runtime-extensions</artifactId>
         </dependency>
 
         <!-- 
@@ -307,6 +310,34 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        
+        <!-- SPRING -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-parent</artifactId>
+			<version>${spring-boot.version}</version>
+			<type>pom</type>
+			<scope>import</scope>
+			
+			<exclusions>
+				<exclusion>
+					<groupId>org.ow2.asm</groupId>
+					<artifactId>asm</artifactId>
+				</exclusion>
+				<exclusion>
+					<!-- when spring-boot release lags behind spring-core release 
+						explicitly spring-test added below-->
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-test</artifactId>
+				</exclusion>
+				<exclusion>
+					<!-- when spring-boot release lags behind spring-core release 
+						explicitly spring-test added below-->
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-core</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 
     </dependencies>
 
diff --git a/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoAbstract.java b/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoAbstract.java
index 6bca080..3d9d116 100644
--- a/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoAbstract.java
+++ b/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoAbstract.java
@@ -19,6 +19,7 @@
 package org.apache.isis.tool.mavenplugin;
 
 import java.io.IOException;
+import java.util.Objects;
 import java.util.Set;
 
 import org.apache.log4j.Level;
@@ -30,16 +31,14 @@ import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
+import org.springframework.context.ConfigurableApplicationContext;
 
-import org.apache.isis.config.internal._Config;
+import org.apache.isis.commons.internal.base._Blackhole;
 import org.apache.isis.core.plugins.environment.IsisSystemEnvironment;
 import org.apache.isis.core.runtime.logging.IsisLoggingConfigurer;
-import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.tool.mavenplugin.spring.IsisMavenPlugin_SpringContextLauncher;
 import org.apache.isis.tool.mavenplugin.util.MavenProjects;
 
-import lombok.val;
-
 public abstract class IsisMojoAbstract extends AbstractMojo {
 
     protected static final String CURRENT_PLUGIN_KEY = "org.apache.isis.tool:isis-maven-plugin";
@@ -59,55 +58,34 @@ public abstract class IsisMojoAbstract extends AbstractMojo {
         new IsisLoggingConfigurer(Level.INFO).configureLogging(".", new String[]{});
         IsisSystemEnvironment.setUnitTesting(true);
         
-        final ContextForMojo context = new ContextForMojo(mavenProject, getLog());
+        final ContextForMojo mjContext = new ContextForMojo(mavenProject, getLog());
 
         final Plugin plugin = MavenProjects.lookupPlugin(mavenProject, CURRENT_PLUGIN_KEY);
+        _Blackhole.consume(plugin);
 
-        // build and finalize config
-        _Config.getConfiguration();
+        final ConfigurableApplicationContext springContext = 
+                IsisMavenPlugin_SpringContextLauncher.getContext();
+        
+        Objects.requireNonNull(springContext, "Failed to bring up Spring's context.");
         
-        val isisSessionFactory = IsisContext.getSessionFactory();
         try {
-            		
-            isisSessionFactory.initServicesAndRunFixtures();
             
-            val metaModelDeficiencies = IsisContext.getMetaModelDeficienciesIfAny();
-            if(metaModelDeficiencies!=null) {
-                Set<String> validationErrors = metaModelDeficiencies.getValidationErrors();
-                context.throwFailureException(validationErrors.size() + " meta-model problems found.", validationErrors);
-                return;
-            }
-            final IsisSessionFactory isisSessionFactoryFinal = isisSessionFactory;
-            isisSessionFactory.doInSession(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        doExecute(context, isisSessionFactoryFinal);
-                    } catch (IOException e) {
-                        ;
-                        // ignore
-                    } catch (MojoFailureException e) {
-                        throw new RuntimeException(e);
-                    }
-                }
-            });
-
-        } catch(RuntimeException e) {
-            if(e.getCause() instanceof MojoFailureException) {
-                throw (MojoFailureException)e.getCause();
-            }
-            throw e;
+            doExecute(mjContext);
+            
+        } catch (IOException e) {
+            // ignore
         } finally {
-            if(isisSessionFactory != null) {
-                isisSessionFactory.destroyServicesAndShutdown();
+            
+            if(springContext!=null) {
+                springContext.close();
             }
+            
         }
 
     }
 
     protected abstract void doExecute(
-            final ContextForMojo context,
-            final IsisSessionFactory isisSessionFactory)
+            final ContextForMojo mojoContext)
                     throws MojoFailureException, IOException;
 
     // -- Context
diff --git a/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoSwagger.java b/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoSwagger.java
index cb6ded9..3e44d4c 100644
--- a/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoSwagger.java
+++ b/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoSwagger.java
@@ -35,7 +35,6 @@ import org.apache.maven.project.MavenProject;
 
 import org.apache.isis.applib.services.swagger.SwaggerService;
 import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
 
 @Mojo(
         name = "swagger",
@@ -76,7 +75,7 @@ public class IsisMojoSwagger extends IsisMojoAbstract {
 
     @Override
     protected void doExecute(
-            final ContextForMojo context, final IsisSessionFactory isisSessionFactory)
+            final ContextForMojo context)
                     throws MojoFailureException, IOException {
 
         final SwaggerService swaggerService = 
diff --git a/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoValidate.java b/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoValidate.java
index be98037..729ff2f 100644
--- a/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoValidate.java
+++ b/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoValidate.java
@@ -28,7 +28,7 @@ import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.core.metamodel.specloader.validator.ValidationFailures;
-import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.system.context.IsisContext;
 
 @Mojo(
         name = "validate",
@@ -47,12 +47,10 @@ public class IsisMojoValidate extends IsisMojoAbstract {
 
     @Override
     protected void doExecute(
-            final ContextForMojo context,
-            final IsisSessionFactory isisSessionFactory)
+            final ContextForMojo context)
                     throws MojoFailureException {
-        final SpecificationLoader specificationLoader =
-                isisSessionFactory.getSpecificationLoader();
-        metaModelProcessor.process(context, specificationLoader);
+        
+        metaModelProcessor.process(context, IsisContext.getSpecificationLoader());
     }
 
     static class ValidateMetaModelProcessor implements MetaModelProcessor {
diff --git a/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoXsd.java b/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoXsd.java
index 90af52c..a42f9b3 100644
--- a/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoXsd.java
+++ b/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoXsd.java
@@ -37,7 +37,6 @@ import org.apache.isis.applib.services.jaxb.JaxbService;
 import org.apache.isis.commons.internal.base._Strings;
 import org.apache.isis.core.commons.factory.InstanceUtil;
 import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
 
 @Mojo(
         name = "xsd",
@@ -79,7 +78,7 @@ public class IsisMojoXsd extends IsisMojoAbstract {
 
     @Override
     protected void doExecute(
-            final ContextForMojo context, final IsisSessionFactory isisSessionFactory)
+            final ContextForMojo context)
                     throws MojoFailureException, IOException {
 
         final JaxbService jaxbService = 
diff --git a/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java b/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java
new file mode 100644
index 0000000..e14b029
--- /dev/null
+++ b/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java
@@ -0,0 +1,52 @@
+/*
+ *  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.tool.mavenplugin.spring;
+
+import javax.inject.Singleton;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+import org.apache.isis.config.beans.WebAppConfigBean;
+import org.apache.isis.core.security.IsisSecurityBoot;
+import org.apache.isis.runtime.spring.IsisBoot;
+
+/**
+ * FIXME[2112] needs to scan the entire class-path, not just "org.apache.isis"  
+ * @since 2.0.0
+ *
+ */
+@Configuration
+@Import({
+    IsisBoot.class, 
+    IsisSecurityBoot.class})
+@ComponentScan(basePackages = "org.apache.isis")
+public class IsisMavenPlugin_SpringContextConfig {
+
+    @Bean @Singleton
+    public WebAppConfigBean webAppConfigBean() {
+        // just empty        
+        return WebAppConfigBean.builder()
+                //.menubarsLayoutXml(new ClassPathResource("menubars.layout.xml", this.getClass()))
+                .build();
+    }
+    
+}
diff --git a/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/util/Xpp3Doms.java b/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java
similarity index 64%
copy from core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/util/Xpp3Doms.java
copy to core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java
index b1785fd..49a1201 100644
--- a/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/util/Xpp3Doms.java
+++ b/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java
@@ -16,22 +16,20 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.tool.mavenplugin.util;
+package org.apache.isis.tool.mavenplugin.spring;
 
-import java.util.function.Function;
-
-import org.codehaus.plexus.util.xml.Xpp3Dom;
-
-public final class Xpp3Doms {
-
-    private Xpp3Doms(){}
-
-    public static Function<Xpp3Dom, String> GET_VALUE = new Function<Xpp3Dom, String>(){
-
-        @Override
-        public String apply(Xpp3Dom el) {
-            return el.getValue();
-        }};
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
+/**
+ * 
+ * @since 2.0.0
+ *
+ */
+public class IsisMavenPlugin_SpringContextLauncher {
 
+    public static ConfigurableApplicationContext getContext() {
+        return new AnnotationConfigApplicationContext(IsisMavenPlugin_SpringContextConfig.class);
+    }
+    
 }
diff --git a/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/util/Xpp3Doms.java b/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/util/Xpp3Doms.java
index b1785fd..0acb93b 100644
--- a/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/util/Xpp3Doms.java
+++ b/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/util/Xpp3Doms.java
@@ -26,12 +26,7 @@ public final class Xpp3Doms {
 
     private Xpp3Doms(){}
 
-    public static Function<Xpp3Dom, String> GET_VALUE = new Function<Xpp3Dom, String>(){
-
-        @Override
-        public String apply(Xpp3Dom el) {
-            return el.getValue();
-        }};
+    public static Function<Xpp3Dom, String> GET_VALUE = Xpp3Dom::getValue;
 
 
 }
diff --git a/example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java b/core/security/src/main/java/org/apache/isis/core/security/IsisSecurityBoot.java
similarity index 63%
copy from example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java
copy to core/security/src/main/java/org/apache/isis/core/security/IsisSecurityBoot.java
index f52b455..8de9b52 100644
--- a/example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/IsisSecurityBoot.java
@@ -16,56 +16,37 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package domainapp.application;
+package org.apache.isis.core.security;
 
+import javax.enterprise.inject.Produces;
 import javax.inject.Singleton;
 
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.context.annotation.PropertySources;
-import org.springframework.core.io.ClassPathResource;
 
-import org.apache.isis.config.Presets;
-import org.apache.isis.config.beans.WebAppConfigBean;
-import org.apache.isis.core.runtime.authorization.standard.AuthorizationManagerStandard;
 import org.apache.isis.core.security.authentication.bypass.AuthenticatorBypass;
 import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
+import org.apache.isis.core.security.authentication.manager.AuthorizationManagerStandard;
 import org.apache.isis.core.security.authentication.standard.AuthenticationManagerStandard;
 import org.apache.isis.core.security.authorization.bypass.AuthorizorBypass;
 import org.apache.isis.core.security.authorization.manager.AuthorizationManager;
 import org.apache.isis.core.security.authorization.standard.Authorizor;
-import org.apache.isis.viewer.wicket.viewer.IsisWicketModule;
 
-/**
- * Makes the integral parts of the 'hello world' web application.
- */
-@Configuration
-@PropertySources({
-    @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 = { "" }),
-})
-@Import({
-    IsisWicketModule.class
-})
-public class HelloWorldAppManifest {
-    
+public class IsisSecurityBoot {
+
     /**
     * The standard authentication manager, configured with the 'bypass' authenticator 
     * (allows all requests through).
     * <p>
     * integration tests ignore appManifest for authentication and authorization.
     */
-   @Bean @Singleton
+   @Bean @Produces @Singleton
    public AuthenticationManager authenticationManagerWithBypass() {
        final AuthenticationManagerStandard authenticationManager = new AuthenticationManagerStandard();
        authenticationManager.addAuthenticator(new AuthenticatorBypass());
        return authenticationManager;
    }
    
-   @Bean @Singleton
+   @Bean @Produces @Singleton
    public AuthorizationManager authorizationManagerWithBypass() {
        final AuthorizationManagerStandard authorizationManager = new AuthorizationManagerStandard() {
            {
@@ -75,17 +56,9 @@ public class HelloWorldAppManifest {
        return authorizationManager;
    }
    
-   @Bean @Singleton
+   @Bean @Produces @Singleton
    public Authorizor autorizor() {
        return new AuthorizorBypass();
    }
-   
-   
-   @Bean @Singleton
-   public WebAppConfigBean webAppConfigBean() {
-       return WebAppConfigBean.builder()
-               .menubarsLayoutXml(new ClassPathResource("menubars.layout.xml", this.getClass()))
-               .build();
-   }
-
+    
 }
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandard.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthorizationManagerStandard.java
similarity index 87%
rename from core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandard.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthorizationManagerStandard.java
index 4ef075a00..4538437 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandard.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthorizationManagerStandard.java
@@ -17,19 +17,15 @@
  *  under the License.
  */
 
-package org.apache.isis.core.runtime.authorization.standard;
+package org.apache.isis.core.security.authentication.manager;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
-import javax.enterprise.event.Observes;
 import javax.enterprise.inject.Vetoed;
 import javax.inject.Inject;
 
-import org.springframework.context.event.EventListener;
-
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.services.sudo.SudoService;
-import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
 import org.apache.isis.core.security.authentication.AuthenticationSession;
 import org.apache.isis.core.security.authorization.manager.AuthorizationManager;
 import org.apache.isis.core.security.authorization.standard.Authorizor;
@@ -110,11 +106,12 @@ public class AuthorizationManagerStandard implements AuthorizationManager {
         return (identifier.getClassName().equals(""));
     }
 
-    @EventListener(ProgrammingModel.class)
-    public static void refineProgrammingModel(@Observes ProgrammingModel baseProgrammingModel) {
-        final AuthorizationFacetFactory facetFactory = new AuthorizationFacetFactory();
-        baseProgrammingModel.addFactory(facetFactory);
-    }
+//[2112]    
+//    @EventListener(ProgrammingModel.class)
+//    public static void refineProgrammingModel(@Observes ProgrammingModel baseProgrammingModel) {
+//        final AuthorizationFacetFactory facetFactory = new AuthorizationFacetFactory();
+//        baseProgrammingModel.addFactory(facetFactory);
+//    }
 
     @Inject protected Authorizor authorizor;
 
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketModule.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWebWicketBoot.java
similarity index 98%
rename from core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketModule.java
rename to core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWebWicketBoot.java
index f05e11e..63a1278 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketModule.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWebWicketBoot.java
@@ -33,12 +33,12 @@ import org.apache.isis.config.beans.BeanScanInterceptorForSpring;
 @Configuration
 @ComponentScan(
         basePackageClasses= {
-                IsisWicketModule.class,
+                IsisWebWicketBoot.class,
            },
         includeFilters= {
                 @Filter(type = FilterType.CUSTOM, classes= {BeanScanInterceptorForSpring.class})
         })
-public class IsisWicketModule {
+public class IsisWebWicketBoot {
 
    
     
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 f52b455..ad8efce 100644
--- a/example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java
+++ b/example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java
@@ -29,14 +29,14 @@ import org.springframework.core.io.ClassPathResource;
 
 import org.apache.isis.config.Presets;
 import org.apache.isis.config.beans.WebAppConfigBean;
-import org.apache.isis.core.runtime.authorization.standard.AuthorizationManagerStandard;
 import org.apache.isis.core.security.authentication.bypass.AuthenticatorBypass;
 import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
+import org.apache.isis.core.security.authentication.manager.AuthorizationManagerStandard;
 import org.apache.isis.core.security.authentication.standard.AuthenticationManagerStandard;
 import org.apache.isis.core.security.authorization.bypass.AuthorizorBypass;
 import org.apache.isis.core.security.authorization.manager.AuthorizationManager;
 import org.apache.isis.core.security.authorization.standard.Authorizor;
-import org.apache.isis.viewer.wicket.viewer.IsisWicketModule;
+import org.apache.isis.viewer.wicket.viewer.IsisWebWicketBoot;
 
 /**
  * Makes the integral parts of the 'hello world' web application.
@@ -48,7 +48,8 @@ import org.apache.isis.viewer.wicket.viewer.IsisWicketModule;
     @PropertySource(name=Presets.NoTranslations, factory = Presets.Factory.class, value = { "" }),
 })
 @Import({
-    IsisWicketModule.class
+    IsisWebWicketBoot.class,
+    //XXX IsisSecurityBoot_Shiro.class
 })
 public class HelloWorldAppManifest {