SAK-31325 rename ical.experimental property and change default value …

…to true (sakaiproject#2933)
OTEMA · Jul 4, 2016 · 9a1a177 · 9a1a177
1 parent 0122e48
commit 9a1a177
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/calendar/calendar-tool/tool/src/java/org/sakaiproject/calendar/tool/CalendarAction.java b/calendar/calendar-tool/tool/src/java/org/sakaiproject/calendar/tool/CalendarAction.java
@@ -2514,9 +2514,9 @@ private void buildImportContext(VelocityPortlet portlet, Context context, RunDat
 			state.setImportWizardState(IMPORT_WIZARD_SELECT_TYPE_STATE);
 		}
 
-		// (optional) ical.experimental import
+		// (optional) ical.public.userdefined.subscribe import (ical.experimental is deprecated)
 		context.put("icalEnable", 
-						ServerConfigurationService.getString("ical.experimental"));
+						ServerConfigurationService.getBoolean("ical.public.userdefined.subscribe",ServerConfigurationService.getBoolean("ical.experimental",true)));
 
 		// Set whatever the current wizard state is.
 		context.put("importWizardState", state.getImportWizardState());
@@ -7661,7 +7661,7 @@ private void buildMenu( VelocityPortlet portlet,
 		// See if we are allowed to export items.
 		String calId = state.getPrimaryCalendarReference();
 		if ( (allow_import_export || CalendarService.getExportEnabled(calId)) && 
-			  ServerConfigurationService.getBoolean("ical.experimental",false))
+			  ServerConfigurationService.getBoolean("ical.public.userdefined.subscribe",ServerConfigurationService.getBoolean("ical.experimental",true)))
 		{
 			bar.add( new MenuEntry(rb.getString("java.export"), rb.getString("java.export.title"), null, allow_new, MenuItem.CHECKED_NA, "doIcalExportName") );
 		}

diff --git a/.../configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties b/.../configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties
@@ -2016,8 +2016,11 @@
 # DEFAULT: true
 # ical.public.secureurl.subscribe=false
 
-# Enable iCal import/export via instructor-named ICS file. This is legacy: recommend using ical.opaqueurl.subscribe instead
-# DEFAULT: false
+# Enable iCal import/export via instructor-named ICS file.
+# DEFAULT: true
+# ical.public.userdefined.subscribe=true
+
+# This is legacy: recommend using ical.public.userdefined.subscribe instead
 # ical.experimental=true