Author: adietish Date: 2010-08-20 06:43:09 -0400 (Fri, 20 Aug 2010) New Revision: 24331 Modified: 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/reporting/JBossBundleGroups.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java Log: [JBIDE-6376] requests are now recognized as unique per eclipse installation Modified: 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/GoogleAnalyticsUrlStrategy.java 2010-08-20 08:50:35 UTC (rev 24330) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java 2010-08-20 10:43:09 UTC (rev 24331) @@ -91,28 +91,6 @@ */ - /* - * 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, @@ -143,7 +121,10 @@ private String getCookies(FocusPoint focusPoint) { StringBuilder builder = new StringBuilder(); - String timeStamp = String.valueOf(System.currentTimeMillis()); + /** + * unique visitor id cookie has to be unique per eclipse installation + */ + String timeStamp = "-1"; //String.valueOf(System.currentTimeMillis()); new GoogleAnalyticsCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_UNIQUE_VISITOR_ID, new StringBuilder().append("999.") Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/JBossBundleGroups.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/JBossBundleGroups.java 2010-08-20 08:50:35 UTC (rev 24330) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/JBossBundleGroups.java 2010-08-20 10:43:09 UTC (rev 24331) @@ -11,8 +11,8 @@ package org.jboss.tools.usage.reporting; import java.util.Collection; -import java.util.HashSet; import java.util.Set; +import java.util.TreeSet; import org.jboss.tools.usage.util.BundleUtils.IBundleEntryFilter; import org.osgi.framework.Bundle; @@ -200,7 +200,7 @@ } } - private Set<String> jbossBundleGroups = new HashSet<String>(); + private Set<String> jbossBundleGroups = new TreeSet<String>(); /** * Collects the bundle groups the bundles it gets belong 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-20 08:50:35 UTC (rev 24330) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java 2010-08-20 10:43:09 UTC (rev 24331) @@ -32,8 +32,7 @@ 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$ + .setChild(new FocusPoint("wsstartup")))); //$NON-NLS-1$ public void report() { if (UsageReportPreferences.isEnabled()) {