[jbosstools-commits] JBoss Tools SVN: r24211 - in trunk/usage: plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics and 2 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Tue Aug 17 08:46:49 EDT 2010
Author: adietish
Date: 2010-08-17 08:46:48 -0400 (Tue, 17 Aug 2010)
New Revision: 24211
Modified:
trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch
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/internal/UsageReport.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/UsageReportDispatcher.java
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageTest.java
Log:
[JBIDE-6376] classes refactored: clean separation of tracking code / google analytics specific code
Modified: trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch 2010-08-17 12:45:32 UTC (rev 24210)
+++ trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch 2010-08-17 12:46:48 UTC (rev 24211)
@@ -24,13 +24,13 @@
<booleanAttribute key="pde.generated.config" value="false"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="com.jboss.jbds.product.product"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.security at default:default,org.jboss.tools.xulrunner.initializer at default:false,org.eclipse.jface at default:default,org.eclipse.swt.cocoa.macosx at default:false,org.eclipse.osgi,org.eclipse.ui.workbench at default:default,org.eclipse.core.databinding at default:default,org.eclipse.equinox.common at default:default,org.eclipse.core.databinding.observable at default:default,org.eclipse.equinox.p2.core at default:default,org.eclipse.core.runtime at default:true,org.eclipse.ui at default:default,org.eclipse.jface.text at default:default,org.eclipse.equinox.registry at default:default,org.eclipse.core.runtime.compatibility.auth at default:default,javax.transaction at default:false,org.eclipse.core.contenttype at default:default,javax.servlet at default:default,org.eclipse.equinox.p2.artifact.repository at default:default,com.ibm.icu at default:default,org.eclipse.core.filesystem at default:default,org.eclipse.core.resources at default:default,org.eclipse.equinox.!
p2.metadata.repository at default:default,org.eclipse.ecf.ssl at default:false,org.eclipse.core.commands at default:default,org.eclipse.ant.core at default:default,org.junit4 at default:default,org.eclipse.core.net at default:default,org.eclipse.ecf.provider.filetransfer.ssl at default:false,org.eclipse.core.resources.compatibility at default:false,org.eclipse.equinox.concurrent at default:default,org.eclipse.ecf at default:default,org.eclipse.text at default:default,org.hamcrest.core at default:default,org.eclipse.core.variables at default:default,org.eclipse.ecf.identity at default:default,org.eclipse.swt at default:default,org.eclipse.osgi.services at default:default,org.eclipse.equinox.app at default:default,org.eclipse.ui.ide at default:default,org.eclipse.equinox.p2.metadata at default:default,org.eclipse.help at default:default,org.eclipse.core.expressions at default:default,org.eclipse.core.databinding.property at default:default,org.eclipse.ecf.provider.filetransfer at default:default,org.eclipse.ui.cocoa at default:false,org.eclipse.j!
face.databinding at default:default,org.eclipse.equinox.transform!
s.hook at d
efault:false,org.eclipse.core.filesystem.macosx at default:false,org.eclipse.ecf.filetransfer at default:default,org.eclipse.equinox.security.macosx at default:false,org.eclipse.equinox.p2.repository at default:default,org.eclipse.core.jobs at default:default,org.eclipse.ui.forms at default:default,org.eclipse.equinox.preferences at default:default,org.eclipse.ui.views at default:default,org.eclipse.equinox.p2.jarprocessor at default:default,org.eclipse.equinox.p2.engine at default:default,org.eclipse.core.runtime.compatibility.registry at default:false"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.core.commands at default:default,org.eclipse.equinox.security.macosx at default:false,org.eclipse.ecf.provider.filetransfer at default:default,org.eclipse.ecf.ssl at default:false,org.eclipse.core.resources at default:default,com.ibm.icu at default:default,org.eclipse.equinox.http.servlet at default:default,org.eclipse.equinox.common at 2:true,org.eclipse.core.contenttype at default:default,org.eclipse.ui.intro at default:default,org.eclipse.ui.ide.application at default:default,org.eclipse.core.resources.compatibility at default:false,org.eclipse.ecf.provider.filetransfer.ssl at default:false,org.mortbay.jetty.server at default:default,org.eclipse.help.base at default:default,org.apache.ant at default:default,com.springsource.javax.el at default:default,org.eclipse.ui.navigator at default:default,org.eclipse.equinox.preferences at default:default,org.eclipse.osgi.services at default:default,org.eclipse.ecf at default:default,com.springsource.javax.servlet.jsp at default:de!
fault,org.junit4 at default:default,org.eclipse.ui at default:default,org.eclipse.equinox.http.jetty at default:default,org.eclipse.ui.views.properties.tabbed at default:default,org.eclipse.core.filesystem at default:default,org.eclipse.ant.core at default:default,org.eclipse.core.runtime.compatibility.registry at default:false,org.eclipse.help at default:default,org.eclipse.swt.cocoa.macosx at default:false,org.eclipse.ui.cocoa at default:false,org.eclipse.core.runtime at default:true,com.springsource.javax.servlet at default:default,org.eclipse.ui.intro.universal at default:default,javax.servlet at default:default,org.eclipse.core.net at default:default,org.eclipse.ecf.identity at default:default,org.eclipse.equinox.app at default:default,org.eclipse.equinox.registry at default:default,org.eclipse.text at default:default,org.eclipse.ui.ide at default:default,org.eclipse.ui.navigator.resources at default:default,org.eclipse.equinox.p2.artifact.repository at default:default,org.eclipse.core.databinding at default:default,org.eclipse.core.dat!
abinding.property at default:default,org.eclipse.equinox.p2.metad!
ata.repo
sitory at default:default,org.eclipse.ecf.filetransfer at default:default,org.eclipse.ui.workbench at default:default,org.eclipse.ui.cheatsheets at default:default,org.eclipse.jface at default:default,org.apache.lucene at default:default,org.eclipse.swt at default:default,javax.transaction at default:false,org.eclipse.equinox.p2.jarprocessor at default:default,org.eclipse.core.jobs at default:default,org.eclipse.jface.databinding at default:default,org.eclipse.equinox.p2.metadata at default:default,org.eclipse.jface.text at default:default,org.apache.jasper at default:default,org.apache.commons.el at default:default,org.eclipse.help.ui at default:default,org.eclipse.core.databinding.observable at default:default,org.eclipse.ui.forms at default:default,org.eclipse.core.expressions at default:default,org.eclipse.core.runtime.compatibility.auth at default:default,org.eclipse.core.filesystem.macosx at default:false,org.jboss.tools.xulrunner.initializer at default:false,org.eclipse.equinox.p2.engine at default:default,com.springsource.org.apache.c!
ommons.logging at default:default,org.eclipse.ui.views at default:default,org.eclipse.equinox.p2.core at default:default,org.eclipse.core.variables at default:default,org.eclipse.osgi at -1:true,org.hamcrest.core at default:default,com.jboss.jbds.product at default:default,org.eclipse.ui.workbench.texteditor at default:default,org.eclipse.equinox.security at default:default,org.eclipse.equinox.transforms.hook at default:false,org.apache.lucene.analysis at default:default,org.eclipse.equinox.concurrent at default:default,org.eclipse.compare.core at default:default,org.mortbay.jetty.util at default:default,org.eclipse.equinox.p2.repository at default:default"/>
<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test at default:default,org.jboss.tools.usage at default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfig" value="true"/>
<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
<booleanAttribute key="usefeatures" value="false"/>
</launchConfiguration>
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-17 12:45:32 UTC (rev 24210)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/Tracker.java 2010-08-17 12:46:48 UTC (rev 24211)
@@ -30,10 +30,10 @@
private HttpGetMethod httpRequest;
private ILoggingAdapter loggingAdapter;
- public Tracker(IGoogleAnalyticsParameters googleParameters, ILoggingAdapter loggingAdapter) {
- this.httpRequest = new HttpGetMethod(googleParameters.getUserAgent(), loggingAdapter);
+ public Tracker(IURLBuildingStrategy urlBuildingStrategy, String userAgent, ILoggingAdapter loggingAdapter) {
+ this.httpRequest = new HttpGetMethod(userAgent, loggingAdapter);
this.loggingAdapter = loggingAdapter;
- this.urlBuildingStrategy = new GoogleAnalyticsUrlStrategy(googleParameters);
+ this.urlBuildingStrategy = urlBuildingStrategy;
}
public void trackSynchronously(FocusPoint focusPoint) throws UnsupportedEncodingException {
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/UsageReport.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/UsageReport.java 2010-08-17 12:45:32 UTC (rev 24210)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/UsageReport.java 2010-08-17 12:46:48 UTC (rev 24211)
@@ -19,6 +19,7 @@
import org.jboss.tools.usage.googleanalytics.FocusPoint;
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.Tracker;
import org.jboss.tools.usage.preferences.IUsageReportPreferenceConstants;
import org.jboss.tools.usage.util.StatusUtils;
@@ -26,7 +27,7 @@
public class UsageReport {
- private static final String GANALYTICS_TRACKINGCODE = "UA-17645367-1";
+ private static final String GANALYTICS_ACCOUNTNAME = "UA-17645367-1";
private static final String HOST_NAME = "jboss.org";
@@ -68,12 +69,12 @@
private ITracker getAnalyticsTracker() {
IGoogleAnalyticsParameters eclipseSettings = new EclipseEnvironment(
- GANALYTICS_TRACKINGCODE
+ GANALYTICS_ACCOUNTNAME
, HOST_NAME
, IGoogleAnalyticsParameters.VALUE_NO_REFERRAL);
ILoggingAdapter loggingAdapter = new PluginLogger(JBossToolsUsageActivator.getDefault());
- Tracker tracker = new Tracker(eclipseSettings, loggingAdapter);
- return tracker;
+ IURLBuildingStrategy urlStrategy = new GoogleAnalyticsUrlStrategy(eclipseSettings);
+ return new Tracker(urlStrategy, eclipseSettings.getUserAgent(), loggingAdapter);
}
private boolean isAskUser() {
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/UsageReportDispatcher.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/UsageReportDispatcher.java 2010-08-17 12:45:32 UTC (rev 24210)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/UsageReportDispatcher.java 2010-08-17 12:46:48 UTC (rev 24211)
@@ -12,7 +12,6 @@
import org.eclipse.ui.IStartup;
/**
- *
* @author Andre Dieitsheim
*/
public class UsageReportDispatcher implements IStartup {
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageTest.java 2010-08-17 12:45:32 UTC (rev 24210)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageTest.java 2010-08-17 12:46:48 UTC (rev 24211)
@@ -15,7 +15,9 @@
import org.jboss.tools.usage.googleanalytics.FocusPoint;
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.Tracker;
+import org.jboss.tools.usage.internal.GoogleAnalyticsUrlStrategy;
import org.jboss.tools.usage.internal.PluginLogger;
import org.jboss.tools.usage.test.internal.JBossToolsUsageTestActivator;
import org.junit.Test;
@@ -49,6 +51,7 @@
IGoogleAnalyticsParameters eclipseSettings = new EclipseEnvironmentFake(
GANALYTICS_ACCOUNTNAME, HOST_NAME, JBossToolsUsageTestActivator.PLUGIN_ID, Platform.OS_LINUX, LOCALE_US);
ILoggingAdapter loggingAdapter = new PluginLogger(JBossToolsUsageTestActivator.getDefault());
- return new Tracker(eclipseSettings, loggingAdapter);
+ IURLBuildingStrategy urlStrategy = new GoogleAnalyticsUrlStrategy(eclipseSettings);
+ return new Tracker(urlStrategy, eclipseSettings.getUserAgent(), loggingAdapter);
}
}
More information about the jbosstools-commits
mailing list