[jbosstools-commits] JBoss Tools SVN: r24289 - in trunk/usage/plugins/org.jboss.tools.usage: src/org/jboss/tools/usage and 4 other directories.

jbosstools-commits at lists.jboss.org jbosstools-commits at lists.jboss.org
Thu Aug 19 05:53:33 EDT 2010


Author: adietish
Date: 2010-08-19 05:53:32 -0400 (Thu, 19 Aug 2010)
New Revision: 24289

Added:
   trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/JBossToolsUsageActivator.java
   trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/AbstractGoogleAnalyticsParameters.java
   trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsMessages.java
   trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java
   trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/HttpGetMethod.java
   trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/PluginLogger.java
   trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/googleanalytics_messages.properties
   trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/PreferencesMessages.java
   trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/preferences_messages.properties
   trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/ReportingMessages.java
   trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/reporting_messages.properties
Removed:
   trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/AbstractGoogleAnalyticsParameters.java
   trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/GoogleAnalyticsUrlStrategy.java
   trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/HttpGetMethod.java
   trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/JBossToolsUsageActivator.java
   trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/Messages.java
   trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/PluginLogger.java
   trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/messages.properties
Modified:
   trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF
   trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/ITracker.java
   trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/Tracker.java
   trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferencePage.java
   trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/EclipseEnvironment.java
   trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java
   trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportDispatcher.java
   trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportPreferences.java
   trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtils.java
Log:
[JBIDE-6376] urls corrected, strings externalized, connection handling/reporting cleaned up

Modified: trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF	2010-08-19 09:51:42 UTC (rev 24288)
+++ trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF	2010-08-19 09:53:32 UTC (rev 24289)
@@ -12,6 +12,6 @@
 Require-Bundle: org.eclipse.osgi;bundle-version="3.5.0",
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ui;bundle-version="3.5.0"
-Bundle-Activator: org.jboss.tools.usage.reporting.JBossToolsUsageActivator
+Bundle-Activator: org.jboss.tools.usage.JBossToolsUsageActivator
 Bundle-Vendor: %BundleVendor
 Bundle-ActivationPolicy: lazy

Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/ITracker.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/ITracker.java	2010-08-19 09:51:42 UTC (rev 24288)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/ITracker.java	2010-08-19 09:53:32 UTC (rev 24289)
@@ -21,8 +21,7 @@
 	 * @throws UnsupportedEncodingException
 	 */
 
-	public abstract void trackSynchronously(FocusPoint focusPoint)
-			throws UnsupportedEncodingException;
+	public abstract void trackSynchronously(FocusPoint focusPoint);
 
 	/**
 	 * Track the focusPoint in the application asynchronously. <br/>

Copied: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/JBossToolsUsageActivator.java (from rev 24264, trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/JBossToolsUsageActivator.java)
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/JBossToolsUsageActivator.java	                        (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/JBossToolsUsageActivator.java	2010-08-19 09:53:32 UTC (rev 24289)
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * 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;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * @author Andre Dietisheim
+ */
+public class JBossToolsUsageActivator extends AbstractUIPlugin {
+
+	public static final String PLUGIN_ID = "org.jboss.tools.usage"; //$NON-NLS-1$
+
+	private static JBossToolsUsageActivator plugin;
+	
+	public JBossToolsUsageActivator() {
+		plugin = this;
+	}
+
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	public static JBossToolsUsageActivator getDefault() {
+		return plugin;
+	}
+
+	public static ImageDescriptor getImageDescriptor(String path) {
+		return imageDescriptorFromPlugin(PLUGIN_ID, path);
+	}
+	
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+	}
+}

Copied: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/AbstractGoogleAnalyticsParameters.java (from rev 24264, trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/AbstractGoogleAnalyticsParameters.java)
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/AbstractGoogleAnalyticsParameters.java	                        (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/AbstractGoogleAnalyticsParameters.java	2010-08-19 09:53:32 UTC (rev 24289)
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * 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.googleanalytics;
+
+
+/**
+ * @author Andre Dietisheim
+ */
+public abstract class AbstractGoogleAnalyticsParameters implements IGoogleAnalyticsParameters {
+
+	private String accountName;
+	private String referral;
+	private String hostName;
+
+	public AbstractGoogleAnalyticsParameters(String accountName, String hostName, String referral) {
+		this.accountName = accountName;
+		this.hostName = hostName;
+		this.referral = referral;
+	}
+
+	public String getAccountName() {
+		return accountName;
+	}
+	
+	public String getHostname() {
+		return hostName;
+	}
+
+	public String getReferral() {
+		return referral;
+	}
+}

Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsMessages.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsMessages.java	                        (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsMessages.java	2010-08-19 09:53:32 UTC (rev 24289)
@@ -0,0 +1,20 @@
+package org.jboss.tools.usage.googleanalytics;
+
+import org.eclipse.osgi.util.NLS;
+
+public class GoogleAnalyticsMessages extends NLS {
+	private static final String BUNDLE_NAME = "org.jboss.tools.usage.googleanalytics.googleanalytics_messages"; //$NON-NLS-1$
+	public static String HttpGetMethod_Error_Http;
+	public static String HttpGetMethod_Error_Io;
+	public static String HttpGetMethod_Success;
+	public static String Tracker_Synchronous;
+	public static String Tracker_Asynchronous;
+	public static String Tracker_Error;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, GoogleAnalyticsMessages.class);
+	}
+
+	private GoogleAnalyticsMessages() {
+	}
+}


Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsMessages.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java (from rev 24264, trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/GoogleAnalyticsUrlStrategy.java)
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java	                        (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java	2010-08-19 09:53:32 UTC (rev 24289)
@@ -0,0 +1,245 @@
+/*******************************************************************************
+ * 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.googleanalytics;
+
+import java.io.UnsupportedEncodingException;
+
+import org.jboss.tools.usage.util.EncodingUtils;
+
+/**
+ * Class that builds an URL that passes given parameters to google analytics
+ * 
+ * @author Andre Dietisheim
+ */
+public class GoogleAnalyticsUrlStrategy implements IURLBuildingStrategy {
+
+	private static final String TRACKING_URL = "http://www.google-analytics.com/__utm.gif";
+
+	private static final int VISITS = -1;
+
+	private IGoogleAnalyticsParameters googleParameters;
+
+	public GoogleAnalyticsUrlStrategy(IGoogleAnalyticsParameters googleAnalyticsParameters) {
+		this.googleParameters = googleAnalyticsParameters;
+	}
+
+	public String build(FocusPoint focusPoint) throws UnsupportedEncodingException {
+		/*
+		 * Google Analytics for Android:
+		 * 
+		String str = ""; 
+		if (paramEvent.action != null) 
+			str = paramEvent.action; 
+		if (!(str.startsWith("/"))) 
+			str = "/" + str; 
+		str = encode(str); 
+		Locale localLocale = Locale.getDefault(); 
+		StringBuilder localStringBuilder = new StringBuilder();
+		localStringBuilder.append("/__utm.gif");
+		localStringBuilder.append("?utmwv=4.3");
+		localStringBuilder.append("&utmn=").append(paramEvent.randomVal);
+		localStringBuilder.append("&utmcs=UTF-8");
+		localStringBuilder.append(String.format("&utmsr=%dx%d", new Object[] { 
+			Integer.valueOf(paramEvent.screenWidth)
+			, Integer.valueOf(paramEvent.screenHeight) }));
+		localStringBuilder.append(String.format("&utmul=%s-%s", new Object[] { 
+			localLocale.getLanguage()
+			, localLocale.getCountry() }));
+		localStringBuilder.append("&utmp=").append(str);
+		localStringBuilder.append("&utmac=").append(paramEvent.accountId);
+		localStringBuilder.append("&utmcc=").append(
+		  		getEscapedCookieString(paramEvent, paramString)); 
+		return localStringBuilder.toString();
+		 
+		*
+		* getEscapedCookieString:
+		* 
+		StringBuilder localStringBuilder = new StringBuilder();
+		localStringBuilder.append("__utma=");
+		localStringBuilder.append("999").append(".");
+		localStringBuilder.append(paramEvent.userId).append(".");
+		localStringBuilder.append(paramEvent.timestampFirst).append(".");
+		localStringBuilder.append(paramEvent.timestampPrevious).append(".");
+		localStringBuilder.append(paramEvent.timestampCurrent).append(".");
+		localStringBuilder.append(paramEvent.visits);
+		if (paramString != null)
+		{
+		localStringBuilder.append("+__utmz=");
+		localStringBuilder.append("999").append(".");
+		localStringBuilder.append(paramEvent.timestampFirst).append(".");
+		localStringBuilder.append("1.1.");
+		localStringBuilder.append(paramString);
+		}
+		return encode(localStringBuilder.toString());
+
+		 */
+
+		/*
+		 * our working tracking code
+		 * 
+		http://www.google-analytics.com/__utm.gif?utmwv=4.7.2
+		&utmn=338321265
+		&utmhn=jboss.org
+		&utmcs=UTF-8
+		&utmsr=1920x1080
+		&utmsc=24-bit
+		&utmul=en-us
+		&utmje=1
+		&utmfl=10.1%20r53
+		&utmdt=-%20JBoss%20Community
+		&utmhid=1087431432
+		&utmr=0
+		&utmp=%2Ftools%2Fusage.html
+		&utmac=UA-17645367-1
+		&utmcc=__utma%3D156030500.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B
+		&gaq=1
+		 *
+		 */
+
+		StringBuilder builder = new StringBuilder(TRACKING_URL)
+				.append(IGoogleAnalyticsParameters.URL_PARAM_DELIMITER);
+		appendParameter(IGoogleAnalyticsParameters.PARAM_TRACKING_CODE_VERSION,
+				IGoogleAnalyticsParameters.VALUE_TRACKING_CODE_VERSION, builder);
+		appendParameter(IGoogleAnalyticsParameters.PARAM_UNIQUE_TRACKING_NUMBER, getRandomNumber(), builder);
+		appendParameter(IGoogleAnalyticsParameters.PARAM_HOST_NAME, googleParameters.getHostname(), builder);
+		appendParameter(IGoogleAnalyticsParameters.PARAM_LANGUAGE_ENCODING,
+				IGoogleAnalyticsParameters.VALUE_ENCODING_UTF8, builder);
+		appendParameter(IGoogleAnalyticsParameters.PARAM_SCREEN_RESOLUTION, googleParameters.getScreenResolution(),
+				builder);
+		appendParameter(IGoogleAnalyticsParameters.PARAM_SCREEN_COLOR_DEPTH, googleParameters.getScreenColorDepth(),
+				builder);
+		appendParameter(IGoogleAnalyticsParameters.PARAM_BROWSER_LANGUAGE, googleParameters.getBrowserLanguage(),
+				builder);
+		appendParameter(IGoogleAnalyticsParameters.PARAM_PAGE_TITLE, focusPoint.getContentTitle(), builder);
+		appendParameter(IGoogleAnalyticsParameters.PARAM_HID, getRandomNumber(), builder);
+		appendParameter(IGoogleAnalyticsParameters.PARAM_REFERRAL, googleParameters.getReferral(), builder);
+		appendParameter(IGoogleAnalyticsParameters.PARAM_PAGE_REQUEST, focusPoint.getContentURI(), builder);
+
+		appendParameter(IGoogleAnalyticsParameters.PARAM_ACCOUNT_NAME, googleParameters.getAccountName(), builder);
+		appendParameter(IGoogleAnalyticsParameters.PARAM_COOKIES, getCookies(focusPoint), builder);
+		appendParameter(IGoogleAnalyticsParameters.PARAM_GAQ, "1", false, builder);
+
+		return builder.toString();
+	}
+
+	private String getCookies(FocusPoint focusPoint) {
+ 		long timeStamp = System.currentTimeMillis();
+		StringBuilder builder = new StringBuilder();
+		builder.append(IGoogleAnalyticsParameters.PARAM_COOKIES_FIRST_VISIT)
+				.append(IGoogleAnalyticsParameters.EQUALS_SIGN)
+				.append("999.")
+				.append(googleParameters.getUserId()).append(IGoogleAnalyticsParameters.DOT)
+				.append(timeStamp).append(IGoogleAnalyticsParameters.DOT)
+				.append(timeStamp).append(IGoogleAnalyticsParameters.DOT)
+				.append(timeStamp).append(IGoogleAnalyticsParameters.DOT)
+				.append(VISITS)
+				.append(IGoogleAnalyticsParameters.SEMICOLON)
+				.append(IGoogleAnalyticsParameters.PLUS_SIGN)
+				.append(IGoogleAnalyticsParameters.PARAM_COOKIES_REFERRAL_TYPE)
+				.append(IGoogleAnalyticsParameters.EQUALS_SIGN)
+				.append("999.")
+				.append(timeStamp).append(IGoogleAnalyticsParameters.DOT)
+				.append("1.1.")
+				.append(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCSR).append(IGoogleAnalyticsParameters.EQUALS_SIGN)
+				.append("(direct)").append(IGoogleAnalyticsParameters.PIPE)
+				.append(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCCN).append(IGoogleAnalyticsParameters.EQUALS_SIGN)
+				.append("(direct)").append(IGoogleAnalyticsParameters.PIPE)
+				.append(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCMD).append(IGoogleAnalyticsParameters.EQUALS_SIGN)
+				.append("(none)");
+		appendCookieKeyword(builder);
+		builder.append(IGoogleAnalyticsParameters.SEMICOLON);
+
+		return EncodingUtils.checkedEncodeUtf8(builder.toString());
+
+		// builder.append(IGoogleAnalyticsParameters.PARAM_COOKIE_VALUES)
+		// .append(IGoogleAnalyticsParameters.EQUALS_SIGN)
+		// .append("__utma%3D")
+		// .append(getRandomNumber())
+		// .append(".")
+		// .append(getRandomNumber())
+		// .append(".")
+		// .append(now)
+		// .append(".")
+		// .append(now)
+		// .append(".")
+		// .append(now)
+		// .append(".2%3B%2B)")
+		//
+		// // .append("__utmb%3D")
+		// // .append(getRandomNumber())
+		// // .append("%3B%2B__utmc%3D")
+		// // .append(getRandomNumber())
+		// // .append("%3B%2B")
+		//
+		// .append("__utmz%3D")
+		// .append(getRandomNumber())
+		// .append(".")
+		// .append(now)
+		// .append(IGoogleAnalyticsParameters.AMPERSAND);
+
+		// .append("utmcsr%3D(direct)%7C")
+		// .append("utmccn%3D(direct)%7C")
+		// .append("utmcmd%3D(none)%3B");
+
+	}
+
+	/**
+	 * Appends the keyword to the cookies.
+	 *
+	 * @param builder the builder to append to
+	 */
+	private void appendCookieKeyword(StringBuilder builder) {
+		String keyword = googleParameters.getKeyword();
+		if (keyword != null && keyword.length() > 0) {
+			builder.append(IGoogleAnalyticsParameters.PIPE)
+					.append(IGoogleAnalyticsParameters.PARAM_COOKIES_KEYWORD)
+					.append(IGoogleAnalyticsParameters.EQUALS_SIGN)
+					.append(keyword);
+		}
+	}
+
+	private String getRandomNumber() {
+		return Integer.toString((int) (Math.random() * 0x7fffffff));
+	}
+
+	private void appendParameter(String name, String value, StringBuilder builder) {
+		appendParameter(name, value, true, builder);
+	}
+
+	private void appendParameter(String name, String value, boolean appendAmpersand, StringBuilder builder) {
+		builder.append(name)
+				.append(IGoogleAnalyticsParameters.EQUALS_SIGN)
+				.append(value);
+		if (appendAmpersand) {
+			builder.append(IGoogleAnalyticsParameters.AMPERSAND);
+		}
+	}
+
+	// private String getIpAddress() throws SocketException {
+	// Enumeration<NetworkInterface> e1 =
+	// (Enumeration<NetworkInterface>)NetworkInterface.getNetworkInterfaces();
+	// while(e1.hasMoreElements()) {
+	// NetworkInterface ni = e1.nextElement();
+	//			
+	// System.out.print(ni.getName());
+	// System.out.print(" : [");
+	// Enumeration<InetAddress> e2 = ni.getInetAddresses();
+	// while(e2.hasMoreElements()) {
+	// InetAddress ia = e2.nextElement();
+	// System.out.print(ia);
+	// if( e2.hasMoreElements()) {
+	// System.out.print(",");
+	// }
+	// }
+	// System.out.println("]");
+	// }
+	// }
+}

Copied: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/HttpGetMethod.java (from rev 24264, trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/HttpGetMethod.java)
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/HttpGetMethod.java	                        (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/HttpGetMethod.java	2010-08-19 09:53:32 UTC (rev 24289)
@@ -0,0 +1,97 @@
+/*******************************************************************************
+ * 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.googleanalytics;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.text.MessageFormat;
+
+
+/**
+ * Class that executes a HTTP Get request to the given url.
+ * 
+ * @author Andre Dietisheim
+ */
+public class HttpGetMethod {
+	
+	private static final String USER_AGENT = "User-Agent"; //$NON-NLS-1$
+
+	private static final String GET_METHOD_NAME = "GET"; //$NON-NLS-1$
+	
+	private ILoggingAdapter loggingAdapter = null;
+
+//	private CookieHandler cookieHandler;
+	
+	private String userAgent;
+
+	public HttpGetMethod(String userAgent, ILoggingAdapter loggingAdapter) {
+		this.userAgent = userAgent;
+		this.loggingAdapter = loggingAdapter;
+//		this.cookieHandler = new CookieHandler();
+//		this.cookieHandler = CookieHandler.getDefault();
+//		cookieHandler.setCookiePolicy(CookiePolicy.ACCEPT_ALL);
+	}
+
+	public void request(String urlString) {
+
+//		CookieHandler currentCookieHandler = setCookieHandler(cookieHandler);
+		try {
+			HttpURLConnection urlConnection = createURLConnection(urlString, userAgent);
+			urlConnection.connect();
+			int responseCode = getResponseCode(urlConnection);
+			if (responseCode != HttpURLConnection.HTTP_OK) {
+				loggingAdapter.logMessage(MessageFormat.format(GoogleAnalyticsMessages.HttpGetMethod_Error_Http, urlString, responseCode));
+			} else {
+				loggingAdapter.logError(MessageFormat.format(GoogleAnalyticsMessages.HttpGetMethod_Success, urlString));
+			}
+		} catch (Exception e) {
+			loggingAdapter.logMessage(MessageFormat.format(GoogleAnalyticsMessages.HttpGetMethod_Error_Io, urlString, e.toString()));
+		} finally {
+//			setCookieHandler(currentCookieHandler);
+		}
+	}
+
+	/**
+	 * Returns the return code from the given {@link HttpURLConnection}.
+	 * Provided to be called by test cases so that they can retrieve the return code.
+	 *
+	 * @param urlConnection to get the response code from
+	 * @return the return code the HttpUrlConnection received
+	 * @throws IOException Signals that an I/O exception has occurred.
+	 */
+	protected int getResponseCode(HttpURLConnection urlConnection) throws IOException {
+		return urlConnection.getResponseCode();
+	}
+
+//	private CookieHandler setCookieHandler(CookieHandler cookieHandler) {
+//		CookieHandler currentCookieHandler = CookieHandler.getDefault();
+//		CookieHandler.setDefault(cookieHandler);
+//		return currentCookieHandler;
+//	}
+
+	/**
+	 * Creates a new url connection.
+	 *
+	 * @param urlString the url string
+	 * @param userAgent the user agent
+	 * @return the http url connection
+	 * @throws IOException Signals that an I/O exception has occurred.
+	 */
+	protected HttpURLConnection createURLConnection(String urlString, String userAgent) throws IOException {
+		URL url = new URL(urlString);
+		HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection();
+		urlConnection.setInstanceFollowRedirects(true);
+		urlConnection.setRequestMethod(GET_METHOD_NAME);
+		urlConnection.setRequestProperty(USER_AGENT, userAgent);
+		return urlConnection;
+	}
+}

Copied: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/PluginLogger.java (from rev 24264, trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/PluginLogger.java)
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/PluginLogger.java	                        (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/PluginLogger.java	2010-08-19 09:53:32 UTC (rev 24289)
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * 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.googleanalytics;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.core.runtime.Status;
+
+/**
+ * @author Andre Dietisheim
+ */
+public class PluginLogger implements ILoggingAdapter {
+
+	private Plugin plugin;
+
+	public PluginLogger(Plugin plugin) {
+		this.plugin = plugin;
+	}
+
+	public void logError(String message) {
+		log(IStatus.ERROR, message);
+	}
+
+	public void logMessage(String message) {
+		log(IStatus.INFO, message);
+	}
+
+	private void log(int severity, String message) {
+		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/googleanalytics/Tracker.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/Tracker.java	2010-08-19 09:51:42 UTC (rev 24288)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/Tracker.java	2010-08-19 09:53:32 UTC (rev 24289)
@@ -10,11 +10,9 @@
  ******************************************************************************/
 package org.jboss.tools.usage.googleanalytics;
 
-import java.io.UnsupportedEncodingException;
 import java.text.MessageFormat;
 
 import org.jboss.tools.usage.ITracker;
-import org.jboss.tools.usage.reporting.HttpGetMethod;
 
 /**
  * Reports (tracks) usage
@@ -35,13 +33,17 @@
 		this.urlBuildingStrategy = urlBuildingStrategy;
 	}
 
-	public void trackSynchronously(FocusPoint focusPoint) throws UnsupportedEncodingException {
-		loggingAdapter.logMessage("Tracking synchronously focusPoint=" + focusPoint.getContentTitle());
-		httpRequest.request(urlBuildingStrategy.build(focusPoint));
+	public void trackSynchronously(FocusPoint focusPoint) {
+		loggingAdapter.logMessage(MessageFormat.format(GoogleAnalyticsMessages.Tracker_Synchronous, focusPoint.getContentTitle()));
+		try {
+			httpRequest.request(urlBuildingStrategy.build(focusPoint));
+		} catch (Exception e) {
+			loggingAdapter.logMessage(MessageFormat.format(GoogleAnalyticsMessages.Tracker_Error, e.getMessage()));
+		}
 	}
 
 	public void trackAsynchronously(FocusPoint focusPoint) {
-		loggingAdapter.logMessage("Tracking Asynchronously focusPoint=" + focusPoint.getContentTitle());
+		loggingAdapter.logMessage(MessageFormat.format(GoogleAnalyticsMessages.Tracker_Asynchronous, focusPoint.getContentTitle()));
 		new TrackingThread(focusPoint).start();
 	}
 
@@ -56,8 +58,8 @@
 		public void run() {
 			try {
 				httpRequest.request(urlBuildingStrategy.build(focusPoint));
-			} catch (UnsupportedEncodingException e) {
-				loggingAdapter.logMessage(MessageFormat.format("Tracking failed: {0}", e.getMessage()));
+			} catch (Exception e) {
+				loggingAdapter.logMessage(MessageFormat.format(GoogleAnalyticsMessages.Tracker_Error, e.getMessage()));
 			}
 		}
 	}

Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/googleanalytics_messages.properties
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/googleanalytics_messages.properties	                        (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/googleanalytics_messages.properties	2010-08-19 09:53:32 UTC (rev 24289)
@@ -0,0 +1,7 @@
+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}\"


Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/googleanalytics_messages.properties
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/PreferencesMessages.java (from rev 24266, trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/Messages.java)
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/PreferencesMessages.java	                        (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/PreferencesMessages.java	2010-08-19 09:53:32 UTC (rev 24289)
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * 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.preferences;
+
+import org.eclipse.osgi.util.NLS;
+
+public class PreferencesMessages extends NLS {
+	private static final String BUNDLE_NAME = "org.jboss.tools.usage.preferences.preferences_messages"; //$NON-NLS-1$
+
+	public static String UsageReportPreferencePage_Description;
+	public static String UsageReportPreferencePage_AllowReporting;
+	public static String UsageReportPreferencePage_Error_Saving;
+
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, PreferencesMessages.class);
+	}
+
+	private PreferencesMessages() {
+	}
+}


Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/PreferencesMessages.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferencePage.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferencePage.java	2010-08-19 09:51:42 UTC (rev 24288)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferencePage.java	2010-08-19 09:53:32 UTC (rev 24289)
@@ -15,7 +15,7 @@
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.jboss.tools.usage.reporting.JBossToolsUsageActivator;
+import org.jboss.tools.usage.JBossToolsUsageActivator;
 import org.jboss.tools.usage.reporting.UsageReportPreferences;
 import org.jboss.tools.usage.util.StatusUtils;
 import org.osgi.service.prefs.BackingStoreException;
@@ -32,13 +32,13 @@
 	public void createFieldEditors() {
 		addField(new BooleanFieldEditor(
 				IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_ID
-				, Messages.UsageReportPreferencePage_AllowReporting
+				, PreferencesMessages.UsageReportPreferencePage_AllowReporting
 				, getFieldEditorParent()));
 	}
 
 	public void init(IWorkbench workbench) {
 		setPreferenceStore(UsageReportPreferences.createPreferenceStore());
-		setDescription(Messages.UsageReportPreferencePage_Description);
+		setDescription(PreferencesMessages.UsageReportPreferencePage_Description);
 	}
 
 	@Override
@@ -47,7 +47,7 @@
 			UsageReportPreferences.flush();
 		} catch (BackingStoreException e) {
 			IStatus status = StatusUtils.getErrorStatus(JBossToolsUsageActivator.PLUGIN_ID,
-					Messages.UsageReportPreferencePage_Error_Saving, e);
+					PreferencesMessages.UsageReportPreferencePage_Error_Saving, e);
 			JBossToolsUsageActivator.getDefault().getLog().log(status);
 		}
 		return super.performOk();

Copied: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/preferences_messages.properties (from rev 24266, trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/messages.properties)
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/preferences_messages.properties	                        (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/preferences_messages.properties	2010-08-19 09:53:32 UTC (rev 24289)
@@ -0,0 +1,3 @@
+UsageReportPreferencePage_Description=Preference page with options for anonymous usage data reporting. Usage data is used for statistical matters only.
+UsageReportPreferencePage_AllowReporting=&Allow Red Hat Inc. to report usage anonymously.
+UsageReportPreferencePage_Error_Saving=Could not save the preferences.


Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/preferences_messages.properties
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Deleted: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/AbstractGoogleAnalyticsParameters.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/AbstractGoogleAnalyticsParameters.java	2010-08-19 09:51:42 UTC (rev 24288)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/AbstractGoogleAnalyticsParameters.java	2010-08-19 09:53:32 UTC (rev 24289)
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * 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.reporting;
-
-import org.jboss.tools.usage.googleanalytics.IGoogleAnalyticsParameters;
-
-/**
- * @author Andre Dietisheim
- */
-public abstract class AbstractGoogleAnalyticsParameters implements IGoogleAnalyticsParameters {
-
-	private String accountName;
-	private String referral;
-	private String hostName;
-
-	public AbstractGoogleAnalyticsParameters(String accountName, String hostName, String referral) {
-		this.accountName = accountName;
-		this.hostName = hostName;
-		this.referral = referral;
-	}
-
-	public String getAccountName() {
-		return accountName;
-	}
-	
-	public String getHostname() {
-		return hostName;
-	}
-
-	public String getReferral() {
-		return referral;
-	}
-}

Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/EclipseEnvironment.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/EclipseEnvironment.java	2010-08-19 09:51:42 UTC (rev 24288)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/EclipseEnvironment.java	2010-08-19 09:53:32 UTC (rev 24289)
@@ -19,6 +19,8 @@
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.usage.JBossToolsUsageActivator;
+import org.jboss.tools.usage.googleanalytics.AbstractGoogleAnalyticsParameters;
 import org.jboss.tools.usage.googleanalytics.IGoogleAnalyticsParameters;
 import org.jboss.tools.usage.preferences.IUsageReportPreferenceConstants;
 import org.jboss.tools.usage.util.BundleUtils;

Deleted: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/GoogleAnalyticsUrlStrategy.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/GoogleAnalyticsUrlStrategy.java	2010-08-19 09:51:42 UTC (rev 24288)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/GoogleAnalyticsUrlStrategy.java	2010-08-19 09:53:32 UTC (rev 24289)
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * 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.reporting;
-
-import java.io.UnsupportedEncodingException;
-
-import org.jboss.tools.usage.googleanalytics.FocusPoint;
-import org.jboss.tools.usage.googleanalytics.IGoogleAnalyticsParameters;
-import org.jboss.tools.usage.googleanalytics.IURLBuildingStrategy;
-import org.jboss.tools.usage.util.EncodingUtils;
-
-/**
- * Class that builds an URL that passes given parameters to google analytics
- * 
- * @author Andre Dietisheim
- */
-public class GoogleAnalyticsUrlStrategy implements IURLBuildingStrategy {
-
-	private static final String TRACKING_URL = "http://www.google-analytics.com/__utm.gif";
-
-	private static final int VISITS = -1;
-
-	private IGoogleAnalyticsParameters googleParameters;
-
-	public GoogleAnalyticsUrlStrategy(IGoogleAnalyticsParameters googleAnalyticsParameters) {
-		this.googleParameters = googleAnalyticsParameters;
-	}
-
-	public String build(FocusPoint focusPoint) throws UnsupportedEncodingException {
-		/*
-		 * Google Analytics for Android:
-		 * 
-		String str = ""; 
-		if (paramEvent.action != null) 
-			str = paramEvent.action; 
-		if (!(str.startsWith("/"))) 
-			str = "/" + str; 
-		str = encode(str); 
-		Locale localLocale = Locale.getDefault(); 
-		StringBuilder localStringBuilder = new StringBuilder();
-		localStringBuilder.append("/__utm.gif");
-		localStringBuilder.append("?utmwv=4.3");
-		localStringBuilder.append("&utmn=").append(paramEvent.randomVal);
-		localStringBuilder.append("&utmcs=UTF-8");
-		localStringBuilder.append(String.format("&utmsr=%dx%d", new Object[] { 
-			Integer.valueOf(paramEvent.screenWidth)
-			, Integer.valueOf(paramEvent.screenHeight) }));
-		localStringBuilder.append(String.format("&utmul=%s-%s", new Object[] { 
-			localLocale.getLanguage()
-			, localLocale.getCountry() }));
-		localStringBuilder.append("&utmp=").append(str);
-		localStringBuilder.append("&utmac=").append(paramEvent.accountId);
-		localStringBuilder.append("&utmcc=").append(
-		  		getEscapedCookieString(paramEvent, paramString)); 
-		return localStringBuilder.toString();
-		 
-		*
-		* getEscapedCookieString:
-		* 
-		StringBuilder localStringBuilder = new StringBuilder();
-		localStringBuilder.append("__utma=");
-		localStringBuilder.append("999").append(".");
-		localStringBuilder.append(paramEvent.userId).append(".");
-		localStringBuilder.append(paramEvent.timestampFirst).append(".");
-		localStringBuilder.append(paramEvent.timestampPrevious).append(".");
-		localStringBuilder.append(paramEvent.timestampCurrent).append(".");
-		localStringBuilder.append(paramEvent.visits);
-		if (paramString != null)
-		{
-		localStringBuilder.append("+__utmz=");
-		localStringBuilder.append("999").append(".");
-		localStringBuilder.append(paramEvent.timestampFirst).append(".");
-		localStringBuilder.append("1.1.");
-		localStringBuilder.append(paramString);
-		}
-		return encode(localStringBuilder.toString());
-
-		 */
-
-		/*
-		 * our working tracking code
-		 * 
-		http://www.google-analytics.com/__utm.gif?utmwv=4.7.2
-		&utmn=338321265
-		&utmhn=jboss.org
-		&utmcs=UTF-8
-		&utmsr=1920x1080
-		&utmsc=24-bit
-		&utmul=en-us
-		&utmje=1
-		&utmfl=10.1%20r53
-		&utmdt=-%20JBoss%20Community
-		&utmhid=1087431432
-		&utmr=0
-		&utmp=%2Ftools%2Fusage.html
-		&utmac=UA-17645367-1
-		&utmcc=__utma%3D156030500.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B
-		&gaq=1
-		 *
-		 */
-
-		StringBuilder builder = new StringBuilder(TRACKING_URL)
-				.append(IGoogleAnalyticsParameters.URL_PARAM_DELIMITER);
-		appendParameter(IGoogleAnalyticsParameters.PARAM_TRACKING_CODE_VERSION,
-				IGoogleAnalyticsParameters.VALUE_TRACKING_CODE_VERSION, builder);
-		appendParameter(IGoogleAnalyticsParameters.PARAM_UNIQUE_TRACKING_NUMBER, getRandomNumber(), builder);
-		appendParameter(IGoogleAnalyticsParameters.PARAM_HOST_NAME, googleParameters.getHostname(), builder);
-		appendParameter(IGoogleAnalyticsParameters.PARAM_LANGUAGE_ENCODING,
-				IGoogleAnalyticsParameters.VALUE_ENCODING_UTF8, builder);
-		appendParameter(IGoogleAnalyticsParameters.PARAM_SCREEN_RESOLUTION, googleParameters.getScreenResolution(),
-				builder);
-		appendParameter(IGoogleAnalyticsParameters.PARAM_SCREEN_COLOR_DEPTH, googleParameters.getScreenColorDepth(),
-				builder);
-		appendParameter(IGoogleAnalyticsParameters.PARAM_BROWSER_LANGUAGE, googleParameters.getBrowserLanguage(),
-				builder);
-		appendParameter(IGoogleAnalyticsParameters.PARAM_PAGE_TITLE, focusPoint.getContentTitle(), builder);
-		appendParameter(IGoogleAnalyticsParameters.PARAM_HID, getRandomNumber(), builder);
-		appendParameter(IGoogleAnalyticsParameters.PARAM_REFERRAL, googleParameters.getReferral(), builder);
-		appendParameter(IGoogleAnalyticsParameters.PARAM_PAGE_REQUEST, focusPoint.getContentURI(), builder);
-
-		appendParameter(IGoogleAnalyticsParameters.PARAM_ACCOUNT_NAME, googleParameters.getAccountName(), builder);
-		appendParameter(IGoogleAnalyticsParameters.PARAM_COOKIES, getCookies(focusPoint), builder);
-		appendParameter(IGoogleAnalyticsParameters.PARAM_GAQ, "1", false, builder);
-
-		return builder.toString();
-	}
-
-	private String getCookies(FocusPoint focusPoint) {
- 		long timeStamp = System.currentTimeMillis();
-		StringBuilder builder = new StringBuilder();
-		builder.append(IGoogleAnalyticsParameters.PARAM_COOKIES_FIRST_VISIT)
-				.append(IGoogleAnalyticsParameters.EQUALS_SIGN)
-				.append("999.")
-				.append(googleParameters.getUserId()).append(IGoogleAnalyticsParameters.DOT)
-				.append(timeStamp).append(IGoogleAnalyticsParameters.DOT)
-				.append(timeStamp).append(IGoogleAnalyticsParameters.DOT)
-				.append(timeStamp).append(IGoogleAnalyticsParameters.DOT)
-				.append(VISITS)
-				.append(IGoogleAnalyticsParameters.SEMICOLON)
-				.append(IGoogleAnalyticsParameters.PLUS_SIGN)
-				.append(IGoogleAnalyticsParameters.PARAM_COOKIES_REFERRAL_TYPE)
-				.append(IGoogleAnalyticsParameters.EQUALS_SIGN)
-				.append("999.")
-				.append(timeStamp).append(IGoogleAnalyticsParameters.DOT)
-				.append("1.1.")
-				.append(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCSR).append(IGoogleAnalyticsParameters.EQUALS_SIGN)
-				.append("(direct)").append(IGoogleAnalyticsParameters.PIPE)
-				.append(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCCN).append(IGoogleAnalyticsParameters.EQUALS_SIGN)
-				.append("(direct)").append(IGoogleAnalyticsParameters.PIPE)
-				.append(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCMD).append(IGoogleAnalyticsParameters.EQUALS_SIGN)
-				.append("(none)");
-		appendCookieKeyword(builder);
-		builder.append(IGoogleAnalyticsParameters.SEMICOLON);
-
-		return EncodingUtils.checkedEncodeUtf8(builder.toString());
-
-		// builder.append(IGoogleAnalyticsParameters.PARAM_COOKIE_VALUES)
-		// .append(IGoogleAnalyticsParameters.EQUALS_SIGN)
-		// .append("__utma%3D")
-		// .append(getRandomNumber())
-		// .append(".")
-		// .append(getRandomNumber())
-		// .append(".")
-		// .append(now)
-		// .append(".")
-		// .append(now)
-		// .append(".")
-		// .append(now)
-		// .append(".2%3B%2B)")
-		//
-		// // .append("__utmb%3D")
-		// // .append(getRandomNumber())
-		// // .append("%3B%2B__utmc%3D")
-		// // .append(getRandomNumber())
-		// // .append("%3B%2B")
-		//
-		// .append("__utmz%3D")
-		// .append(getRandomNumber())
-		// .append(".")
-		// .append(now)
-		// .append(IGoogleAnalyticsParameters.AMPERSAND);
-
-		// .append("utmcsr%3D(direct)%7C")
-		// .append("utmccn%3D(direct)%7C")
-		// .append("utmcmd%3D(none)%3B");
-
-	}
-
-	/**
-	 * Appends the keyword to the cookies.
-	 *
-	 * @param builder the builder to append to
-	 */
-	private void appendCookieKeyword(StringBuilder builder) {
-		String keyword = googleParameters.getKeyword();
-		if (keyword != null && keyword.length() > 0) {
-			builder.append(IGoogleAnalyticsParameters.PIPE)
-					.append(IGoogleAnalyticsParameters.PARAM_COOKIES_KEYWORD)
-					.append(IGoogleAnalyticsParameters.EQUALS_SIGN)
-					.append(keyword);
-		}
-	}
-
-	private String getRandomNumber() {
-		return Integer.toString((int) (Math.random() * 0x7fffffff));
-	}
-
-	private void appendParameter(String name, String value, StringBuilder builder) {
-		appendParameter(name, value, true, builder);
-	}
-
-	private void appendParameter(String name, String value, boolean appendAmpersand, StringBuilder builder) {
-		builder.append(name)
-				.append(IGoogleAnalyticsParameters.EQUALS_SIGN)
-				.append(value);
-		if (appendAmpersand) {
-			builder.append(IGoogleAnalyticsParameters.AMPERSAND);
-		}
-	}
-
-	// private String getIpAddress() throws SocketException {
-	// Enumeration<NetworkInterface> e1 =
-	// (Enumeration<NetworkInterface>)NetworkInterface.getNetworkInterfaces();
-	// while(e1.hasMoreElements()) {
-	// NetworkInterface ni = e1.nextElement();
-	//			
-	// System.out.print(ni.getName());
-	// System.out.print(" : [");
-	// Enumeration<InetAddress> e2 = ni.getInetAddresses();
-	// while(e2.hasMoreElements()) {
-	// InetAddress ia = e2.nextElement();
-	// System.out.print(ia);
-	// if( e2.hasMoreElements()) {
-	// System.out.print(",");
-	// }
-	// }
-	// System.out.println("]");
-	// }
-	// }
-}

Deleted: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/HttpGetMethod.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/HttpGetMethod.java	2010-08-19 09:51:42 UTC (rev 24288)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/HttpGetMethod.java	2010-08-19 09:53:32 UTC (rev 24289)
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * 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.reporting;
-
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.text.MessageFormat;
-
-import org.jboss.tools.usage.googleanalytics.ILoggingAdapter;
-
-/**
- * Class that executes a HTTP Get request to the given url.
- * 
- * @author Andre Dietisheim
- */
-public class HttpGetMethod {
-	
-	private static final String USER_AGENT = "User-Agent";
-
-	private static final String GET_METHOD_NAME = "GET";
-	
-	private static final String SUCCESS_MESSAGE = "Http Get to url {0} successfull!";
-	
-	private static final String ERROR_MESSAGE = "Http Get to {0} failed, response code was {1}";
-
-	private ILoggingAdapter loggingAdapter = null;
-
-//	private CookieHandler cookieHandler;
-	
-	private String userAgent;
-
-	public HttpGetMethod(String userAgent, ILoggingAdapter loggingAdapter) {
-		this.userAgent = userAgent;
-		this.loggingAdapter = loggingAdapter;
-//		this.cookieHandler = new CookieHandler();
-//		this.cookieHandler = CookieHandler.getDefault();
-//		cookieHandler.setCookiePolicy(CookiePolicy.ACCEPT_ALL);
-	}
-
-	public void request(String urlString) {
-
-//		CookieHandler currentCookieHandler = setCookieHandler(cookieHandler);
-		try {
-			HttpURLConnection urlConnection = createURLConnection(urlString, userAgent);
-			urlConnection.connect();
-			int responseCode = getResponseCode(urlConnection);
-			if (responseCode != HttpURLConnection.HTTP_OK) {
-				loggingAdapter.logMessage(MessageFormat.format(ERROR_MESSAGE, urlString, responseCode));
-			} else {
-				loggingAdapter.logError(MessageFormat.format(SUCCESS_MESSAGE, urlString));
-			}
-		} catch (Exception e) {
-			loggingAdapter.logError(e.getMessage());
-		} finally {
-//			setCookieHandler(currentCookieHandler);
-		}
-	}
-
-	/**
-	 * Returns the return code from the given {@link HttpURLConnection}.
-	 * Provided to be called by test cases so that they can retrieve the return code.
-	 *
-	 * @param urlConnection to get the response code from
-	 * @return the return code the HttpUrlConnection received
-	 * @throws IOException Signals that an I/O exception has occurred.
-	 */
-	protected int getResponseCode(HttpURLConnection urlConnection) throws IOException {
-		return urlConnection.getResponseCode();
-	}
-
-//	private CookieHandler setCookieHandler(CookieHandler cookieHandler) {
-//		CookieHandler currentCookieHandler = CookieHandler.getDefault();
-//		CookieHandler.setDefault(cookieHandler);
-//		return currentCookieHandler;
-//	}
-
-	/**
-	 * Creates a new url connection.
-	 *
-	 * @param urlString the url string
-	 * @param userAgent the user agent
-	 * @return the http url connection
-	 * @throws IOException Signals that an I/O exception has occurred.
-	 */
-	protected HttpURLConnection createURLConnection(String urlString, String userAgent) throws IOException {
-		URL url = new URL(urlString);
-		HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection();
-		urlConnection.setInstanceFollowRedirects(true);
-		urlConnection.setRequestMethod(GET_METHOD_NAME);
-		urlConnection.setRequestProperty(USER_AGENT, userAgent);
-		return urlConnection;
-	}
-}

Deleted: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/JBossToolsUsageActivator.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/JBossToolsUsageActivator.java	2010-08-19 09:51:42 UTC (rev 24288)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/JBossToolsUsageActivator.java	2010-08-19 09:53:32 UTC (rev 24289)
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * 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.reporting;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * @author Andre Dietisheim
- */
-public class JBossToolsUsageActivator extends AbstractUIPlugin {
-
-	public static final String PLUGIN_ID = "org.jboss.tools.usage"; //$NON-NLS-1$
-
-	private static JBossToolsUsageActivator plugin;
-	
-	public JBossToolsUsageActivator() {
-		plugin = this;
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	public static JBossToolsUsageActivator getDefault() {
-		return plugin;
-	}
-
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return imageDescriptorFromPlugin(PLUGIN_ID, path);
-	}
-	
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-}

Deleted: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/Messages.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/Messages.java	2010-08-19 09:51:42 UTC (rev 24288)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/Messages.java	2010-08-19 09:53:32 UTC (rev 24289)
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * 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.reporting;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.jboss.tools.usage.reporting.messages"; //$NON-NLS-1$
-	public static String UsageReport_Checkbox_Text;
-	public static String UsageReport_DialogMessage;
-	public static String UsageReport_DialogTitle;
-	
-	public static String UsageReport_Error_SavePreferences;
-	public static String UsageReport_GoogleAnalyticsAccount;
-	public static String UsageReport_HostName;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

Deleted: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/PluginLogger.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/PluginLogger.java	2010-08-19 09:51:42 UTC (rev 24288)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/PluginLogger.java	2010-08-19 09:53:32 UTC (rev 24289)
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * 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.reporting;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.jboss.tools.usage.googleanalytics.ILoggingAdapter;
-
-/**
- * @author Andre Dietisheim
- */
-public class PluginLogger implements ILoggingAdapter {
-
-	private Plugin plugin;
-
-	public PluginLogger(Plugin plugin) {
-		this.plugin = plugin;
-	}
-
-	public void logError(String message) {
-		log(IStatus.ERROR, message);
-	}
-
-	public void logMessage(String message) {
-		log(IStatus.INFO, message);
-	}
-
-	private void log(int severity, String message) {
-		if (plugin != null) {
-			IStatus status = new Status(severity, plugin.getBundle().getSymbolicName(), message);
-			plugin.getLog().log(status);
-		}
-	}
-}

Copied: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/ReportingMessages.java (from rev 24264, trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/Messages.java)
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/ReportingMessages.java	                        (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/ReportingMessages.java	2010-08-19 09:53:32 UTC (rev 24289)
@@ -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.reporting;
+
+import org.eclipse.osgi.util.NLS;
+
+public class ReportingMessages extends NLS {
+	private static final String BUNDLE_NAME = "org.jboss.tools.usage.reporting.reporting_messages"; //$NON-NLS-1$
+	public static String UsageReport_Checkbox_Text;
+	public static String UsageReport_DialogMessage;
+	public static String UsageReport_DialogTitle;
+	
+	public static String UsageReport_Error_SavePreferences;
+	public static String UsageReport_GoogleAnalyticsAccount;
+	public static String UsageReport_HostName;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, ReportingMessages.class);
+	}
+
+	private ReportingMessages() {
+	}
+}

Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java	2010-08-19 09:51:42 UTC (rev 24288)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java	2010-08-19 09:53:32 UTC (rev 24289)
@@ -11,10 +11,13 @@
 package org.jboss.tools.usage.reporting;
 
 import org.jboss.tools.usage.ITracker;
+import org.jboss.tools.usage.JBossToolsUsageActivator;
 import org.jboss.tools.usage.googleanalytics.FocusPoint;
+import org.jboss.tools.usage.googleanalytics.GoogleAnalyticsUrlStrategy;
 import org.jboss.tools.usage.googleanalytics.IGoogleAnalyticsParameters;
 import org.jboss.tools.usage.googleanalytics.ILoggingAdapter;
 import org.jboss.tools.usage.googleanalytics.IURLBuildingStrategy;
+import org.jboss.tools.usage.googleanalytics.PluginLogger;
 import org.jboss.tools.usage.googleanalytics.Tracker;
 
 /**
@@ -22,13 +25,15 @@
  */
 public class UsageReport {
 
-	private static final String GANALYTICS_ACCOUNTNAME = Messages.UsageReport_GoogleAnalyticsAccount;
+	private static final String GANALYTICS_ACCOUNTNAME = ReportingMessages.UsageReport_GoogleAnalyticsAccount;
 
-	private static final String HOST_NAME = Messages.UsageReport_HostName;
+	private static final String HOST_NAME = ReportingMessages.UsageReport_HostName;
 
-	private FocusPoint focusPoint = new FocusPoint("jboss.org").setChild(new FocusPoint("tools") //$NON-NLS-1$ //$NON-NLS-2$
-			.setChild(new FocusPoint("usage").setChild(new FocusPoint("action") //$NON-NLS-1$ //$NON-NLS-2$
-					.setChild(new FocusPoint("wsstartup"))))); //$NON-NLS-1$
+	private FocusPoint focusPoint = new FocusPoint("tools") //$NON-NLS-1$ 
+			.setChild(new FocusPoint("usage") //$NON-NLS-1$ 
+					.setChild(new FocusPoint("action") //$NON-NLS-1$ 
+							.setChild(new FocusPoint("wsstartup") //$NON-NLS-1$ 
+							))); //$NON-NLS-1$
 
 	public void report() {
 		if (UsageReportPreferences.isEnabled()) {

Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportDispatcher.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportDispatcher.java	2010-08-19 09:51:42 UTC (rev 24288)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportDispatcher.java	2010-08-19 09:53:32 UTC (rev 24289)
@@ -15,7 +15,8 @@
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IStartup;
 import org.eclipse.ui.PlatformUI;
-import org.jboss.tools.usage.reporting.Messages;
+import org.jboss.tools.usage.JBossToolsUsageActivator;
+import org.jboss.tools.usage.reporting.ReportingMessages;
 import org.jboss.tools.usage.util.StatusUtils;
 import org.osgi.service.prefs.BackingStoreException;
 
@@ -28,9 +29,9 @@
 		Display.getDefault().asyncExec(new Runnable() {
 
 			public void run() {
-				UsageReportEnablementDialog dialog = new UsageReportEnablementDialog(Messages.UsageReport_DialogTitle,
-						Messages.UsageReport_DialogMessage,
-						Messages.UsageReport_Checkbox_Text,
+				UsageReportEnablementDialog dialog = new UsageReportEnablementDialog(ReportingMessages.UsageReport_DialogTitle,
+						ReportingMessages.UsageReport_DialogMessage,
+						ReportingMessages.UsageReport_Checkbox_Text,
 						true,
 						PlatformUI.getWorkbench().getActiveWorkbenchWindow());
 				if (UsageReportPreferences.isAskUser()) {
@@ -51,7 +52,7 @@
 					UsageReportPreferences.flush();
 				} catch (BackingStoreException e) {
 					IStatus status = StatusUtils.getErrorStatus(JBossToolsUsageActivator.PLUGIN_ID,
-							Messages.UsageReport_Error_SavePreferences, e);
+							ReportingMessages.UsageReport_Error_SavePreferences, e);
 					JBossToolsUsageActivator.getDefault().getLog().log(status);
 				}
 			}

Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportPreferences.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportPreferences.java	2010-08-19 09:51:42 UTC (rev 24288)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportPreferences.java	2010-08-19 09:53:32 UTC (rev 24289)
@@ -12,6 +12,7 @@
 
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.jface.preference.IPreferenceStore;
+import org.jboss.tools.usage.JBossToolsUsageActivator;
 import org.jboss.tools.usage.preferences.IUsageReportPreferenceConstants;
 import org.jboss.tools.usage.util.PreferencesUtils;
 import org.jboss.tools.usage.util.StatusUtils;
@@ -51,7 +52,7 @@
 		} catch (BackingStoreException e) {
 			JBossToolsUsageActivator.getDefault().getLog().log(
 					StatusUtils.getErrorStatus(JBossToolsUsageActivator.PLUGIN_ID,
-							Messages.UsageReport_Error_SavePreferences, e,
+							ReportingMessages.UsageReport_Error_SavePreferences, e,
 							IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_ID));
 		}
 	}

Deleted: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/messages.properties
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/messages.properties	2010-08-19 09:51:42 UTC (rev 24288)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/messages.properties	2010-08-19 09:53:32 UTC (rev 24289)
@@ -1,6 +0,0 @@
-UsageReport_Checkbox_Text=Report usage anonymously to Red Hat Inc.
-UsageReport_DialogMessage=Please allow Red Hat Inc. to report this installation anynomously for statistical matters.
-UsageReport_DialogTitle=Report usage
-UsageReport_Error_SavePreferences=Could not save preferences {0}
-UsageReport_GoogleAnalyticsAccount=UA-17645367-1
-UsageReport_HostName=jboss.org

Copied: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/reporting_messages.properties (from rev 24264, trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/messages.properties)
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/reporting_messages.properties	                        (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/reporting_messages.properties	2010-08-19 09:53:32 UTC (rev 24289)
@@ -0,0 +1,6 @@
+UsageReport_Checkbox_Text=Report usage anonymously to Red Hat Inc.
+UsageReport_DialogMessage=Please allow Red Hat Inc. to report this installation anynomously for statistical matters.
+UsageReport_DialogTitle=Report usage
+UsageReport_Error_SavePreferences=Could not save preferences {0}
+UsageReport_GoogleAnalyticsAccount=UA-17645367-1
+UsageReport_HostName=jboss.org

Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtils.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtils.java	2010-08-19 09:51:42 UTC (rev 24288)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtils.java	2010-08-19 09:53:32 UTC (rev 24289)
@@ -14,7 +14,7 @@
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.jface.preference.IPersistentPreferenceStore;
 import org.eclipse.ui.preferences.ScopedPreferenceStore;
-import org.jboss.tools.usage.reporting.JBossToolsUsageActivator;
+import org.jboss.tools.usage.JBossToolsUsageActivator;
 
 public class PreferencesUtils {
 		



More information about the jbosstools-commits mailing list