2486

core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java

@@ -83,9 +83,9 @@
 
 /**
  * Configuration 'beans' with meta-data (IDE-support).
- * 
+ *
  * @see <a href="https://docs.spring.io/spring-boot/docs/current/reference/html/configuration-metadata.html">spring.io</a>
- * 
+ *
  * @since 2.0
  */
 @ConfigurationProperties(IsisConfiguration.ROOT_PREFIX)
@@ -127,7 +127,7 @@ public static class Shiro {
              * </p>
              */
             private boolean autoLogoutIfAlreadyAuthenticated = false;
-            
+
         }
     }
 
@@ -159,11 +159,11 @@ public static class DomainObject {
                 /**
                  * TODO[2464] semantic renaming audit/dispatch -> publishing
                  * The default for whether <i>domain entities</i> should be audited or not (meaning that any changes are
-                 * sent through to {@link EntityChangesSubscriber}s and 
+                 * sent through to {@link EntityChangesSubscriber}s and
                  * sent through to {@link EntityPropertyChangeSubscriber}.
                  *
                  * <p>
-                 * This setting can be overridden on a case-by-case basis using {@link org.apache.isis.applib.annotation.DomainObject#auditing()} DomainObject#getAuditing()}
+                 * This setting can be overridden on a case-by-case basis using {@link org.apache.isis.applib.annotation.DomainObject#entityChangePublishing()}
                  * </p>
                  *
                  * <p>
@@ -648,7 +648,7 @@ public static class Action {
                  * </p>
                  */
                 private ActionPublishingPolicy commandPublishing = ActionPublishingPolicy.NONE;
-                
+
                 /**
                  * TODO[2464] semantic renaming audit/dispatch -> publishing
                  * The default for whether action invocations should be sent through to the
@@ -716,7 +716,7 @@ public static class DomainEvent {
                 }
 
 
-                
+
 
             }
 
@@ -1229,12 +1229,12 @@ public static class ProgrammingModel {
             @Data
             public static class Introspector {
                 /**
-                 * Whether to perform introspection in parallel. Meant to speed up bootstrapping.  
+                 * Whether to perform introspection in parallel. Meant to speed up bootstrapping.
                  * <p>
                  *     For now this is <i>experimental</i>. Leave this disabled (the default).
                  * </p>
                  */
-                private boolean parallelize = false; //TODO[ISIS-2382] concurrent spec-loading is broken 
+                private boolean parallelize = false; //TODO[ISIS-2382] concurrent spec-loading is broken
 
                 /**
                  * Whether all known types should be fully introspected as part of the bootstrapping, or should only be
@@ -1640,8 +1640,8 @@ public static class Persistence {
         private final JdoDatanucleus jdoDatanucleus = new JdoDatanucleus();
         @Data
         public static class JdoDatanucleus {
-            
-            private String classMetadataLoadedListener = "org.apache.isis.persistence.jdo.integration.config.CreateSchemaObjectFromClassMetadata";
+
+            private String classMetadataLoadedListener = "org.apache.isis.persistence.jdo.datanucleus.config.CreateSchemaObjectFromClassMetadata";
 
             private final Impl impl = new Impl();
             @Data
@@ -1757,19 +1757,6 @@ public static class Level2 {
                             private String type = "none";
                         }
                     }
-                    private final ObjectProvider objectProvider = new ObjectProvider();
-                    @Data
-                    public static class ObjectProvider {
-                        /**
-                         * Enables dependency injection into entities
-                         *
-                         * <p>
-                         *     See also <tt>additional-spring-configuration-metadata.json</tt> (camelCasing instead of kebab-casing).
-                         * </p>
-                         */
-                        @NotNull @NotEmpty
-                        private String className = "org.apache.isis.persistence.jdo.datanucleus5.datanucleus.JDOStateManagerForIsis";
-                    }
                     private final Schema schema = new Schema();
                     @Data
                     public static class Schema {
@@ -2289,19 +2276,19 @@ public void setMaxTitleLengthInStandaloneTables(final int val) {
              * </p>
              */
             private boolean wicketSourcePlugin = false;
-            
+
             //TODO no meta data yet ... https://docs.spring.io/spring-boot/docs/current/reference/html/appendix-configuration-metadata.html#configuration-metadata-property-attributes
             private final Application application = new Application();
             @Data
             public static class Application {
-                
+
                 /**
                  * Label used on the about page.
                  */
                 private String about;
-                
+
                 /**
-                 * Either the location of the image file (relative to the class-path resource root), 
+                 * Either the location of the image file (relative to the class-path resource root),
                  * or an absolute URL.
                  *
                  * <p>
@@ -2311,9 +2298,9 @@ public static class Application {
                  */
                 @javax.validation.constraints.Pattern(regexp="^[^/].*$")
                 private Optional<String> brandLogoHeader = Optional.empty();
-                
+
                 /**
-                 * Either the location of the image file (relative to the class-path resource root), 
+                 * Either the location of the image file (relative to the class-path resource root),
                  * or an absolute URL.
                  *
                  * <p>
@@ -2323,7 +2310,7 @@ public static class Application {
                  */
                 @javax.validation.constraints.Pattern(regexp="^[^/].*$")
                 private Optional<String> brandLogoSignin = Optional.empty();
-                
+
                 /**
                  * URL of file to read any custom CSS, relative to <code>static</code> package on the class path.
                  *
@@ -2350,7 +2337,7 @@ public static class Application {
                  */
                 @javax.validation.constraints.Pattern(regexp="^[^/].*$")
                 private Optional<String> faviconUrl = Optional.empty();
-                
+
                 /**
                  */
                 /**
@@ -2383,7 +2370,7 @@ public static class Application {
                  */
                 @NotNull @NotEmpty
                 private String name = "Apache Isis ™";
-                
+
                 /**
                  * The version of the application, eg 1.0, 1.1, etc.
                  *
@@ -2394,7 +2381,7 @@ public static class Application {
                  */
                 private String version;
             }
-            
+
             private final BookmarkedPages bookmarkedPages = new BookmarkedPages();
             @Data
             public static class BookmarkedPages {
@@ -2487,7 +2474,7 @@ public static class Credit {
                  */
                 public boolean isDefined() { return (name != null || image != null) && url != null; }
             }
-            
+
             private final DatePicker datePicker = new DatePicker();
             @Data
             public static class DatePicker {
@@ -2607,8 +2594,8 @@ public static class Themes {
             public static class Welcome {
 
                 /**
-                 * Text to be displayed on the application’s home page, used as a fallback if 
-                 * welcome.file is not specified. If a @HomePage action exists, then that will take 
+                 * Text to be displayed on the application’s home page, used as a fallback if
+                 * welcome.file is not specified. If a @HomePage action exists, then that will take
                  * precedence.
                  */
                 private String text;
@@ -2967,16 +2954,16 @@ public static class Money {
     private final Extensions extensions = new Extensions();
     @Data
     public static class Extensions {
-        
+
         private final Cors cors = new Cors();
         @Data
         public static class Cors {
-            
+
             /**
              * TODO missing java-doc
              */
             private boolean allowCredentials = false;
-            
+
             /**
              * Which origins are allowed to make CORS requests.
              *
@@ -3030,7 +3017,7 @@ public static class Cors {
              */
             private List<String> exposedHeaders = listOf("Authorization");
 
-            
+
         }
 
         private final Quartz quartz = new Quartz();
@@ -3101,7 +3088,7 @@ public static class Exception {
 
             }
         }
-        
+
 
     }
 

core/config/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -30,9 +30,6 @@
     {
       "name": "isis.persistence.jdo-datanucleus.impl.datanucleus.PersistenceUnitLoadClasses"
     },
-    {
-      "name": "isis.persistence.jdo-datanucleus.impl.datanucleus.objectProvider.className"
-    },
     {
       "name": "isis.persistence.jdo-datanucleus.impl.datanucleus.schema.autoCreateAll",
       "type": "java.lang.Boolean"

examples/demo/domain/pom.xml

@@ -102,11 +102,6 @@
 			<scope>provided</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>org.assertj</groupId>
-			<artifactId>assertj-core</artifactId>
-			<scope>test</scope>
-		</dependency>
         <dependency>
             <groupId>org.apache.isis.valuetypes</groupId>
             <artifactId>isis-valuetypes-markdown-applib</artifactId>
@@ -118,6 +113,19 @@
 			<artifactId>isis-extensions-command-log-jdo</artifactId>
 		</dependency>
 
+		<!-- test -->
+		<dependency>
+			<groupId>org.apache.isis.testing</groupId>
+			<artifactId>isis-testing-unittestsupport-applib</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<scope>test</scope>
+		</dependency>
+
 		<!-- DEV TIME -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

examples/demo/domain/src/main/java/demoapp/dom/DemoModule.java

@@ -32,15 +32,16 @@
 import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
 import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationService;
 import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationServiceAllowBeatsVeto;
+import org.apache.isis.persistence.jdo.datanucleus.IsisModuleJdoProviderDatanucleus;
 import org.apache.isis.persistence.jdo.integration.IsisModuleJdoIntegration;
 import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
 
 @Configuration
 @Import({
     IsisModuleCoreRuntimeServices.class,
-    
+
     IsisModuleJdoIntegration.class,
-    
+
     IsisModuleTestingFixturesApplib.class,
 
     IsisModuleExtModelAnnotation.class, // @Model support
@@ -59,7 +60,7 @@
                 DemoModule.class
         })
 public class DemoModule {
-    
+
     @Bean
     public SecurityModuleConfig securityModuleConfigBean() {
         return SecurityModuleConfig.builder()
@@ -73,5 +74,5 @@ public SecurityModuleConfig securityModuleConfigBean() {
     public PermissionsEvaluationService permissionsEvaluationService() {
         return new PermissionsEvaluationServiceAllowBeatsVeto();
     }
-    
+
 }

examples/demo/domain/src/main/java/demoapp/dom/menubars.layout.xml

@@ -298,17 +298,17 @@ For latest we use: https://raw.githubusercontent.com/apache/isis/master/antora/s
                 </mb3:serviceAction>
             </mb3:section>
 			<mb3:section>
-                <mb3:serviceAction objectType="isisExtH2Console.H2ManagerMenu" id="openH2Console">
-                    <cpt:named>H2 Console</cpt:named>
-                </mb3:serviceAction>
-            </mb3:section>
-			<mb3:section>
-                <mb3:named>Prototype Actions</mb3:named>
+                <mb3:named>Prototype Actions (on Object)</mb3:named>
                 <mb3:serviceAction objectType="demoapp.PrototypeActionsVisibilityAdvisor" id="showPrototypeActions">
-                    <cpt:named>Show</cpt:named>
+                    <cpt:named>Show for Object</cpt:named>
                 </mb3:serviceAction>
                 <mb3:serviceAction objectType="demoapp.PrototypeActionsVisibilityAdvisor" id="doNotShowPrototypeActions">
-                    <cpt:named>Do not Show</cpt:named>
+                    <cpt:named>Do not Show for Object</cpt:named>
+                </mb3:serviceAction>
+            </mb3:section>
+			<mb3:section>
+                <mb3:serviceAction objectType="isisExtH2Console.H2ManagerMenu" id="openH2Console">
+                    <cpt:named>H2 Console</cpt:named>
                 </mb3:serviceAction>
             </mb3:section>
         </mb3:menu>

examples/demo/pom.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 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 
+<!-- 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. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -141,17 +141,13 @@
 		</dependency>
 
 		<!-- PERSISTENCE -->
-		
+
 		<dependency>
 			<groupId>org.apache.isis.mavendeps</groupId>
 			<artifactId>isis-mavendeps-jdo</artifactId>
 			<type>pom</type>
 		</dependency>
 
-<!--         <dependency> -->
-<!--             <groupId>org.apache.isis.legacy</groupId> -->
-<!--             <artifactId>isis-legacy-jdo-datanucleus</artifactId> -->
-<!--         </dependency> -->
 
 		<!-- EXTENSIONS -->
 
@@ -199,7 +195,7 @@
 			<groupId>org.apache.isis.extensions</groupId>
 			<artifactId>isis-extensions-secman-shiro-realm</artifactId>
 		</dependency>
-		
+
 		<!-- OTHER DEPENDENCIES -->
 
 		<dependency>
@@ -214,7 +210,7 @@
 		</dependency>
 
 	</dependencies>
-	
+
 	<modules>
 		<module>domain</module>
 		<module>javafx</module>
@@ -223,4 +219,4 @@
 		<module>vaadin</module>
 	</modules>
 
-</project>
+</project>