Author: adietish Date: 2010-08-17 10:32:31 -0400 (Tue, 17 Aug 2010) New Revision: 24215 Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/JBossBundleGroups.java 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/Tracker.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/EclipseEnvironment.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/GoogleAnalyticsUrlStrategy.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BundleUtils.java trunk/usage/tests/org.jboss.tools.usage.test/GoogleAnalyticsUrlStrategyTest.launch trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageTest.launch trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java Log: [JBIDE-6376] partial bundle reporting implemented 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-17 13:55:29 UTC (rev 24214) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IGoogleAnalyticsParameters.java 2010-08-17 14:32:31 UTC (rev 24215) @@ -53,8 +53,8 @@ public static final String PARAM_COOKIES_UTMCSR = "utmcsr"; public static final String PARAM_COOKIES_UTMCCN = "utmccn"; public static final String PARAM_COOKIES_UTMCMD = "utmcmd"; + public static final String PARAM_COOKIES_KEYWORD = "utmctr"; - public static final String VALUE_TRACKING_CODE_VERSION = "4.7.2"; public static final String VALUE_NO_REFERRAL = "-"; public static final String VALUE_ENCODING_UTF8 = "UTF-8"; @@ -77,5 +77,7 @@ public String getUserAgent(); public String getUserId(); + + public String getKeyword(); } 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 13:55:29 UTC (rev 24214) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/Tracker.java 2010-08-17 14:32:31 UTC (rev 24215) @@ -14,7 +14,6 @@ import java.text.MessageFormat; import org.jboss.tools.usage.ITracker; -import org.jboss.tools.usage.internal.GoogleAnalyticsUrlStrategy; import org.jboss.tools.usage.internal.HttpGetMethod; /** Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/EclipseEnvironment.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/EclipseEnvironment.java 2010-08-17 13:55:29 UTC (rev 24214) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/EclipseEnvironment.java 2010-08-17 14:32:31 UTC (rev 24215) @@ -20,8 +20,10 @@ import org.eclipse.ui.PlatformUI; import org.jboss.tools.usage.googleanalytics.IGoogleAnalyticsParameters; import org.jboss.tools.usage.preferences.IUsageReportPreferenceConstants; +import org.jboss.tools.usage.util.BundleUtils; import org.jboss.tools.usage.util.PreferencesUtil; import org.jboss.tools.usage.util.StatusUtils; +import org.jboss.tools.usage.util.BundleUtils.IBundleEntryFilter; import org.osgi.framework.Bundle; import org.osgi.service.prefs.BackingStoreException; import org.osgi.service.prefs.Preferences; @@ -202,4 +204,26 @@ builder.append(System.currentTimeMillis()); return builder.toString(); } + + @Override + public String getKeyword() { + JBossBundleGroups jbossBundleGroups = new JBossBundleGroups(); + IBundleEntryFilter jbossToolsFilter = new BundleUtils.BundleSymbolicNameFilter("org\\.jboss\\.tools.+"); + IBundleEntryFilter compositeFilter = new BundleUtils.CompositeFilter( + jbossToolsFilter + , jbossBundleGroups ); + BundleUtils.getBundles(compositeFilter, JBossToolsUsageActivator.getDefault().getBundle().getBundleContext()); + + return bundleGroupsToKeywordString(jbossBundleGroups); + } + + private String bundleGroupsToKeywordString(JBossBundleGroups jbossBundleGroups) { + char delimiter = '-'; + StringBuilder builder = new StringBuilder(); + for (String bundleGroupId : jbossBundleGroups.getBundleGroupIds()) { + builder.append(bundleGroupId) + .append(delimiter); + } + return builder.toString(); + } } Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/GoogleAnalyticsUrlStrategy.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/GoogleAnalyticsUrlStrategy.java 2010-08-17 13:55:29 UTC (rev 24214) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/GoogleAnalyticsUrlStrategy.java 2010-08-17 14:32:31 UTC (rev 24215) @@ -127,14 +127,13 @@ appendParameter(IGoogleAnalyticsParameters.PARAM_PAGE_REQUEST, focusPoint.getContentURI(), builder); appendParameter(IGoogleAnalyticsParameters.PARAM_ACCOUNT_NAME, googleParameters.getAccountName(), builder); - appendCookies(focusPoint, builder); - builder.append(IGoogleAnalyticsParameters.AMPERSAND); + appendParameter(IGoogleAnalyticsParameters.PARAM_COOKIES, getCookies(focusPoint, builder), builder); appendParameter(IGoogleAnalyticsParameters.PARAM_GAQ, "1", false, builder); return builder.toString(); } - private void appendCookies(FocusPoint focusPoint, StringBuilder builder) { + private String getCookies(FocusPoint focusPoint, StringBuilder builder) { long timeStamp = System.currentTimeMillis(); StringBuilder stringBuilder = new StringBuilder(); @@ -158,14 +157,12 @@ .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)") - .append(IGoogleAnalyticsParameters.SEMICOLON); + .append("(none)"); + appendCookieKeyword(builder); + builder.append(IGoogleAnalyticsParameters.SEMICOLON); - String encodedString = EncodingUtils.checkedEncodeUtf8(stringBuilder.toString()); + return EncodingUtils.checkedEncodeUtf8(stringBuilder.toString()); - builder.append(IGoogleAnalyticsParameters.PARAM_COOKIES).append(IGoogleAnalyticsParameters.EQUALS_SIGN).append( - encodedString); - // builder.append(IGoogleAnalyticsParameters.PARAM_COOKIE_VALUES) // .append(IGoogleAnalyticsParameters.EQUALS_SIGN) // .append("__utma%3D") @@ -198,6 +195,21 @@ } + /** + * 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); + } + } + private String getRandomNumber() { return Integer.toString((int) (Math.random() * 0x7fffffff)); } Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/JBossBundleGroups.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/JBossBundleGroups.java (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/JBossBundleGroups.java 2010-08-17 14:32:31 UTC (rev 24215) @@ -0,0 +1,64 @@ +/******************************************************************************* + * Copyright (c) 2008 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.internal; + +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; + +import org.jboss.tools.usage.util.BundleUtils.IBundleEntryFilter; +import org.osgi.framework.Bundle; + +public class JBossBundleGroups implements IBundleEntryFilter { + + private static final String SEAM_ID = "seam"; + private static final String SMOOKS_ID = "smooks"; + + private Set<String> jbossBundleGroups = new HashSet<String>(); + + @Override + public boolean matches(Bundle bundle) { + String bundleName = bundle.getSymbolicName(); + if (isSmooks(bundleName)) { + addGroup(SMOOKS_ID); + } else if (isSeam(bundleName)) { + addGroup(SEAM_ID); + } + return false; + } + + private void addGroup(String groupId) { + jbossBundleGroups.add(groupId); + } + + private boolean isSeam(String bundleName) { + return "org.jboss.tools.seam.core".equals(bundleName) + | "org.jboss.tools.seam.doc.user".equals(bundleName) + | "org.jboss.tools.seam.pages.xml".equals(bundleName) + | "org.jboss.tools.seam.text.ext".equals(bundleName) + | "org.jboss.tools.seam.ui".equals(bundleName) + | "org.jboss.tools.seam.ui.pages".equals(bundleName) + | "org.jboss.tools.seam.xml".equals(bundleName) + | "org.jboss.tools.seam.xml.ui".equals(bundleName); + } + + private boolean isSmooks(String bundleName) { + return "org.jboss.tools.smooks.core".equals(bundleName) + | "org.jboss.tools.smooks.runtime".equals(bundleName) + | "org.jboss.tools.smooks.templating".equals(bundleName) + | "org.jboss.tools.smooks.ui".equals(bundleName); + } + + public Collection<String> getBundleGroupIds() { + return jbossBundleGroups; + } + +} \ No newline at end of file Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/JBossBundleGroups.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BundleUtils.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BundleUtils.java 2010-08-17 13:55:29 UTC (rev 24214) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BundleUtils.java 2010-08-17 14:32:31 UTC (rev 24215) @@ -86,7 +86,7 @@ * @param filters * the filters */ - public CompositeFilter(IBundleEntryFilter[] filters) { + public CompositeFilter(IBundleEntryFilter... filters) { this.filters = filters; } Modified: trunk/usage/tests/org.jboss.tools.usage.test/GoogleAnalyticsUrlStrategyTest.launch =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/GoogleAnalyticsUrlStrategyTest.launch 2010-08-17 13:55:29 UTC (rev 24214) +++ trunk/usage/tests/org.jboss.tools.usage.test/GoogleAnalyticsUrlStrategyTest.launch 2010-08-17 14:32:31 UTC (rev 24215) @@ -36,8 +36,8 @@ <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="com.jboss.jbds.product.product"/> <booleanAttribute key="run_in_ui_thread" value="true"/> -<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.variables@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.osgi.services@default:default,org.eclipse.jface.text@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.transforms.hook@default:false,javax.transaction@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.swt.cocoa.macosx@default:false,org.eclipse.osgi,org.eclipse.equinox.concurrent@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.core.databinding.property@default:default,org.eclipse.core.resources.compatibility@default:false,org.ecl! ipse.equinox.common@default:default,org.eclipse.core.commands@default:default,org.eclipse.ecf.identity@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.equinox.p2.repository@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.expressions@default:default,org.eclipse.jface@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.ui@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.swt@default:default,org.hamcrest.core@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.junit4@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.help@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.core.databinding.observable@default:default,javax.servlet@default:default,org.eclipse.core.ru! ntime@default:true,org.eclipse.equinox.p2.metadata.repository@! default: default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.ui.forms@default:default,org.eclipse.text@default:default,org.eclipse.ui.views@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.security@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.app@default:default,com.ibm.icu@default:default,org.eclipse.ecf@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.resources@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default,org.jboss.tools.usage.test@default:default"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.core.commands@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.core.resources@default:default,com.ibm.icu@default:default,org.eclipse.equinox.common@2:true,org.eclipse.core.contenttype@default:default,org.jboss.tools.seam.ui@default:default,org.jboss.tools.smooks.runtime@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.preferences@default:default,org.eclipse.osgi.services@default:default,org.eclipse.ecf@default:default,org.junit4@default:default,org.eclipse.ui@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.help@default:default,org.jboss.tools.seam.ui.pages@default:default,org.! eclipse.swt.cocoa.macosx@default:false,org.eclipse.ui.cocoa@default:false,org.eclipse.core.runtime@default:true,javax.servlet@default:default,org.eclipse.core.net@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.app@default:default,org.jboss.tools.smooks.core@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.text@default:default,org.eclipse.ui.ide@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.jface@default:default,org.eclipse.swt@default:default,javax.transaction@default:false,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.core.jobs@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.p2.metadata@de! fault:default,org.eclipse.jface.text@default:default,org.eclip! se.core. databinding.observable@default:default,org.eclipse.ui.forms@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.filesystem.macosx@default:false,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.equinox.p2.engine@default:default,org.eclipse.ui.views@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.p2.repository@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test@default:default,org.jboss.tools.usage@default:default"/> <booleanAttribute key="show_selected_only" value="false"/> <booleanAttribute key="tracing" value="false"/> <booleanAttribute key="useCustomFeatures" value="false"/> Modified: trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageTest.launch =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageTest.launch 2010-08-17 13:55:29 UTC (rev 24214) +++ trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageTest.launch 2010-08-17 14:32:31 UTC (rev 24215) @@ -36,8 +36,8 @@ <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="com.jboss.jbds.product.product"/> <booleanAttribute key="run_in_ui_thread" value="true"/> -<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.common@2:true,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.equinox.concurrent@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,com.ibm.icu@default:default,org.junit4@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.app@default:default,org.eclipse.core.resources@default:default,org.eclipse.ui.ide@default:default,org.eclipse.osgi@-1:true,org.eclipse.ecf@default:default,org.hamcrest.core@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.help@default:default,org.eclipse.core.jobs@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.contentty! pe@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.security.macosx@default:false,org.eclipse.equinox.p2.repository@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.osgi.services@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,javax.transaction@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.commands@default:default,org.eclipse.swt@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.security@default:default,org.eclipse.jface@default:default,org.eclipse.core.variables@default:default,org.eclipse.text@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.views@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.preferences@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core! .expressions@default:default,org.eclipse.ui@default:default,or! g.eclips e.core.runtime.compatibility.auth@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.swt.cocoa.macosx@default:false,org.eclipse.core.resources.compatibility@default:false,javax.servlet@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.jface.text@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.databinding@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.core.net@default:default,org.eclipse.equinox.p2.core@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage*1.0.0.qualifier@default:default,org.jboss.tools.usage.test@default:default"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.core.commands@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.core.resources@default:default,org.jboss.tools.seam.xml@default:default,com.ibm.icu@default:default,org.eclipse.equinox.common@2:true,org.eclipse.core.contenttype@default:default,org.jboss.tools.seam.ui@default:default,org.jboss.tools.seam.xml.ui@default:default,org.jboss.tools.smooks.runtime@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.preferences@default:default,org.eclipse.osgi.services@default:default,org.eclipse.ecf@default:default,org.junit4@default:default,org.eclipse.ui@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.runtime.compatibility.registry@default:fals! e,org.eclipse.help@default:default,org.jboss.tools.seam.ui.pages@default:default,org.eclipse.swt.cocoa.macosx@default:false,org.eclipse.ui.cocoa@default:false,org.eclipse.core.runtime@default:true,javax.servlet@default:default,org.eclipse.core.net@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.app@default:default,org.jboss.tools.seam.text.ext@default:default,org.jboss.tools.smooks.core@default:default,org.eclipse.equinox.registry@default:default,org.jboss.tools.jsf.vpe.seam@default:default,org.eclipse.text@default:default,org.eclipse.ui.ide@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.core.databinding@default:default,org.jboss.tools.seam.pages.xml@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.jface@default:default,org.jboss.t! ools.seam.core@default:default,org.eclipse.swt@default:default! ,javax.t ransaction@default:false,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.core.jobs@default:default,org.jboss.tools.smooks.templating@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.jface.text@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ui.forms@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.filesystem.macosx@default:false,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.equinox.p2.engine@default:default,org.eclipse.ui.views@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.p! 2.repository@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test@default:default,org.jboss.tools.usage@default:default"/> <booleanAttribute key="show_selected_only" value="false"/> <booleanAttribute key="tracing" value="false"/> <booleanAttribute key="useCustomFeatures" value="false"/> Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-08-17 13:55:29 UTC (rev 24214) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-08-17 14:32:31 UTC (rev 24215) @@ -576,8 +576,8 @@ +"__utmz%3D156030500.1281430767.1.1." +"utmcsr%3D(direct)%7C" +"utmccn%3D(direct)%7C" - +"utmcmd%3D(none)%3D%7C" - +"utmctr%3Dtest1%7Ctest2%7Ctest3%7Ctest4%7Ctest5%7Ctest6%7Ctest7%7Ctest8%7Ctest8%7Ctest9%7Ctest10%7Ctest11%7Ctest12%7Ctest13%7Ctest514%7Ctest14%7Ctest15%7Ctest16%7Ctest17%7Ctest18%7Ctest19%7Ctest20%7Ctest20%7Ctest21%7Ctest22%7Ctest23%7Ctest514%7Ctest24%7Ctest25%7Ctest26%7Ctest27%7Ctest28%7Ctest29%7Ctest30%3B" + +"utmcmd%3D(none)%7C" + +"utmctr%3Dtest1%7Ctest2%7Ctest3%7Ctest4%7Ctest5%7Ctest6%7Ctest7%7Ctest8%7Ctest8%7Ctest9%7Ctest10%7Ctest11%7Ctest12%7Ctest13%7Ctest514%7Ctest14%7Ctest15%7Ctest16%7Ctest17%7Ctest18%7Ctest19%7Ctest20%7Ctest20%7Ctest21%7Ctest22%7Ctest23%7Ctest514%7Ctest24%7Ctest25%7Ctest26%7Ctest27%7Ctest28%7Ctest29%7Ctest30%7Ctest31%3B" +"&gaq=1"; method.request(url); assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());