Author: adietish Date: 2010-09-14 13:01:07 -0400 (Tue, 14 Sep 2010) New Revision: 24921 Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpMessages.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/messages.properties trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/LoggingUtils.java Modified: trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/PluginLogger.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/Tracker.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/UsageMessages.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/GoogleAnalyticsEclipseMessages.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpGetRequest.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpResourceMap.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/messages.properties trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BundleUtils.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/StatusUtils.java Log: [JBIDE-7024] Added check if plugin has tracing enabled (for INFO output only), corrected localisation (message locations) Modified: trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch 2010-09-14 15:50:27 UTC (rev 24920) +++ trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch 2010-09-14 17:01:07 UTC (rev 24921) @@ -7,7 +7,7 @@ <stringAttribute key="bootstrap" value=""/> <stringAttribute key="checked" value="[NONE]"/> <booleanAttribute key="clearConfig" value="true"/> -<booleanAttribute key="clearws" value="true"/> +<booleanAttribute key="clearws" value="false"/> <booleanAttribute key="clearwslog" value="false"/> <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBoss Usage Reporter"/> <booleanAttribute key="default" value="true"/> @@ -15,12 +15,12 @@ <booleanAttribute key="includeOptional" value="true"/> <stringAttribute key="location" value="${workspace_loc}/../runtime-EclipseApplication2"/> <listAttribute key="org.eclipse.debug.ui.favoriteGroups"> +<listEntry value="org.eclipse.debug.ui.launchGroup.run"/> <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/> -<listEntry value="org.eclipse.debug.ui.launchGroup.run"/> </listAttribute> <stringAttribute key="org.eclipse.jdt.launching.JAVA_COMMAND" value="java"/> <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> -<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -console -consolelog -pluginCustomization ${workspace_loc}/../runtime-EclipseApplication/usage.properties"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -console -consolelog -pluginCustomization ${workspace_loc}/../runtime-EclipseApplication/usage.properties -debug"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> <booleanAttribute key="pde.generated.config" value="false"/> <stringAttribute key="pde.version" value="3.3"/> @@ -29,7 +29,7 @@ <stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default"/> <booleanAttribute key="show_selected_only" value="false"/> <stringAttribute key="templateConfig" value="${workspace_loc:org.jboss.tools.usage/config.ini}"/> -<booleanAttribute key="tracing" value="false"/> +<booleanAttribute key="tracing" value="true"/> <booleanAttribute key="useCustomFeatures" value="false"/> <booleanAttribute key="useDefaultConfig" value="false"/> <booleanAttribute key="useDefaultConfigArea" value="true"/> Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/PluginLogger.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/PluginLogger.java 2010-09-14 15:50:27 UTC (rev 24920) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/PluginLogger.java 2010-09-14 17:01:07 UTC (rev 24921) @@ -13,15 +13,19 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Plugin; import org.eclipse.core.runtime.Status; +import org.jboss.tools.usage.util.LoggingUtils; /** * @author Andre Dietisheim */ public class PluginLogger implements ILoggingAdapter { + private final boolean tracingEnabled; + private Plugin plugin; public PluginLogger(Plugin plugin) { + this.tracingEnabled = LoggingUtils.isPluginTracingEnabled(plugin); this.plugin = plugin; } @@ -34,6 +38,10 @@ } private void log(int severity, String message) { + if (!tracingEnabled) { + return; + } + if (plugin != null) { IStatus status = new Status(severity, plugin.getBundle().getSymbolicName(), message); plugin.getLog().log(status); Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/Tracker.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/Tracker.java 2010-09-14 15:50:27 UTC (rev 24920) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/Tracker.java 2010-09-14 17:01:07 UTC (rev 24921) @@ -41,7 +41,7 @@ try { httpRequest.request(getTrackingUrl(focusPoint)); } catch (Exception e) { - loggingAdapter.logMessage(MessageFormat.format(UsageMessages.Tracker_Error, e.getMessage())); + loggingAdapter.logError(MessageFormat.format(UsageMessages.Tracker_Error, e.getMessage())); } } @@ -66,7 +66,7 @@ try { httpRequest.request(getTrackingUrl(focusPoint)); } catch (Exception e) { - loggingAdapter.logMessage(MessageFormat.format(UsageMessages.Tracker_Error, e.getMessage())); + loggingAdapter.logError(MessageFormat.format(UsageMessages.Tracker_Error, e.getMessage())); } } } Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/UsageMessages.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/UsageMessages.java 2010-09-14 15:50:27 UTC (rev 24920) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/UsageMessages.java 2010-09-14 17:01:07 UTC (rev 24921) @@ -18,14 +18,6 @@ public static String Tracker_Asynchronous; public static String Tracker_Error; - public static String HttpGetMethod_Error_Http; - public static String HttpGetMethod_Error_Io; - public static String HttpGetMethod_Success; - - public static String KillSwitchPreference_Error_Exception; - public static String KillSwitchPreference_Error_Http; - public static String KillSwitchPreference_Info_HttpQuery; - static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, UsageMessages.class); Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/GoogleAnalyticsEclipseMessages.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/GoogleAnalyticsEclipseMessages.java 2010-09-14 15:50:27 UTC (rev 24920) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/GoogleAnalyticsEclipseMessages.java 2010-09-14 17:01:07 UTC (rev 24921) @@ -17,7 +17,7 @@ */ public class GoogleAnalyticsEclipseMessages extends NLS { - private static final String BUNDLE_NAME = "org.jboss.tools.usage.googleanalytics.messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.jboss.tools.usage.googleanalytics.eclipse.messages"; //$NON-NLS-1$ public static String EclipseEnvironment_Error_SavePreferences; Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpGetRequest.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpGetRequest.java 2010-09-14 15:50:27 UTC (rev 24920) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpGetRequest.java 2010-09-14 17:01:07 UTC (rev 24921) @@ -16,7 +16,6 @@ import java.text.MessageFormat; import org.jboss.tools.usage.ILoggingAdapter; -import org.jboss.tools.usage.UsageMessages; /** * Class that executes a HTTP Get request to the given url. @@ -54,12 +53,12 @@ urlConnection.connect(); int responseCode = getResponseCode(urlConnection); if (responseCode == HttpURLConnection.HTTP_OK) { - loggingAdapter.logMessage(MessageFormat.format(UsageMessages.HttpGetMethod_Success, urlString, responseCode)); + loggingAdapter.logMessage(MessageFormat.format(HttpMessages.HttpGetMethod_Success, urlString, responseCode)); } else { - loggingAdapter.logError(MessageFormat.format(UsageMessages.HttpGetMethod_Error_Http, urlString)); + loggingAdapter.logError(MessageFormat.format(HttpMessages.HttpGetMethod_Error_Http, urlString)); } } catch (Exception e) { - loggingAdapter.logMessage(MessageFormat.format(UsageMessages.HttpGetMethod_Error_Io, urlString, e.toString())); + loggingAdapter.logMessage(MessageFormat.format(HttpMessages.HttpGetMethod_Error_Io, urlString, e.toString())); } finally { // setCookieHandler(currentCookieHandler); } Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpMessages.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpMessages.java (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpMessages.java 2010-09-14 17:01:07 UTC (rev 24921) @@ -0,0 +1,33 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.usage.http; + +import org.eclipse.osgi.util.NLS; + +public class HttpMessages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.tools.usage.http.messages"; //$NON-NLS-1$ + + public static String HttpGetMethod_Error_Http; + public static String HttpGetMethod_Error_Io; + public static String HttpGetMethod_Success; + + public static String HttpResourceMap_Error_Exception; + public static String HttpResourceMap_Error_Http; + public static String HttpResourceMap_Info_HttpQuery; + + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, HttpMessages.class); + } + + private HttpMessages() { + } +} Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpMessages.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpResourceMap.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpResourceMap.java 2010-09-14 15:50:27 UTC (rev 24920) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpResourceMap.java 2010-09-14 17:01:07 UTC (rev 24921) @@ -22,8 +22,8 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Plugin; -import org.jboss.tools.usage.UsageMessages; import org.jboss.tools.usage.util.HttpEncodingUtils; +import org.jboss.tools.usage.util.LoggingUtils; import org.jboss.tools.usage.util.StatusUtils; import org.jboss.tools.usage.util.reader.ReaderUtils; @@ -81,23 +81,23 @@ urlConnection.connect(); int responseCode = getResponseCode(urlConnection); if (responseCode == HttpURLConnection.HTTP_OK) { - IStatus status = StatusUtils.getDebugStatus( + IStatus status = StatusUtils.getInfoStatus( plugin.getBundle().getSymbolicName() - , UsageMessages.KillSwitchPreference_Info_HttpQuery + , HttpMessages.HttpResourceMap_Info_HttpQuery , url); - plugin.getLog().log(status); + LoggingUtils.log(status, plugin); responseReader = getInputStreamReader(urlConnection.getInputStream(), urlConnection.getContentType()); } else { IStatus status = StatusUtils.getErrorStatus( plugin.getBundle().getSymbolicName() - , UsageMessages.KillSwitchPreference_Error_Http, null, url); + , HttpMessages.HttpGetMethod_Error_Http, null, url); plugin.getLog().log(status); } return responseReader; } catch (IOException e) { IStatus status = StatusUtils.getErrorStatus( plugin.getBundle().getSymbolicName() - , UsageMessages.KillSwitchPreference_Error_Http, e, url); + , HttpMessages.HttpGetMethod_Error_Http, e, url); plugin.getLog().log(status); throw e; } Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/messages.properties =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/messages.properties (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/messages.properties 2010-09-14 17:01:07 UTC (rev 24921) @@ -0,0 +1,7 @@ +HttpResourceMap_Error_Exception=Could not query properties at \"{0}\" +HttpResourceMap_Error_Http=Could not query properties at \"{0}\, response code was \"{1}\"" +HttpResourceMap_Info_HttpQuery=Queried properties at \"{0}\" + +HttpGetMethod_Error_Http=HTTP GET to \"{0}\" failed, response code received \"{1}\" +HttpGetMethod_Error_Io=HTTP GET to "{0}" failed, exception occured\: "{1}" +HttpGetMethod_Success=HTTP GET to url "{0}" successfull\! Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/messages.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/messages.properties =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/messages.properties 2010-09-14 15:50:27 UTC (rev 24920) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/messages.properties 2010-09-14 17:01:07 UTC (rev 24921) @@ -1,11 +1,3 @@ -HttpGetMethod_Error_Http=HTTP GET to \"{0}\" failed, response code received \"{1}\" -HttpGetMethod_Error_Io=HTTP GET to \"{0}\" failed, exception occured: \"{1}\" -HttpGetMethod_Success=HTTP GET to url \"{0}\" successfull\! - Tracker_Asynchronous=Tracking asynchronously focusPoint \"{0}\" -Tracker_Error=Tracking failed, exception thrown: \"{0}\" -Tracker_Synchronous=Tracking synchronously focusPoint \"{0}\" - -KillSwitchPreference_Error_Exception=Could not query kill switch preference at \"{0}\" -KillSwitchPreference_Error_Http=Could not query kill switch preference at \"{0}\, response code was \"{1}\"" -KillSwitchPreference_Info_HttpQuery=Queried kill switch preference at \"{0}\" +Tracker_Error=Tracking failed, exception thrown\: "{0}" +Tracker_Synchronous=Tracking synchronously focusPoint \"{0}\" \ No newline at end of file Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BundleUtils.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BundleUtils.java 2010-09-14 15:50:27 UTC (rev 24920) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BundleUtils.java 2010-09-14 17:01:07 UTC (rev 24921) @@ -69,6 +69,5 @@ return pattern.matcher(bundle.getSymbolicName()).matches(); } - } } Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/LoggingUtils.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/LoggingUtils.java (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/LoggingUtils.java 2010-09-14 17:01:07 UTC (rev 24921) @@ -0,0 +1,31 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.usage.util; + +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Plugin; + +/** + * @author Andre Dietisheim + */ +public class LoggingUtils { + + public static boolean isPluginTracingEnabled(Plugin plugin) { + return plugin != null && plugin.isDebugging(); + } + + public static void log(IStatus status, Plugin plugin) { + if (status.getSeverity() == IStatus.INFO && !isPluginTracingEnabled(plugin)) { + return; + } + plugin.getLog().log(status); + } +} Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/LoggingUtils.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/StatusUtils.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/StatusUtils.java 2010-09-14 15:50:27 UTC (rev 24920) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/StatusUtils.java 2010-09-14 17:01:07 UTC (rev 24921) @@ -59,7 +59,7 @@ * * @return the debug status */ - public static IStatus getDebugStatus(String pluginId, String message, Object... messageArguments) { + public static IStatus getInfoStatus(String pluginId, String message, Object... messageArguments) { return new Status(Status.INFO, pluginId, Status.INFO, MessageFormat.format(message, messageArguments), null); } @@ -74,7 +74,7 @@ public static IStatus clone(IStatus status) { switch (status.getSeverity()) { case IStatus.INFO: - return getDebugStatus(status.getPlugin(), status.getMessage()); + return getInfoStatus(status.getPlugin(), status.getMessage()); case IStatus.ERROR: return getErrorStatus(status.getPlugin(), status.getMessage(), status.getException()); default: