Author: adietish Date: 2010-09-10 08:34:31 -0400 (Fri, 10 Sep 2010) New Revision: 24862 Modified: 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/eclipse/AbstractEclipseEnvironment.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/ReportingEclipseEnvironment.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.java Log: [JBIDE-7041] referrer test failed, not reported in GA, getting back to no-referrer implementation Modified: 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/AbstractGoogleAnalyticsParameters.java 2010-09-10 12:27:03 UTC (rev 24861) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/AbstractGoogleAnalyticsParameters.java 2010-09-10 12:34:31 UTC (rev 24862) @@ -18,16 +18,16 @@ private String accountName; private String hostName; - private String referrer; + private String referral; - public AbstractGoogleAnalyticsParameters(String accountName, String hostName, String referrer) { + public AbstractGoogleAnalyticsParameters(String accountName, String hostName, String referral) { this.accountName = accountName; this.hostName = hostName; - this.referrer = referrer; + this.referral = referral; } - public String getReferrer() { - return referrer; + public String getReferral() { + return referral; } public String getAccountName() { Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/AbstractEclipseEnvironment.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/AbstractEclipseEnvironment.java 2010-09-10 12:27:03 UTC (rev 24861) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/AbstractEclipseEnvironment.java 2010-09-10 12:34:31 UTC (rev 24862) @@ -45,9 +45,9 @@ this(accountName, hostName, IGoogleAnalyticsParameters.VALUE_NO_REFERRAL, preferences); } - public AbstractEclipseEnvironment(String accountName, String hostName, String referrer, + public AbstractEclipseEnvironment(String accountName, String hostName, String referral, IEclipsePreferences preferences) { - super(accountName, hostName, referrer); + super(accountName, hostName, referral); this.random = new Random(); this.preferences = preferences; eclipseUserAgent = createEclipseUserAgent(); Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/ReportingEclipseEnvironment.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/ReportingEclipseEnvironment.java 2010-09-10 12:27:03 UTC (rev 24861) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/ReportingEclipseEnvironment.java 2010-09-10 12:34:31 UTC (rev 24862) @@ -54,12 +54,4 @@ } return builder.toString(); } - - public String getReferral() { - return getBundleVersion(); - } - - private String getBundleVersion() { - return JBossToolsUsageActivator.getDefault().getBundle().getVersion().toString(); - } } Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.java 2010-09-10 12:27:03 UTC (rev 24861) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.java 2010-09-10 12:34:31 UTC (rev 24862) @@ -49,7 +49,7 @@ + "&utmdt=testing-strategy" + "&utmhid=1087431432" + "&utmr=" - + JBossToolsUsageActivator.getDefault().getBundle().getVersion() + + IGoogleAnalyticsParameters.VALUE_NO_REFERRAL + "&utmp=%2Ftesting%2Fstrategy" + "&utmfl=" + ReportingEclipseEnvironmentFake.JAVA_VERSION