Virtual Applications should be disabled by default in 7.11 #9720

enonic · Sep 22, 2022 · d5f7edd · d5f7edd
1 parent 6aa3059
commit d5f7edd
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/modules/core/core-app/src/main/java/com/enonic/xp/core/impl/app/AppConfig.java b/modules/core/core-app/src/main/java/com/enonic/xp/core/impl/app/AppConfig.java
@@ -6,7 +6,7 @@
 
     boolean auditlog_enabled() default true;
 
-    boolean virtual_enabled() default true;
+    boolean virtual_enabled() default false;
 
     boolean virtual_schema_override() default true;
 

diff --git a/...core-app/src/test/java/com/enonic/xp/core/impl/app/ApplicationFactoryServiceImplTest.java b/...core-app/src/test/java/com/enonic/xp/core/impl/app/ApplicationFactoryServiceImplTest.java
@@ -130,7 +130,7 @@ void findVirtualApplication()
                                                                                   .hits( 1 )
                                                                                   .build() );
 
-        when( appConfig.auditlog_enabled() ).thenReturn( true );
+        when( appConfig.virtual_enabled() ).thenReturn( true );
         when( appConfig.virtual_schema_override() ).thenReturn( false );
 
         final ApplicationFactoryServiceImpl service = new ApplicationFactoryServiceImpl( bundleContext, nodeService, appConfig );

diff --git a/...est/itest-core/src/test/java/com/enonic/xp/core/dynamic/DynamicSchemaServiceImplTest.java b/...est/itest-core/src/test/java/com/enonic/xp/core/dynamic/DynamicSchemaServiceImplTest.java
@@ -111,6 +111,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -238,6 +239,7 @@ public void initService()
         BundleContext bundleContext = felix.getBundleContext();
 
         AppConfig appConfig = mock( AppConfig.class, invocation -> invocation.getMethod().getDefaultValue() );
+        lenient().when( appConfig.virtual_enabled() ).thenReturn( true );
 
         ApplicationFactoryServiceImpl applicationFactoryService =
             new ApplicationFactoryServiceImpl( bundleContext, nodeService, appConfig );

diff --git a/modules/runtime/src/home/config/com.enonic.xp.app.cfg b/modules/runtime/src/home/config/com.enonic.xp.app.cfg
@@ -2,5 +2,5 @@
 
 #auditlog.enabled = true
 
-#virtual.enabled = true
+#virtual.enabled = false
 #virtual.schema.override = true