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

Author: adietish Date: 2010-09-10 05:05:36 -0400 (Fri, 10 Sep 2010) New Revision: 24855 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/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/internal/JBossToolsUsageActivator.java 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/UsageReport.java trunk/usage/tests/org.jboss.tools.usage.test/build.properties 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/ReportingEclipseEnvironmentFake.java Log: [JBIDE-7041] reporting bundle version as referrer now Modified: trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF 2010-09-10 08:45:49 UTC (rev 24854) +++ trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF 2010-09-10 09:05:36 UTC (rev 24855) @@ -7,6 +7,7 @@ Export-Package: org.jboss.tools.usage, org.jboss.tools.usage.googleanalytics, org.jboss.tools.usage.googleanalytics.eclipse, + org.jboss.tools.usage.internal;x-friends:="org.jboss.tools.usage.test", org.jboss.tools.usage.preferences;x-friends:="org.jboss.tools.usage.test", org.jboss.tools.usage.reporting;x-friends:="org.jboss.tools.usage.test", org.jboss.tools.usage.util 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 08:45:49 UTC (rev 24854) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/AbstractGoogleAnalyticsParameters.java 2010-09-10 09:05:36 UTC (rev 24855) @@ -17,13 +17,11 @@ public abstract class AbstractGoogleAnalyticsParameters implements IGoogleAnalyticsParameters { private String accountName; - private String referral; private String hostName; - public AbstractGoogleAnalyticsParameters(String accountName, String hostName, String referral) { + public AbstractGoogleAnalyticsParameters(String accountName, String hostName) { this.accountName = accountName; this.hostName = hostName; - this.referral = referral; } public String getAccountName() { @@ -33,8 +31,4 @@ public String getHostname() { return hostName; } - - public String getReferral() { - return referral; - } } 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 08:45:49 UTC (rev 24854) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/AbstractEclipseEnvironment.java 2010-09-10 09:05:36 UTC (rev 24855) @@ -40,8 +40,8 @@ private long visitCount; private IUserAgent eclipseUserAgent; - public AbstractEclipseEnvironment(String accountName, String hostName, String referral, IEclipsePreferences preferences) { - super(accountName, hostName, referral); + public AbstractEclipseEnvironment(String accountName, String hostName, IEclipsePreferences preferences) { + super(accountName, hostName); this.random = new Random(); this.preferences = preferences; eclipseUserAgent = createEclipseUserAgent(); Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/JBossToolsUsageActivator.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/JBossToolsUsageActivator.java 2010-09-10 08:45:49 UTC (rev 24854) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/JBossToolsUsageActivator.java 2010-09-10 09:05:36 UTC (rev 24855) @@ -10,14 +10,13 @@ ******************************************************************************/ package org.jboss.tools.usage.internal; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.eclipse.core.runtime.Plugin; import org.osgi.framework.BundleContext; /** * @author Andre Dietisheim */ -public class JBossToolsUsageActivator extends AbstractUIPlugin { +public class JBossToolsUsageActivator extends Plugin { public static final String PLUGIN_ID = "org.jboss.tools.usage"; //$NON-NLS-1$ @@ -36,10 +35,6 @@ 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); 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 08:45:49 UTC (rev 24854) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/ReportingEclipseEnvironment.java 2010-09-10 09:05:36 UTC (rev 24855) @@ -25,8 +25,8 @@ private static final String JBOSS_TOOLS_BUNDLES_PREFIX = "org\\.jboss\\.tools.+"; //$NON-NLS-1$ private static final char BUNDLE_GROUP_DELIMITER = '-'; - public ReportingEclipseEnvironment(String accountName, String hostName, String referral, IEclipsePreferences preferences) { - super(accountName, hostName, referral, preferences); + public ReportingEclipseEnvironment(String accountName, String hostName, IEclipsePreferences preferences) { + super(accountName, hostName, preferences); } @Override @@ -54,4 +54,12 @@ } return builder.toString(); } + + public String getReferral() { + return getBundleVersion(); + } + + private String getBundleVersion() { + return JBossToolsUsageActivator.getDefault().getBundle().getVersion().toString(); + } } 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-09-10 08:45:49 UTC (rev 24854) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java 2010-09-10 09:05:36 UTC (rev 24855) @@ -87,7 +87,6 @@ IGoogleAnalyticsParameters eclipseEnvironment = new ReportingEclipseEnvironment( GANALYTICS_ACCOUNTNAME , HOST_NAME - , IGoogleAnalyticsParameters.VALUE_NO_REFERRAL , PreferencesUtils.getPreferences()); ILoggingAdapter loggingAdapter = new PluginLogger(JBossToolsUsageActivator.getDefault()); IURLBuildingStrategy urlStrategy = new GoogleAnalyticsUrlStrategy(eclipseEnvironment); Modified: trunk/usage/tests/org.jboss.tools.usage.test/build.properties =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/build.properties 2010-09-10 08:45:49 UTC (rev 24854) +++ trunk/usage/tests/org.jboss.tools.usage.test/build.properties 2010-09-10 09:05:36 UTC (rev 24855) @@ -15,4 +15,8 @@ META-INF/,\ about.html,\ build.properties,\ - src/ + src/,\ + GlobalUsageReportingSettingsTest.launch,\ + JBossToolsUsageIntegrationTest.launch,\ + UsageTestSuite.launch,\ + pom.xml 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 08:45:49 UTC (rev 24854) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.java 2010-09-10 09:05:36 UTC (rev 24855) @@ -18,6 +18,7 @@ import org.jboss.tools.usage.FocusPoint; import org.jboss.tools.usage.googleanalytics.GoogleAnalyticsUrlStrategy; import org.jboss.tools.usage.googleanalytics.IGoogleAnalyticsParameters; +import org.jboss.tools.usage.internal.JBossToolsUsageActivator; import org.junit.Before; import org.junit.Test; @@ -47,7 +48,8 @@ + "&utmul=en-us" + "&utmdt=testing-strategy" + "&utmhid=1087431432" - + "&utmr=0" + + "&utmr=" + + JBossToolsUsageActivator.getDefault().getBundle().getVersion() + "&utmp=%2Ftesting%2Fstrategy" + "&utmfl=" + ReportingEclipseEnvironmentFake.JAVA_VERSION Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/ReportingEclipseEnvironmentFake.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/ReportingEclipseEnvironmentFake.java 2010-09-10 08:45:49 UTC (rev 24854) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/ReportingEclipseEnvironmentFake.java 2010-09-10 09:05:36 UTC (rev 24855) @@ -21,26 +21,25 @@ public static final String GANALYTICS_ACCOUNTNAME = "UA-17645367-1"; public static final String HOSTNAME = "jboss.org"; - public static final String REFERRAL = "0"; public static final String JAVA_VERSION = "1.6.0_20"; private String javaVersion; public ReportingEclipseEnvironmentFake() { - this(GANALYTICS_ACCOUNTNAME, HOSTNAME, REFERRAL, JAVA_VERSION, new EclipsePreferencesFake()); + this(GANALYTICS_ACCOUNTNAME, HOSTNAME, JAVA_VERSION, new EclipsePreferencesFake()); } public ReportingEclipseEnvironmentFake(IEclipsePreferences preferences) { - this(GANALYTICS_ACCOUNTNAME, HOSTNAME, REFERRAL, JAVA_VERSION, preferences); + this(GANALYTICS_ACCOUNTNAME, HOSTNAME, JAVA_VERSION, preferences); } - public ReportingEclipseEnvironmentFake(String accountName, String hostName, String referral) { - this(accountName, hostName, referral, JAVA_VERSION, new EclipsePreferencesFake()); + public ReportingEclipseEnvironmentFake(String accountName, String hostName) { + this(accountName, hostName, JAVA_VERSION, new EclipsePreferencesFake()); } - public ReportingEclipseEnvironmentFake(String accountName, String hostName, String referral, String javaVersion, + public ReportingEclipseEnvironmentFake(String accountName, String hostName, String javaVersion, IEclipsePreferences preferences) { - super(accountName, hostName, referral, preferences); + super(accountName, hostName, preferences); this.javaVersion = javaVersion; }