Author: adietish Date: 2010-08-19 09:46:22 -0400 (Thu, 19 Aug 2010) New Revision: 24297 Modified: trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF 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/IGoogleAnalyticsParameters.java Log: [JBIDE-6376] eclipse instance uniqueness now fixed 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 12:07:52 UTC (rev 24296) +++ trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF 2010-08-19 13:46:22 UTC (rev 24297) @@ -6,7 +6,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.jboss.tools.usage, org.jboss.tools.usage.googleanalytics, - org.jboss.tools.usage.reporting; x-internal:=true; x-friends="org.jboss.tools.usage.test", + org.jboss.tools.usage.reporting; x-friends:="org.jboss.tools.usage.test", org.jboss.tools.usage.util Require-Bundle: org.eclipse.osgi;bundle-version="3.5.0", org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", Modified: 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 2010-08-19 12:07:52 UTC (rev 24296) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsMessages.java 2010-08-19 13:46:22 UTC (rev 24297) @@ -1,3 +1,13 @@ +/******************************************************************************* + * 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.osgi.util.NLS; @@ -3,4 +13,5 @@ public class GoogleAnalyticsMessages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.tools.usage.googleanalytics.messages"; //$NON-NLS-1$ static { 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-19 12:07:52 UTC (rev 24296) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java 2010-08-19 13:46:22 UTC (rev 24297) @@ -22,7 +22,11 @@ * @author Andre Dietisheim * * @see <a - * href="http://code.google.com/apis/analytics/docs/tracking/gaTracking... Request Parameters</a> + * href="http://code.google.com/apis/analytics/docs/tracking/gaTracking... + * Request Parameters</a> + * @see <a + * href="http://code.google.com/apis/analytics/docs/concepts/gaConcepts... + * Set By Google Analytics</a> */ public class GoogleAnalyticsUrlStrategy implements IURLBuildingStrategy { @@ -124,7 +128,8 @@ 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_HID, + // getRandomNumber(), builder); appendParameter(IGoogleAnalyticsParameters.PARAM_REFERRAL, googleParameters.getReferral(), builder); appendParameter(IGoogleAnalyticsParameters.PARAM_PAGE_REQUEST, focusPoint.getContentURI(), builder); @@ -136,80 +141,49 @@ } 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()); + new UrlCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_UNIQUE_VISITOR_ID, + new StringBuilder().append("999.") + .append(googleParameters.getUserId()).append(IGoogleAnalyticsParameters.DOT) + .append('0').append(IGoogleAnalyticsParameters.DOT) + .append('0').append(IGoogleAnalyticsParameters.DOT) + .append('0').append(IGoogleAnalyticsParameters.DOT) + .append(VISITS) + .append(IGoogleAnalyticsParameters.SEMICOLON), + IGoogleAnalyticsParameters.PLUS_SIGN) + .appendTo(builder); - // 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); + new UrlCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_REFERRAL_TYPE, + new StringBuilder() + .append("999.") + .append("-1") + .append(IGoogleAnalyticsParameters.DOT) + .append("1.1.")) + .appendTo(builder); - // .append("utmcsr%3D(direct)%7C") - // .append("utmccn%3D(direct)%7C") - // .append("utmcmd%3D(none)%3B"); + new UrlCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCSR, + "(direct)", + IGoogleAnalyticsParameters.PIPE) + .appendTo(builder); - } + new UrlCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCCN, + "(direct)", + IGoogleAnalyticsParameters.PIPE) + .appendTo(builder); - /** - * 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); - } + new UrlCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCMD, + "(none)", + IGoogleAnalyticsParameters.PIPE) + .appendTo(builder); + + new UrlCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_KEYWORD, + googleParameters.getKeyword()) + .appendTo(builder); + + builder.append(IGoogleAnalyticsParameters.SEMICOLON); + + return EncodingUtils.checkedEncodeUtf8(builder.toString()); } private String getRandomNumber() { Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IGoogleAnalyticsParameters.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IGoogleAnalyticsParameters.java 2010-08-19 12:07:52 UTC (rev 24296) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IGoogleAnalyticsParameters.java 2010-08-19 13:46:22 UTC (rev 24297) @@ -36,7 +36,7 @@ public static final String PARAM_ACCOUNT_NAME = "utmac"; public static final String PARAM_HOST_NAME = "utmhn"; public static final String PARAM_COOKIES = "utmcc"; - public static final String PARAM_COOKIES_FIRST_VISIT = "__utma"; + public static final String PARAM_COOKIES_UNIQUE_VISITOR_ID = "__utma"; public static final String PARAM_REFERRAL = "utmr"; public static final String PARAM_TRACKING_CODE_VERSION = "utmwv";