[103614] Changed non-interactive property name to wtp.autotest.noninteractive.
[103614] Created log entry for when non-interactive property is used.
diff --git a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/CachePluginResources.properties b/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/CachePluginResources.properties
index 9dc6242..2d06355 100644
--- a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/CachePluginResources.properties
+++ b/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/CachePluginResources.properties
@@ -30,4 +30,10 @@
_UI_CACHE_DIALOG_LICENSE_STATEMENT2 = In order to cache the resource you must agree to the license below:
_UI_CACHE_DIALOG_AGREE_BUTTON = I Agree
_UI_CACHE_DIALOG_DISAGREE_BUTTON = I Disagree
-_UI_CACHE_DIALOG_TITLE = License Agreement
\ No newline at end of file
+_UI_CACHE_DIALOG_TITLE = License Agreement
+
+# Cache logging messages
+_LOG_INFO_WTP_NO_USER_INTERACTION = {0} is set. Licenses will be accepted without user interaction.
+
+# WTP test no user interaction system property
+WTP_NO_USER_INTERACTION_SYSTEM_PROP = wtp.autotest.noninteractive
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/LicenseRegistry.java b/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/LicenseRegistry.java
index d78f2bc..fa4d8c9 100644
--- a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/LicenseRegistry.java
+++ b/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/LicenseRegistry.java
@@ -12,6 +12,8 @@
import java.util.Hashtable;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
import org.eclipse.swt.widgets.Display;
/**
@@ -24,10 +26,9 @@
protected static Integer LICENSE_AGREE = new Integer(1);
protected static Integer LICENSE_DISAGREE = new Integer(2);
- /**
- * The WTP system quiet property, used to prevent user prompting in automated testing.
- */
- private final static String WTP_QUIET_SYSTEM_PROP = "wtp.quiet";
+ protected final static String _LOG_INFO_WTP_NO_USER_INTERACTION = "_LOG_INFO_WTP_NO_USER_INTERACTION";
+
+ protected final static String WTP_NO_USER_INTERACTION_SYSTEM_PROP = CachePlugin.getResourceString("WTP_NO_USER_INTERACTION_SYSTEM_PROP");
/**
* There is only one instance of the license registry.
@@ -50,8 +51,9 @@
// If the wtp quiet system property is set the DO_NOT_PROMPT flag is set to true.
// This is used for automated testing.
- if(System.getProperty(WTP_QUIET_SYSTEM_PROP, "false").equals("true"))
+ if(System.getProperty(WTP_NO_USER_INTERACTION_SYSTEM_PROP, "false").equals("true"))
{
+ CachePlugin.getDefault().getLog().log(new Status(IStatus.INFO, CachePlugin.PLUGIN_ID, IStatus.OK, CachePlugin.getResourceString(_LOG_INFO_WTP_NO_USER_INTERACTION, WTP_NO_USER_INTERACTION_SYSTEM_PROP), null));
DO_NOT_PROMPT = true;
}
}
