Author: adietish Date: 2010-09-09 14:00:10 -0400 (Thu, 09 Sep 2010) New Revision: 24848 Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IUserAgent.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/EclipseUserAgent.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseUserAgentFake.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseUserAgentTest.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsFocusPoint.java Removed: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmenTest.java 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/IGoogleAnalyticsParameters.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/EclipseEnvironment.java trunk/usage/tests/org.jboss.tools.usage.test/EclipseEnvironmentTest.launch trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageIntegrationTest.launch trunk/usage/tests/org.jboss.tools.usage.test/UsageTestSuite.launch trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmentFake.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java Log: [JBIDE-7034] UserAgent extracted to its own class. Updated tests and separated test cases 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-09-09 16:56:11 UTC (rev 24847) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java 2010-09-09 18:00:10 UTC (rev 24848) @@ -112,7 +112,7 @@ appendParameter(IGoogleAnalyticsParameters.PARAM_PAGE_TITLE, focusPoint.getContentTitle(), builder); // appendParameter(IGoogleAnalyticsParameters.PARAM_HID, // getRandomNumber(), builder); - appendParameter(IGoogleAnalyticsParameters.PARAM_FLASH_VERSION,googleParameters.getFlashVersion(), builder); + appendParameter(IGoogleAnalyticsParameters.PARAM_FLASH_VERSION, googleParameters.getFlashVersion(), builder); appendParameter(IGoogleAnalyticsParameters.PARAM_REFERRAL, googleParameters.getReferral(), builder); appendParameter(IGoogleAnalyticsParameters.PARAM_PAGE_REQUEST, focusPoint.getContentURI(), builder); 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-09-09 16:56:11 UTC (rev 24847) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IGoogleAnalyticsParameters.java 2010-09-09 18:00:10 UTC (rev 24848) @@ -27,10 +27,7 @@ public static final char PLUS_SIGN = '+'; public static final char DOT = '.'; public static final char SEMICOLON = ';'; - public static final char JAVA_LOCALE_DELIMITER = '_'; - public static final char BROWSER_LOCALE_DELIMITER = '-'; public static final char PIPE = '|'; - public static final char VERSION_DELIMITER = '.'; public static final String PARAM_HID = "utmhid"; public static final String PARAM_PAGE_REQUEST = "utmp"; Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IUserAgent.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IUserAgent.java (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IUserAgent.java 2010-09-09 18:00:10 UTC (rev 24848) @@ -0,0 +1,22 @@ +/******************************************************************************* + * 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; + +/** + * @author Andre Dietisheim + */ +public interface IUserAgent { + + public static final char BROWSER_LOCALE_DELIMITER = '-'; + + public String getBrowserLanguage(); + public String toString(); +} Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IUserAgent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/EclipseEnvironment.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/EclipseEnvironment.java 2010-09-09 16:56:11 UTC (rev 24847) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/EclipseEnvironment.java 2010-09-09 18:00:10 UTC (rev 24848) @@ -10,22 +10,20 @@ ******************************************************************************/ package org.jboss.tools.usage.reporting; -import java.text.MessageFormat; import java.util.Random; -import org.eclipse.core.runtime.IProduct; -import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.PlatformUI; import org.jboss.tools.usage.googleanalytics.AbstractGoogleAnalyticsParameters; import org.jboss.tools.usage.googleanalytics.IGoogleAnalyticsParameters; +import org.jboss.tools.usage.googleanalytics.IUserAgent; import org.jboss.tools.usage.internal.JBossToolsUsageActivator; import org.jboss.tools.usage.preferences.IUsageReportPreferenceConstants; import org.jboss.tools.usage.util.BundleUtils; -import org.jboss.tools.usage.util.PreferencesUtils; import org.jboss.tools.usage.util.BundleUtils.IBundleEntryFilter; +import org.jboss.tools.usage.util.PreferencesUtils; import org.osgi.framework.Bundle; /** @@ -34,12 +32,8 @@ public class EclipseEnvironment extends AbstractGoogleAnalyticsParameters implements IGoogleAnalyticsParameters { private static final String SYSPROP_JAVA_VERSION = "java.version"; - private static final String USERAGENT_WIN = "{0}/{1} (Windows; U; Windows NT 6.1; {2})"; //$NON-NLS-1$ - private static final String USERAGENT_MAC = "{0}/{1} (Macintosh; U; Intel Mac OS X 10.5; {2})"; //$NON-NLS-1$ - private static final String USERAGENT_LINUX = "{0}/{1} (X11; U; Linux i686; {2})"; //$NON-NLS-1$ - private static final char BUNDLE_GROUP_DELIMITER = '-'; private static final String JBOSS_TOOLS_BUNDLES_PREFIX = "org\\.jboss\\.tools.+"; //$NON-NLS-1$ - private static final String ECLIPSE_RUNTIME_BULDEID = "org.eclipse.core.runtime"; //$NON-NLS-1$ + private static final char BUNDLE_GROUP_DELIMITER = '-'; private String screenResolution; private String screenColorDepth; @@ -49,11 +43,13 @@ private String lastVisit; private String currentVisit; private long visitCount; + private IUserAgent eclipseUserAgent; public EclipseEnvironment(String accountName, String hostName, String referral, IEclipsePreferences preferences) { super(accountName, hostName, referral); this.random = new Random(); this.preferences = preferences; + eclipseUserAgent = createEclipseUserAgent(); initScreenSettings(); initVisits(); } @@ -83,26 +79,12 @@ visitCount = preferences.getLong(IUsageReportPreferenceConstants.VISIT_COUNT, 1); } - public String getBrowserLanguage() { - String nl = getNL(); - if (nl == null) { - return ""; //$NON-NLS-1$ - } - - int indexOf = nl.indexOf(JAVA_LOCALE_DELIMITER); //$NON-NLS-1$ - if (indexOf <= 0) { - return nl; - } - - StringBuilder builder = new StringBuilder(); - builder.append(nl.substring(0, indexOf)); - builder.append(BROWSER_LOCALE_DELIMITER); - builder.append(nl.substring(indexOf + 1)); - return builder.toString(); + protected IUserAgent createEclipseUserAgent() { + return new EclipseUserAgent(); } - protected String getNL() { - return Platform.getNL(); //$NON-NLS-1$ + public String getBrowserLanguage() { + return eclipseUserAgent.getBrowserLanguage(); } public String getScreenResolution() { @@ -126,77 +108,9 @@ } public String getUserAgent() { - - String productId = getApplicationName(); - String productVersion = getApplicationVersion(); - String browserLanguage = getBrowserLanguage(); - - /** - * Google API for android: this.userAgent = String.format( - * "GoogleAnalytics/%s (Linux; U; Android %s; %s-%s; %s; Build/%s)" , - * new Object[] { "1.0" , Build.VERSION.RELEASE , - * (localLocale.getLanguage() != null) ? - * localLocale.getLanguage().toLowerCase() : "en" , - * (localLocale.getCountry() != null) ? - * localLocale.getCountry().toLowerCase() : "" , Build.MODEL, Build.ID - * }); - */ - - return MessageFormat.format( - getUserAgentPattern(getOS()) - , productId - , productVersion - , browserLanguage - ); + return eclipseUserAgent.toString(); } - private String getUserAgentPattern(String os) { - String userAgentPattern = ""; //$NON-NLS-1$ - /* - * TODO: implement architecture (i686, x86_64 etc.), Windows version, MacOS version etc. - */ - if (Platform.OS_LINUX.equals(os)) { - return USERAGENT_LINUX; //$NON-NLS-1$ - } else if (Platform.OS_MACOSX.equals(os)) { - return USERAGENT_MAC; //$NON-NLS-1$ - } else if (Platform.OS_WIN32.equals(os)) { - return USERAGENT_WIN; //$NON-NLS-1$ - } - return userAgentPattern; - } - - protected String getOS() { - return Platform.getOS(); - } - - protected String getApplicationName() { - return getApplicationBundle().getSymbolicName(); - } - - protected String getApplicationVersion() { - String fullVersion = getApplicationBundle().getVersion().toString(); - int productVersionStart = fullVersion.lastIndexOf(VERSION_DELIMITER); - if (productVersionStart > 0) { - return fullVersion.substring(0, productVersionStart); - } else { - return fullVersion; - } - } - - /** - * Returns the bundle that launched the application that this class runs in. - * - * @return the defining bundle - */ - private Bundle getApplicationBundle() { - IProduct product = Platform.getProduct(); - if (product != null) { - return product.getDefiningBundle(); - } else { - return Platform.getBundle(ECLIPSE_RUNTIME_BULDEID); - } - } - public String getUserId() { String userId = preferences.get(IUsageReportPreferenceConstants.ECLIPSE_INSTANCE_ID, null); if (userId == null) { Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/EclipseUserAgent.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/EclipseUserAgent.java (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/EclipseUserAgent.java 2010-09-09 18:00:10 UTC (rev 24848) @@ -0,0 +1,135 @@ +/******************************************************************************* + * 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.reporting; + +import java.text.MessageFormat; + +import org.eclipse.core.runtime.IProduct; +import org.eclipse.core.runtime.Platform; +import org.jboss.tools.usage.googleanalytics.IUserAgent; +import org.osgi.framework.Bundle; + +/** + * @author Andre Dietisheim + */ +public class EclipseUserAgent implements IUserAgent { + + public static final char JAVA_LOCALE_DELIMITER = '_'; + + private static final String ECLIPSE_RUNTIME_BULDEID = "org.eclipse.core.runtime"; //$NON-NLS-1$ + + private static final String USERAGENT_WIN = "{0}/{1} (Windows; U; Windows NT 6.1; {2})"; //$NON-NLS-1$ + private static final String USERAGENT_MAC = "{0}/{1} (Macintosh; U; Intel Mac OS X 10.5; {2})"; //$NON-NLS-1$ + private static final String USERAGENT_LINUX = "{0}/{1} (X11; U; Linux i686; {2})"; //$NON-NLS-1$ + + public static final char VERSION_DELIMITER = '.'; + + private String browserLanguage; + + private String createBrowserLanguage() { + String nl = getNL(); + if (nl == null) { + return ""; //$NON-NLS-1$ + } + + int indexOf = nl.indexOf(JAVA_LOCALE_DELIMITER); //$NON-NLS-1$ + if (indexOf <= 0) { + return nl; + } + + StringBuilder builder = new StringBuilder(); + builder.append(nl.substring(0, indexOf)); + builder.append(BROWSER_LOCALE_DELIMITER); + builder.append(nl.substring(indexOf + 1)); + return builder.toString(); + } + + protected String getNL() { + return Platform.getNL(); + } + + public String getBrowserLanguage() { + if (browserLanguage == null) { + browserLanguage = createBrowserLanguage(); + } + return browserLanguage; + } + + public String toString() { + String productId = getApplicationName(); + String productVersion = getApplicationVersion(); + + /** + * Google API for android: this.userAgent = String.format( + * "GoogleAnalytics/%s (Linux; U; Android %s; %s-%s; %s; Build/%s)" , + * new Object[] { "1.0" , Build.VERSION.RELEASE , + * (localLocale.getLanguage() != null) ? + * localLocale.getLanguage().toLowerCase() : "en" , + * (localLocale.getCountry() != null) ? + * localLocale.getCountry().toLowerCase() : "" , Build.MODEL, Build.ID + * }); + */ + + return MessageFormat.format( + getUserAgentPattern(getOS()) + , productId + , productVersion + , getBrowserLanguage() + ); + } + + protected String getOS() { + return Platform.getOS(); + } + + protected String getApplicationName() { + return getApplicationBundle().getSymbolicName(); + } + + protected String getApplicationVersion() { + String fullVersion = getApplicationBundle().getVersion().toString(); + int productVersionStart = fullVersion.lastIndexOf(VERSION_DELIMITER); + if (productVersionStart > 0) { + return fullVersion.substring(0, productVersionStart); + } else { + return fullVersion; + } + } + + /** + * Returns the bundle that launched the application that this class runs in. + * + * @return the defining bundle + */ + private Bundle getApplicationBundle() { + IProduct product = Platform.getProduct(); + if (product != null) { + return product.getDefiningBundle(); + } else { + return Platform.getBundle(ECLIPSE_RUNTIME_BULDEID); + } + } + + private String getUserAgentPattern(String os) { + String userAgentPattern = ""; //$NON-NLS-1$ + /* + * TODO: implement architecture (i686, x86_64 etc.), Windows version, MacOS version etc. + */ + if (Platform.OS_LINUX.equals(os)) { + return USERAGENT_LINUX; //$NON-NLS-1$ + } else if (Platform.OS_MACOSX.equals(os)) { + return USERAGENT_MAC; //$NON-NLS-1$ + } else if (Platform.OS_WIN32.equals(os)) { + return USERAGENT_WIN; //$NON-NLS-1$ + } + return userAgentPattern; + } +} Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/EclipseUserAgent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/usage/tests/org.jboss.tools.usage.test/EclipseEnvironmentTest.launch =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/EclipseEnvironmentTest.launch 2010-09-09 16:56:11 UTC (rev 24847) +++ trunk/usage/tests/org.jboss.tools.usage.test/EclipseEnvironmentTest.launch 2010-09-09 18:00:10 UTC (rev 24848) @@ -15,7 +15,7 @@ <booleanAttribute key="includeOptional" value="true"/> <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmenTest.java"/> +<listEntry value="/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseUserAgentTest.java"/> </listAttribute> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> <listEntry value="1"/> @@ -29,7 +29,7 @@ <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> -<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.usage.test.EclipseEnvironmenTest"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.usage.test.EclipseUserAgentTest"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.usage.test"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> Modified: trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageIntegrationTest.launch =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageIntegrationTest.launch 2010-09-09 16:56:11 UTC (rev 24847) +++ trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageIntegrationTest.launch 2010-09-09 18:00:10 UTC (rev 24848) @@ -12,6 +12,7 @@ <booleanAttribute key="clearwslog" value="false"/> <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBossToolsUsageIntegrationTest"/> <booleanAttribute key="default" value="false"/> +<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.gwt.core,org.jboss.tools.gwt.ui,org.jboss.tools.common.model,org.jboss.tools.common"/> <booleanAttribute key="includeOptional" value="true"/> <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> @@ -36,8 +37,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.app@default:default,org.eclipse.datatools.sqltools.debugger.core.ui@default:default,org.eclipse.datatools.enablement.postgresql@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.jst.common.frameworks@default:default,org.eclipse.ui.browser@default:default,org.eclipse.datatools.enablement.ingres@default:default,org.eclipse.wst.xsl@default:default,org.eclipse.core.runtime@default:true,org.eclipse.jem.beaninfo@default:default,org.eclipse.datatools.sqltools.editor.core@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.sdk@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.datatools.enablement.msft.sqlserver@default:default,org.eclipse.datatools.sqltools.plan@default:default,org.eclipse.ui.intro.uni! versal@default:default,org.eclipse.datatools.sqltools.parsers.sql@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.jem@default:default,org.eclipse.equinox.p2.ui@default:default,org.hibernate.eclipse.mapper@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.jst.j2ee.infopop@default:default,org.eclipse.jst.j2ee.navigator.ui@default:default,org.jboss.tools.common.gef@default:default,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.datatools.connectivity.db.generic.ui@default:default,org.jboss.tools.jmx.ui@default:default,org.eclipse.wst.xsl.xalan@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.datatools.connectivity.ui@default:default,org.eclipse.wst.ws@default:default,org.eclipse.wst.xml.ui@default:default,org.jboss.tools.seam.pages.xml@! default:default,org.eclipse.wst.ws.infopop@default:default,org! .eclipse .datatools.enablement.sap.maxdb@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.hamcrest.core@default:default,org.eclipse.jpt.eclipselink.core@default:default,org.eclipse.emf.importer.java@default:default,org.eclipse.jst.jsp.ui@default:default,org.jboss.ide.eclipse.as.classpath.ui@default:default,org.eclipse.jface@default:default,org.eclipse.jst.server.core@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.jst.common.project.facet.core@default:default,org.eclipse.jst.ws.axis.consumption.core@default:default,org.eclipse.jst.j2ee.webservice@default:default,org.eclipse.datatools.sqltools.parsers.sql.query@default:default,org.eclipse.jst.ws.consumption.ui@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ui.views@default:default,org.eclipse.wst.server.ui@default:default,org.eclipse.wst.ws.explorer@default:default,org.eclipse.wst.wsi.ui.doc.user@default:default,org.eclipse.wst.internet.cache@default:default,org.e! clipse.jpt.eclipselink.ui@default:default,org.jboss.tools.jst.web.ui@default:default,org.eclipse.datatools.sqltools.parsers.sql.xml.query@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.datatools.connectivity.dbdefinition.genericJDBC@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.datatools.sqltools.tabledataeditor@default:default,org.eclipse.help.base@default:default,org.eclipse.jpt.db@default:default,org.eclipse.jst.ejb.ui@default:default,org.eclipse.jdt.launching.macosx@default:default,org.eclipse.wst.css.ui@default:default,org.eclipse.datatools.modelbase.sql.edit@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.apache.jasper@default:default,org.eclipse.datatools.connectivity.apache.derby.ui@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.wst.standard.schemas@default:default,org.eclipse.datatools! .enablement.mysql@default:default,org.eclipse.pde.doc.user@def! ault:def ault,org.eclipse.pde.core@default:default,org.eclipse.jst.ws.ui@default:default,org.eclipse.wst.wsi.ui@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.pde.runtime@default:default,org.jboss.tools.hibernate.ui@default:default,org.eclipse.ui@default:default,org.eclipse.core.databinding@default:default,org.apache.commons.logging*1.0.4.v200904062259@default:default,org.eclipse.wst.xsl.doc@default:default,org.eclipse.datatools.sqltools.db.derby.ui@default:default,org.eclipse.datatools.sqltools.sql@default:default,org.eclipse.datatools.enablement.mysql.dbdefinition@default:default,org.eclipse.datatools.enablement.hsqldb.dbdefinition@default:default,org.eclipse.datatools.connectivity.db.generic@default:default,org.eclipse.team.ui@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.jst.jsf.common@default:default,org.jboss.ide.eclipse.as.ssh@default:default,org.eclipse.jface.! databinding@default:default,org.eclipse.wst.dtdeditor.doc.user@default:default,org.eclipse.jem.workbench@default:default,org.eclipse.jst.ws.axis2.ui@default:default,org.eclipse.core.resources@default:default,org.eclipse.datatools.enablement.sqlite.dbdefinition@default:default,org.eclipse.core.expressions@default:default,org.eclipse.datatools.common.doc.user@default:default,org.eclipse.datatools.enablement.sybase@default:default,org.eclipse.emf@default:default,org.eclipse.datatools.enablement.oracle@default:default,org.eclipse.ui.cocoa@default:false,org.jboss.ide.eclipse.archives.webtools@default:default,org.eclipse.jst.ejb.ui.infopop@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.datatools.modelbase.sql@default:default,org.eclipse.datatools.enablement.postgresql.ui@default:default,org.eclipse.wst.common.modulecore@default:default,org.eclipse.wst.validation.ui@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.equinox.p2.cons! ole@default:default,org.eclipse.wst.validation@default:default! ,org.ecl ipse.datatools.enablement.sybase.ase.ui@default:default,org.eclipse.wst.server.ui.infopop@default:default,org.eclipse.wst.sse.core@default:default,org.sat4j.pb@default:default,org.apache.bcel@default:default,org.apache.lucene.analysis@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.jst.server.generic.oc4j@default:default,org.eclipse.datatools.help@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.datatools.enablement.jdt.classpath@default:default,org.eclipse.emf.mapping.ui@default:default,org.eclipse.datatools.sqltools.ddlgen.ui@default:default,org.eclipse.jst.ws.axis.infopop@default:default,org.eclipse.wst.command.env.core@default:default,org.eclipse.update.configurator@3:true,org.apache.oro@default:default,org.eclipse.datatools.modelbase.sql.query.edit@default:default,org.eclipse.datatools.enablement.oda.xml@default:default,org.eclipse.datatools.sqltools.sqleditor@default:default,org! .eclipse.wst.xml.core@default:default,org.eclipse.jdt.launching.ui.macosx@default:default,org.eclipse.wst.wsdl@default:default,org.eclipse.datatools.sqltools.debugger.core@default:default,org.eclipse.datatools.enablement.sqlite.ui@default:default,org.eclipse.search@default:default,org.eclipse.equinox.ds@default:true,org.eclipse.datatools.enablement.sybase.ui@default:default,org.apache.commons.discovery@default:default,org.apache.wsil4j@default:default,org.eclipse.wst.xsl.launching@default:default,org.eclipse.equinox.security.ui@default:default,org.junit*3.8.2.v3_8_2_v20100427-1100@default:default,org.eclipse.jdt.launching@default:default,org.apache.axis@default:default,org.eclipse.ecf.identity@default:default,org.jboss.tools.common.text.xml@default:default,org.eclipse.core.net@default:default,org.eclipse.wst.wsdl.validation@default:default,org.hibernate.eclipse.jdt.ui@default:default,org.eclipse.datatools.sqltools.db.generic@default:default,org.eclipse.datatools.modelbase.d! erby@default:default,org.eclipse.jdt.apt.core@default:default,! org.ecli pse.jdt.debug.ui@default:default,org.eclipse.datatools.enablement.sybase.ase.models@default:default,org.eclipse.wst.xsl.jaxp.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.wst.xmleditor.doc.user@default:default,org.eclipse.jst.j2ee@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.datatools.connectivity.doc.user@default:default,org.eclipse.jst.pagedesigner.jsf.ui@default:default,org.eclipse.jst.ws.consumption.ui.doc.user@default:default,org.eclipse.emf.codegen.ui@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.datatools.enablement.sybase.models@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.ant.core@default:default,org.eclipse.wst.jsdt.support.ie@default:default,org.eclipse.wst.xsdeditor.doc.user@default:default,org.eclipse.ecf@default:default,org.eclipse.datatools.enablement.finfo@default:default,org.eclipse.datatools.conne! ctivity.sqm.core@default:default,org.jboss.ide.eclipse.as.ui.mbeans@default:default,org.jboss.tools.common.ui@default:default,org.eclipse.team.cvs.ui@default:default,org.jboss.tools.common.resref.core@default:default,org.eclipse.datatools.enablement.ibm.db2.luw.ui@default:default,org.eclipse.jst.ws@default:default,org.eclipse.help.appserver@default:default,org.eclipse.jst.j2ee.jca@default:default,org.apache.xerces@default:default,org.eclipse.jst.server.generic.jonas@default:default,org.jboss.tools.hibernate.xml.ui@default:default,org.eclipse.help.webapp@default:default,org.apache.commons.httpclient*3.1.0.v20080605-1935@default:default,org.eclipse.wst.web.ui@default:default,org.jboss.ide.eclipse.as.wtp.core@default:default,org.eclipse.jst.servlet.ui.infopop@default:default,org.eclipse.datatools.enablement.sqlite@default:default,org.eclipse.jpt.gen@default:default,org.eclipse.jst.j2ee.xdoclet.runtime@default:default,org.eclipse.platform@default:default,org.eclipse.jdt.debug@d! efault:default,org.eclipse.datatools.enablement.oracle.ui@defa! ult:defa ult,org.eclipse.jpt.doc.user@default:default,org.eclipse.jpt.utility@default:default,org.hibernate.eclipse.console@default:default,org.eclipse.core.commands@default:default,org.eclipse.pde.build@default:default,org.jboss.tools.jst.jsp@default:default,org.eclipse.jst.j2ee.ejb@default:default,org.eclipse.jpt.core@default:default,javax.xml@default:default,org.eclipse.datatools.sqltools.result@default:default,org.eclipse.jst.ejb.doc.user@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.emf.ant@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.datatools.enablement.hsqldb.ui@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.datatools.sqltools.schemaobjecteditor.ui@default:default,org.eclipse.datatools.enablement.hsqldb@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.debug.core@default:default,org.eclipse.core.boot@default:default,org.eclipse.datatools.enablement.oda.x! ml.ui@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.emf.mapping.ecore2xml.ui@default:default,org.jboss.tools.common.el.ui@default:default,org.mortbay.jetty.server@default:default,org.eclipse.equinox.util@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.datatools.sqltools.sqlscrapbook@default:default,org.eclipse.jst.ws.infopop@default:default,org.eclipse.jst.j2ee.ui@default:default,org.eclipse.jst.ws.axis.consumption.ui@default:default,org.hibernate.eclipse.jdt.apt.ui@default:default,org.eclipse.jst.j2ee.webservice.ui@default:default,org.eclipse.jst.common.annotations.controller@default:default,org.eclipse.wst.xsl.jaxp.debug.ui@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.jst.jsf.common.ui@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.datatools.connectivity.oda@default:default,org.eclipse.jst.common.project.facet.ui@default:default,org.eclipse.emf.edit@default:default,org.e! clipse.emf.converter@default:default,org.eclipse.jst.ws.consum! ption.in fopop@default:default,org.eclipse.datatools.enablement.ibm.informix.ui@default:default,org.eclipse.ui.navigator@default:default,org.jboss.tools.common.text.ext@default:default,org.jboss.tools.seam.ui.pages@default:default,org.eclipse.datatools.enablement.ibm.db2.iseries@default:default,org.eclipse.wst.wsdl.ui@default:default,org.eclipse.datatools.connectivity.oda.flatfile.ui@default:default,org.eclipse.ui.intro@default:default,org.eclipse.jem.beaninfo.vm.common@default:default,org.eclipse.ui.cheatsheets@default:default,org.jboss.tools.seam.core@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.ant.ui@default:default,org.eclipse.datatools.enablement.sap.maxdb.ui@default:default,org.eclipse.datatools.connectivity.sqm.server.ui@default:default,org.eclipse.datatools.enablement.ibm.db2.iseries.dbdefinition@default:default,org.eclipse.wst.command.env.infopop@default:default,org.eclipse.core.jobs@default:default,org.jboss.tools.seam.xml@default:default,org! .eclipse.equinox.p2.repository.tools@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.core.contenttype@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.datatools.sqltools.sql.ui@default:default,org.eclipse.jem.beaninfo.vm@default:default,javax.activation@default:default,org.eclipse.wst.xml.ui.infopop@default:default,org.jboss.tools.common.projecttemplates@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.wst.command.env.doc.user@default:default,org.eclipse.wst.xml.xpath.core@default:default,org.jboss.tools.hibernate.xml@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.datatools.enablement.msft.sqlserver.dbdefinition@default:default,org.eclipse.wst.xsl.core@default:default,org.eclipse.wst.jsdt.web.core@default:default,org.eclipse.wst.server.preview@default:default,org.eclipse.xsd.edit@default:default,org.e! clipse.datatools.enablement.ingres.dbdefinition@default:defaul! t,org.ec lipse.wst.sse.ui.infopop@default:default,org.jboss.tools.seam.xml.ui@default:default,org.eclipse.team.core@default:default,org.eclipse.emf.importer.ecore@default:default,org.eclipse.datatools.enablement.ingres.ui@default:default,org.eclipse.ui.console@default:default,org.eclipse.jst.jsf.core@default:default,org.eclipse.wst.wsdl.ui.doc.user@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.equinox.common@2:true,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.jst.ws.axis2.consumption.core@default:default,org.eclipse.datatools.sqltools.sqlbuilder@default:default,org.eclipse.wst.ws.ui@default:default,org.eclipse.datatools.sqltools.result.ui@default:default,org.eclipse.jst.jsf.standard.tagsupport@default:default,org.eclipse.osgi.util@default:default,org.eclipse.wst.server.http.ui@default:default,org.eclipse.datatools.sqltools.parsers.sql.lexer@default:default,org.jboss.tools.jst.web@default:default,org.eclipse.debug.ui@default:default,org.eclip! se.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.emf.mapping.ecore2ecore.editor@default:default,org.eclipse.jst.pagedesigner.jsp.core@default:default,org.eclipse.wst.xsl.jaxp.debug@default:default,org.apache.xml.serializer@default:default,org.eclipse.datatools.enablement.oda.ws@default:default,org.eclipse.datatools.enablement.oda.ws.ui@default:default,org.eclipse.jst.j2ee.ejb.annotations.emitter@default:default,org.jboss.tools.jst.text.ext@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.datatools.enablement.sybase.ase@default:default,org.eclipse.wst.doc.user@default:default,org.eclipse.jst.j2ee.doc.user@default:default,org.apache.commons.lang*2.3.0.v201005080501@default:default,org.eclipse.jst.common.annotations.ui@default:default,org.eclipse.wst.jsdt.ui@default:default,org.eclipse.team.svn@default:default,org.eclipse.jst.jsf.facesconfig@default:default,! org.eclipse.datatools.connectivity@default:default,org.eclipse! .jst.com mon.annotations.core@default:default,org.eclipse.datatools.enablement.ibm.db2.iseries.ui@default:default,org.jboss.ide.eclipse.as.ui@default:default,org.eclipse.emf.mapping.ecore.editor@default:default,java_cup.runtime@default:default,javax.xml.rpc@default:default,com.jcraft.jsch@default:default,org.eclipse.wst.html.ui@default:default,org.jboss.ide.eclipse.as.core@default:default,org.eclipse.emf.importer@default:default,org.eclipse.datatools.enablement.sybase.asa.dbdefinition@default:default,org.polarion.eclipse.team.svn.connector@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.jst.server.generic.jboss@default:default,net.sourceforge.lpg.lpgjavaruntime@default:default,org.eclipse.wst.jsdt.doc@default:default,org.jdom@default:default,javax.wsdl*1.5.1.v201005080630@default:default,org.eclipse.datatools.modelbase.sql.xml.query@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.ecl! ipse.datatools.enablement.ibm.informix@default:default,org.jboss.tools.jst.web.kb@default:default,org.eclipse.ui.editors@default:default,org.eclipse.datatools.sqltools.doc.user.contexts@default:default,org.eclipse.ui.ide@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.pde.ua.ui@default:default,org.eclipse.wst.html.ui.infopop@default:default,org.eclipse.datatools.sqltools.common.ui@default:default,org.eclipse.datatools.modelbase.dbdefinition@default:default,org.eclipse.team.svn.core@default:default,org.eclipse.jst.j2ee.core@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.jpt.branding@default:default,org.eclipse.jst.ws.axis.creation.ui@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.wst.xsl.ui@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.wst.ws.service.policy@default:default,org.eclipse.emf.ecore.change! @default:default,org.eclipse.datatools.connectivity.oda.design! .ui@defa ult:default,org.eclipse.osgi@-1:true,org.eclipse.team.svn.help@default:default,org.eclipse.datatools.enablement.ibm.db2.zseries@default:default,org.jboss.tools.common.model.ui@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.core.variables@default:default,org.eclipse.datatools.doc.user@default:default,org.eclipse.datatools.connectivity.console.profile@default:default,org.eclipse.emf.common@default:default,org.eclipse.wst.web@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.jst.jee.ejb@default:default,org.jboss.ide.eclipse.as.wtp.ui@default:default,org.eclipse.ui.forms@default:default,org.polarion.eclipse.team.svn.connector.svnkit16@default:default,javax.servlet@default:default,org.eclipse.wst.ws.service.policy.ui@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.jst.server.ui.doc.user@default:default,org.eclipse.wst.server.discovery@default:default,org.eclipse.core.databinding.propert! y@default:default,org.eclipse.datatools.intro@default:default,org.eclipse.jem.proxy@default:default,org.eclipse.datatools.sqltools.routineeditor@default:default,org.eclipse.jst.ws.axis.ui.doc.user@default:default,org.apache.lucene@default:default,org.eclipse.wst.xsl.saxon@default:default,org.apache.velocity@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.wst.internet.monitor.ui@default:default,org.eclipse.ui.net@default:default,org.eclipse.jst.jee.web@default:default,org.eclipse.jst.server.generic.ui@default:default,org.eclipse.jst.jee.ui@default:default,org.eclipse.datatools.connectivity.sqm.core.ui@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.wst.jsdt.web.support.jsp@default:default,org.apache.log4j*1.2.15.v201005080500@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.datatools.enablement.sybase.asa.ui@default:default,org.eclipse.wst.dtd.ui@default:default,org.eclipse.datat! ools.enablement.ibm.ui@default:default,org.eclipse.jst.server.! ui@defau lt:default,org.eclipse.jst.j2ee.ejb.annotations.ui@default:default,org.eclipse.wst.xsd.core@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,javax.xml.soap@default:default,org.eclipse.jst.server.tomcat.ui@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.jdt.doc.user@default:default,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.eclipse.datatools.sqltools.db.derby@default:default,org.junit4@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.datatools.sqltools.routineeditor.ui@default:default,org.eclipse.wst.common.frameworks@default:default,org.sat4j.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.wst.dtd.ui.infopop@default:default,org.eclipse.datatools.connectivity.ui.dse@default:default,org.hibernate.eclipse@default:default,org.eclipse.ui.workbench@default:default,org.jboss.tools.common@default:default,org.eclips! e.datatools.sqltools.data.core@default:default,org.eclipse.wst.command.env@default:default,org.eclipse.datatools.connectivity.oda.consumer@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.wst.dtd.core@default:default,org.eclipse.datatools.sqltools.db.generic.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jst.server.preview.adapter@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.datatools.sqltools.schemaobjecteditor.ui.pages@default:default,org.apache.log4j*1.2.13.v200903072027@default:default,org.eclipse.pde.ui@default:default,org.eclipse.wst.css.core@default:default,org.jboss.tools.jsf.text.ext@default:default,org.eclipse.pde@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.jem.util@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.datatools.enablement.mysql.ui@default:default,org.eclipse.wst.html.core@default:default,org.apache.xalan@default:def! ault,org.eclipse.wst.common.environment@default:default,org.ec! lipse.em f.importer.rose@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.datatools.enablement.sap.maxdb.dbdefinition@default:default,javax.servlet.jsp@default:default,org.eclipse.jst.jee@default:default,org.eclipse.jst.server.generic.core@default:default,org.eclipse.jst.servlet.ui@default:default,org.eclipse.update.ui@default:default,org.eclipse.jst.ws.axis2.creation.ui@default:default,org.eclipse.jst.ws.uddiregistry@default:default,org.eclipse.wst.wsi@default:default,javax.wsdl*1.6.2.v201005080631@default:default,org.eclipse.wst.xml.xpath2.processor@default:default,org.eclipse.rcp@default:default,org.jboss.tools.hibernate.jpt.ui@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.wst.sse.doc.user@default:default,org.jboss.tools.common.model@default:default,org.eclipse.wst.webtools.doc.user@default:default,org.eclipse.ui.externalto! ols@default:default,org.eclipse.datatools.sqltools.schemaobjecteditor@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.security@default:default,org.eclipse.jst.server.tomcat.core@default:default,org.eclipse.cvs@default:default,org.eclipse.jst.j2ee.ejb.annotation.model@default:default,org.eclipse.jst.j2ee.jca.ui@default:default,org.eclipse.jst.ws.creation.ejb.ui@default:default,org.eclipse.wst.common.uriresolver@default:default,org.hibernate.eclipse.help@default:default,org.eclipse.datatools.modelbase.sql.query@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.xsd@default:default,org.eclipse.wst.web.ui.infopop@default:default,org.eclipse.pde.ds.ui@default:default,org.apache.xml.resolver@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.wst.xsd.ui@default:default,org.eclipse.jpt.eclipselink.core.ddlgen@default:default,org.eclipse.datatools.connectivity.oda.template.ui@default:default,org.eclipse.wst! .common.project.facet.ui@default:default,org.eclipse.wst.serve! r.core@d efault:default,org.eclipse.datatools.connectivity.doc.user.contexts@default:default,org.eclipse.draw2d@default:default,org.apache.ant@default:default,org.eclipse.jst.jsf.common.runtime@default:default,org.jboss.ide.eclipse.as.classpath.core@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.datatools.connectivity.apache.derby.dbdefinition@default:default,org.eclipse.swt@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.datatools.sqltools.editor.core.ui@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jst.pagedesigner@default:default,org.eclipse.jst.ws.axis2.consumption.ui@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.mapping.ecore@default:default,org.eclipse.wst.common.infopop@default:default,org.eclipse.datatools.sqltools.doc.user@default:default,org.eclipse.datatools.connectivity.oda.flatfile@default:default,org.eclipse.datatools.! enablement.ibm.db2.zseries.ui@default:default,org.eclipse.jst.jsf.apache.trinidad.tagsupport@default:default,org.eclipse.jst.jsf.doc.user@default:default,org.eclipse.jst.jsf.facesconfig.ui@default:default,org.eclipse.text@default:default,org.eclipse.jst.j2ee.web@default:default,org.mortbay.jetty.util@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.jface.text@default:default,org.eclipse.jst.ws.axis2.ui.doc.user@default:default,org.eclipse.wst.jsdt.manipulation@default:default,org.eclipse.jdt.core@default:default,org.apache.commons.collections@default:default,org.apache.commons.codec*1.3.0.v20100106-1700@default:default,org.eclipse.jst.jsf.ui@default:default,org.eclipse.ui.workbench.compatibility@default:false,javax.mail@default:default,org.eclipse.jst.jsp.core@default:default,org.eclipse.compare@default:default,org.eclipse.jdt@default:default,org.eclipse.datatools.enablement.msft.sqlserver.ui@default:default,org.eclipse.jst.server.websphere.core@d! efault:default,org.eclipse.jst.ws.doc.user@default:default,org! .eclipse .datatools.enablement.sybase.ase.dbdefinition@default:default,org.eclipse.datatools.enablement.sybase.asa.models@default:default,org.jboss.tools.jmx.core@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jst.server.ui.infopop@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.emf.exporter@default:default,org.eclipse.datatools.enablement.postgresql.dbdefinition@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.datatools.connectivity.apache.derby@default:default,org.eclipse.wst.jsdt.web.ui@default:default,org.jboss.ide.eclipse.archives.core@default:default,org.objectweb.asm@default:default,org.eclipse.datatools.connectivity.oda.design@default:default,org.eclipse.wst.xsl.debug.ui@default:default,org.eclipse.datatools.enablement.ibm.db2.zseries.dbdefinition@default:default,org.eclipse.jpt.ui@default:default,org.eclipse.wst.xml.xpath.ui@default:defa! ult,org.eclipse.jst.standard.schemas@default:default,org.eclipse.team.svn.ui@default:default,org.eclipse.gef@default:default,org.eclipse.jsch.core@default:default,org.eclipse.datatools.enablement.ibm.db2.luw@default:default,org.eclipse.wst.server.http.core@default:default,org.eclipse.jpt.eclipselink.branding@default:default,org.eclipse.datatools.enablement.sybase.asa.schemaobjecteditor.examples@default:default,org.eclipse.update.core@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.datatools.enablement.sybase.asa@default:default,org.eclipse.platform.doc.isv@default:default,org.jboss.tools.hibernate.jpt.core@default:default,org.eclipse.wst.internet.monitor.core@default:default,com.ibm.icu@default:default,org.eclipse.jst.ws.axis2.core@default:default,org.eclipse.wst.server.ui.doc.user@default:default,org.eclipse.datatools.oda.cshelp@default:default,org.eclipse.jst.ws.axis2.creation.core@default:defaul! t,org.eclipse.jst.j2ee.ejb.annotations.xdoclet@default:default! ,org.ecl ipse.equinox.p2.core@default:default,org.eclipse.wst.ws.parser@default:default,org.jboss.ide.eclipse.archives.ui@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.security.macosx@default:false,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.wst.server.preview.adapter@default:default,org.eclipse.wst.jsdt.core@default:default,org.eclipse.datatools.enablement.oracle.dbdefinition@default:default,org.eclipse.help.ui@default:default,org.eclipse.jst.ws.creation.ui@default:default,org.eclipse.emf.mapping@default:default,org.eclipse.wst.jsdt.support.firefox@default:default,org.eclipse.compare.core@default:default,org.eclipse.wst.sse.ui@default:default,org.jboss.tools.seam.ui@default:default,org.jboss.tools.seam.text.ext@default:default,org.eclipse.datatools.enablement.ibm.informix.dbdefinition@default:default,org.eclipse.help@default:default,org.eclipse.jst.ws.consumption@default:default,org.jboss.tools.common.el.core@default:de! fault,org.apache.commons.el@default:default,org.eclipse.datatools.enablement.ibm.db2.luw.dbdefinition@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.datatools.connectivity.oda.profile@default:default,org.eclipse.jst.jsp.ui.infopop@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.wst.command.env.ui@default:default,org.eclipse.jpt.db.ui@default:default,org.eclipse.datatools.sqltools.data.ui@default:default,org.eclipse.wst.common.ui@default:default,org.apache.commons.lang*2.1.0.v201005080500@default:default,org.eclipse.wst.validation.infopop@default:default,org.eclipse.wst.common.snippets@default:default,org.jboss.tools.jsf@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.gwt.core@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.jboss.tools.common.model@default:default,org.jboss.tools.usage.test@default:default,org.jboss.tools.common@default:default,org.eclipse.jst.j2ee.core@default:default,org.jboss.tools.usage@default:default,org.jboss.tools.gwt.ui@default:default"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.app@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.runtime.compatibility.registry@default:false,org.hamcrest.core@default:default,org.eclipse.jface@default:default,org.eclipse.ui@default:default,org.eclipse.core.databinding@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.core.commands@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.common@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.osgi,javax.servlet@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding.observable@default:default,org.junit4@default:default,org.eclipse.ui.workbench@! default:default,org.eclipse.osgi.services@default:default,org.eclipse.swt@default:default,com.ibm.icu@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.help@default:default,org.eclipse.swt.cocoa.macosx.x86_64@default:false"/> +<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.xulrunner.initializer@default:false,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/UsageTestSuite.launch =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/UsageTestSuite.launch 2010-09-09 16:56:11 UTC (rev 24847) +++ trunk/usage/tests/org.jboss.tools.usage.test/UsageTestSuite.launch 2010-09-09 18:00:10 UTC (rev 24848) @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> <booleanAttribute key="append.args" value="true"/> <stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/> @@ -12,6 +12,7 @@ <booleanAttribute key="clearwslog" value="false"/> <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/> <booleanAttribute key="default" value="false"/> +<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.gwt.core,org.jboss.tools.gwt.ui,org.jboss.tools.common.model,org.jboss.tools.common"/> <booleanAttribute key="includeOptional" value="true"/> <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> @@ -21,14 +22,14 @@ <listEntry value="1"/> </listAttribute> <listAttribute key="org.eclipse.debug.ui.favoriteGroups"> +<listEntry value="org.eclipse.debug.ui.launchGroup.run"/> <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/> -<listEntry value="org.eclipse.debug.ui.launchGroup.run"/> </listAttribute> <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> -<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.5"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.5.0 (MacOS X Default)"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.usage.test.UsageTestSuite"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.usage.test"/> @@ -36,10 +37,11 @@ <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.ui.workbench.texteditor@default:default,com.springsource.javax.servlet.jsp@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.databinding@default:default,org.apache.lucene@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.security.macosx@default:false,org.apache.lucene.analysis@default:default,org.eclipse.ui.ide@default:default,com.ibm.icu@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.junit4@default:default,org.eclipse.core.net@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.common@2:true,org.eclipse.core.databinding.property@default:default,or! g.eclipse.swt@default:default,javax.transaction@default:false,org.eclipse.compare.core@default:default,org.eclipse.osgi.services@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.text@default:default,org.eclipse.core.variables@default:default,javax.servlet@default:default,org.eclipse.core.jobs@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.core.resources@default:default,org.eclipse.ui.views@default:default,org.eclipse.core.expressions@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.app@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.help.base@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.p2.metadata@default:default,org.apache.jasper@default:default,org.mortbay.jetty.util@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,o! rg.eclipse.core.databinding.observable@default:default,org.ecl! ipse.ecf .provider.filetransfer@default:default,org.eclipse.swt.cocoa.macosx@default:false,org.apache.commons.el@default:default,org.eclipse.ant.core@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,com.springsource.org.apache.commons.logging@default:default,org.jboss.tools.xulrunner.initializer@default:false,com.springsource.javax.el@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.equinox.security@default:default,org.mortbay.jetty.server@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.equinox.p2.engine@default:default,org.eclipse.jface.text@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.help.ui@default:default,org.eclipse.equinox.http.jetty@d! efault:default,org.eclipse.ui.forms@default:default,org.hamcrest.core@default:default,org.eclipse.core.runtime@default:true,org.apache.ant@default:default,com.springsource.javax.servlet@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.ui@default:default,org.eclipse.core.commands@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.jface@default:default,org.eclipse.help@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.ui.intro@default:default,com.jboss.jbds.product@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test@default:default,org.jboss.tools.usage@default:default"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.app@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.runtime.compatibility.registry@default:false,org.hamcrest.core@default:default,org.eclipse.jface@default:default,org.eclipse.ui@default:default,org.eclipse.core.databinding@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.core.commands@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.common@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.osgi,javax.servlet@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding.observable@default:default,org.junit4@default:default,org.eclipse.ui.workbench@! default:default,org.eclipse.osgi.services@default:default,org.eclipse.swt@default:default,com.ibm.icu@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.help@default:default,org.eclipse.swt.cocoa.macosx.x86_64@default:false"/> +<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.xulrunner.initializer@default:false,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"/> <booleanAttribute key="useDefaultConfig" value="true"/> <booleanAttribute key="useDefaultConfigArea" value="false"/> <booleanAttribute key="useProduct" value="false"/> Deleted: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmenTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmenTest.java 2010-09-09 16:56:11 UTC (rev 24847) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmenTest.java 2010-09-09 18:00:10 UTC (rev 24848) @@ -1,271 +0,0 @@ -/******************************************************************************* - * 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.test; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.util.Dictionary; -import java.util.Enumeration; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.eclipse.core.runtime.Platform; -import org.jboss.tools.usage.reporting.EclipseEnvironment; -import org.jboss.tools.usage.reporting.JBossBundleGroups; -import org.junit.Test; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.BundleException; -import org.osgi.framework.ServiceReference; -import org.osgi.framework.Version; - -/** - * @author Andre Dietisheim - */ -public class EclipseEnvironmenTest { - - @Test - public void testMacOs() { - EclipseEnvironment eclipseEnvironment = new EclipseEnvironmentFake(Platform.OS_MACOSX); - String userAgent = eclipseEnvironment.getUserAgent(); - assertApplicationNameAndVersion("com.jboss.jbds.product", "3.0.1", userAgent); - assertOs("Macintosh", "Intel Mac OS X 10.5", userAgent); - assertLanguage("en-US", userAgent); - } - - @Test - public void testLinux() { - EclipseEnvironment eclipseEnvironment = new EclipseEnvironmentFake(Platform.OS_LINUX); - String userAgent = eclipseEnvironment.getUserAgent(); - assertApplicationNameAndVersion("com.jboss.jbds.product", "3.0.1", userAgent); - assertOs("X11", "Linux i686", userAgent); - assertLanguage("en-US", userAgent); - } - - @Test - public void testWindows() { - EclipseEnvironment eclipseEnvironment = new EclipseEnvironmentFake(Platform.OS_WIN32); - String userAgent = eclipseEnvironment.getUserAgent(); - assertApplicationNameAndVersion("com.jboss.jbds.product", "3.0.1", userAgent); - assertOs("Windows", "Windows NT 6.1", userAgent); - assertLanguage("en-US", userAgent); - } - - @Test - public void testKeyword() { - EclipseEnvironment eclipseEnvironment = new EclipseEnvironmentFake() { - @Override - protected Bundle[] getBundles() { - return new Bundle[] { - new BundleSymbolicNameFake("org.jboss.tools.seam.ui"), - new BundleSymbolicNameFake("org.jboss.tools.seam.core"), - new BundleSymbolicNameFake("org.jboss.tools.gwt.ui"), - new BundleSymbolicNameFake("org.jboss.tools.gwt.core"), - new BundleSymbolicNameFake("org.jboss.tools.smooks.core"), - new BundleSymbolicNameFake("org.eclipse.core.runtime"), - }; - } - }; - String keyword = eclipseEnvironment.getKeyword(); - - Matcher matcher = Pattern.compile("(([A-Z]+)-){3}").matcher(keyword); - assertTrue(matcher.matches()); - assertTrue(keyword.indexOf(JBossBundleGroups.BundleGroup.GWT.name()) >= 0); - assertTrue(keyword.indexOf(JBossBundleGroups.BundleGroup.SEAM.name()) >= 0); - assertTrue(keyword.indexOf(JBossBundleGroups.BundleGroup.SMOOKS.name()) >= 0); - } - - private void assertApplicationNameAndVersion(String applicationName, String applicationVersion, String userAgent) { - Matcher matcher = Pattern.compile("([a-zA-Z\\.]+)/([0-9\\.]+).+").matcher(userAgent); - assertTrue(matcher.matches()); - assertEquals(2, matcher.groupCount()); - assertEquals(applicationName, matcher.group(1)); - assertEquals(applicationVersion, matcher.group(2)); - } - - private void assertOs(String platform, String os, String userAgent) { - Matcher matcher = Pattern.compile(".+ \\((.+); U; (.+); .+\\)").matcher(userAgent); - assertTrue(matcher.matches()); - assertEquals(2, matcher.groupCount()); - assertEquals(platform, matcher.group(1)); - assertEquals(os, matcher.group(2)); - } - - private void assertLanguage(String language, String userAgent) { - Matcher matcher = Pattern.compile(".+ \\(.+; U; .+ .+; (.+)\\)").matcher(userAgent); - assertTrue(matcher.matches()); - assertEquals(1, matcher.groupCount()); - assertEquals(language, matcher.group(1)); - } - - private class BundleSymbolicNameFake implements Bundle { - - private String symbolicName; - - public BundleSymbolicNameFake(String symbolicName) { - this.symbolicName = symbolicName; - } - - public Enumeration<?> findEntries(String path, String filePattern, boolean recurse) { - throw new UnsupportedOperationException(); - } - - public BundleContext getBundleContext() { - throw new UnsupportedOperationException(); - } - - public long getBundleId() { - throw new UnsupportedOperationException(); - } - - public URL getEntry(String path) { - throw new UnsupportedOperationException(); - } - - public Enumeration<?> getEntryPaths(String path) { - throw new UnsupportedOperationException(); - } - - public Dictionary<?, ?> getHeaders() { - throw new UnsupportedOperationException(); - } - - public Dictionary<?, ?> getHeaders(String locale) { - throw new UnsupportedOperationException(); - } - - public long getLastModified() { - throw new UnsupportedOperationException(); - } - - public String getLocation() { - throw new UnsupportedOperationException(); - } - - public ServiceReference[] getRegisteredServices() { - throw new UnsupportedOperationException(); - } - - public URL getResource(String name) { - throw new UnsupportedOperationException(); - } - - public Enumeration<?> getResources(String name) throws IOException { - throw new UnsupportedOperationException(); - } - - public ServiceReference[] getServicesInUse() { - throw new UnsupportedOperationException(); - } - - public Map<?, ?> getSignerCertificates(int signersType) { - throw new UnsupportedOperationException(); - } - - public int getState() { - throw new UnsupportedOperationException(); - } - - public String getSymbolicName() { - return this.symbolicName; - } - - public Version getVersion() { - throw new UnsupportedOperationException(); - - } - - public boolean hasPermission(Object permission) { - throw new UnsupportedOperationException(); - - } - - public Class<?> loadClass(String name) throws ClassNotFoundException { - throw new UnsupportedOperationException(); - } - - public void start() throws BundleException { - throw new UnsupportedOperationException(); - - } - - public void start(int options) throws BundleException { - throw new UnsupportedOperationException(); - } - - public void stop() throws BundleException { - throw new UnsupportedOperationException(); - } - - public void stop(int options) throws BundleException { - throw new UnsupportedOperationException(); - } - - public void uninstall() throws BundleException { - throw new UnsupportedOperationException(); - } - - public void update() throws BundleException { - throw new UnsupportedOperationException(); - } - - public void update(InputStream input) throws BundleException { - throw new UnsupportedOperationException(); - } - } - - @Test - public void testVisitsOnFirstVisit() { - EclipsePreferencesFake preferences = new EclipsePreferencesFake(); - EclipseEnvironment eclipseEnvironment = new EclipseEnvironmentFake(preferences); - String firstVisit = eclipseEnvironment.getFirstVisit(); - assertEquals(1, eclipseEnvironment.getVisitCount()); - assertEquals(firstVisit, eclipseEnvironment.getLastVisit()); - assertEquals(firstVisit, eclipseEnvironment.getLastVisit()); - assertEquals(firstVisit, eclipseEnvironment.getCurrentVisit()); - } - - @Test - public void testVisitsOnSecondVisit() throws InterruptedException { - EclipsePreferencesFake preferences = new EclipsePreferencesFake(); - EclipseEnvironment eclipseEnvironment = new EclipseEnvironmentFake(preferences); - String firstVisit = eclipseEnvironment.getFirstVisit(); - Thread.sleep(10); - eclipseEnvironment.visit(); - - assertEquals(2, eclipseEnvironment.getVisitCount()); - assertEquals(firstVisit, eclipseEnvironment.getFirstVisit()); - assertEquals(firstVisit, eclipseEnvironment.getLastVisit()); - assertTrue(!firstVisit.equals(eclipseEnvironment.getCurrentVisit())); - } - - @Test - public void testVisitsOnThirdVisit() throws InterruptedException { - EclipsePreferencesFake preferences = new EclipsePreferencesFake(); - EclipseEnvironment eclipseEnvironment = new EclipseEnvironmentFake(preferences); - String firstVisit = eclipseEnvironment.getFirstVisit(); - Thread.sleep(10); - eclipseEnvironment.visit(); - - String currentVisit = eclipseEnvironment.getCurrentVisit(); - Thread.sleep(10); - eclipseEnvironment.visit(); - - assertEquals(3, eclipseEnvironment.getVisitCount()); - assertEquals(currentVisit, eclipseEnvironment.getLastVisit()); - assertTrue(!firstVisit.equals(eclipseEnvironment.getCurrentVisit())); - } -} Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmentFake.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmentFake.java 2010-09-09 16:56:11 UTC (rev 24847) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmentFake.java 2010-09-09 18:00:10 UTC (rev 24848) @@ -10,8 +10,8 @@ ******************************************************************************/ package org.jboss.tools.usage.test; -import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.preferences.IEclipsePreferences; +import org.jboss.tools.usage.googleanalytics.IUserAgent; import org.jboss.tools.usage.reporting.EclipseEnvironment; /** @@ -22,48 +22,39 @@ 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 LOCALE_US = "en_US"; public static final String JAVA_VERSION = "1.6.0_20"; - private String locale; - private String os; private String javaVersion; public EclipseEnvironmentFake() { - this(GANALYTICS_ACCOUNTNAME, HOSTNAME, REFERRAL, Platform.OS_LINUX, LOCALE_US, JAVA_VERSION); + this(GANALYTICS_ACCOUNTNAME, HOSTNAME, REFERRAL, JAVA_VERSION, new EclipsePreferencesFake()); } - public EclipseEnvironmentFake(String platform) { - this(GANALYTICS_ACCOUNTNAME, HOSTNAME, REFERRAL, platform, LOCALE_US, JAVA_VERSION); - } - public EclipseEnvironmentFake(IEclipsePreferences preferences) { - this(GANALYTICS_ACCOUNTNAME, HOSTNAME, REFERRAL, Platform.OS_LINUX, LOCALE_US, JAVA_VERSION); + this(GANALYTICS_ACCOUNTNAME, HOSTNAME, REFERRAL, JAVA_VERSION, preferences); } - public EclipseEnvironmentFake(String accountName, String hostName, String referral, String os, String locale) { - this(accountName, hostName, referral, os, locale, JAVA_VERSION); + public EclipseEnvironmentFake(String accountName, String hostName, String referral) { + this(accountName, hostName, referral, JAVA_VERSION, new EclipsePreferencesFake()); } - public EclipseEnvironmentFake(String accountName, String hostName, String referral, String os, String locale, - String javaVersion, IEclipsePreferences preferences) { + public EclipseEnvironmentFake(String accountName, String hostName, String referral, String javaVersion, + IEclipsePreferences preferences) { super(accountName, hostName, referral, preferences); - this.os = os; this.javaVersion = javaVersion; - this.locale = locale; } - public EclipseEnvironmentFake(String accountName, String hostName, String referral, String os, String javaVersion, - String locale) { - this(accountName, hostName, referral, os, locale, javaVersion, new EclipsePreferencesFake()); - } - @Override protected void initScreenSettings() { // do not access swt/display } @Override + protected IUserAgent createEclipseUserAgent() { + return new EclipseUserAgentFake(); + } + + @Override public String getScreenResolution() { return 1920 + SCREERESOLUTION_DELIMITER + 1080; } @@ -73,27 +64,7 @@ return 24 + SCREENCOLORDEPTH_POSTFIX; } - @Override - protected String getApplicationName() { - return "com.jboss.jbds.product"; - } - - @Override - protected String getNL() { - return locale; - } - - @Override - protected String getOS() { - return os; - } - - @Override - protected String getApplicationVersion() { - return "3.0.1"; - } - - protected String getJavaVersion() { + public String getFlashVersion() { return javaVersion; } } Added: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseUserAgentFake.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseUserAgentFake.java (rev 0) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseUserAgentFake.java 2010-09-09 18:00:10 UTC (rev 24848) @@ -0,0 +1,57 @@ +package org.jboss.tools.usage.test; + +import org.eclipse.core.runtime.Assert; +import org.eclipse.core.runtime.Platform; +import org.jboss.tools.usage.reporting.EclipseUserAgent; + +public class EclipseUserAgentFake extends EclipseUserAgent { + + private static final String APPLICATION_NAME = "com.jboss.jbds.product"; + private static final String APPLICATION_VERSION = "3.0.1"; + public static final String LOCALE_US = "en_US"; + + private String applicationName; + private String applicationVersion; + private String nl; + private String os; + + public EclipseUserAgentFake() { + this(APPLICATION_NAME, APPLICATION_VERSION, LOCALE_US, Platform.OS_LINUX); + } + + public EclipseUserAgentFake(String nl) { + this(APPLICATION_NAME, APPLICATION_VERSION, nl, Platform.OS_LINUX); + } + + public EclipseUserAgentFake(String nl, String os) { + this(APPLICATION_NAME, APPLICATION_VERSION, nl, os); + } + + public EclipseUserAgentFake(String applicationName, String applicationVersion, String nl, String os) { + Assert.isTrue(nl != null && nl.indexOf(JAVA_LOCALE_DELIMITER) >= 0, "nl parameter must for a java locale string <xx_XX>"); + this.applicationName = applicationName; + this.applicationVersion = applicationVersion; + this.nl = nl; + this.os = os; + } + + @Override + protected String getNL() { + return nl; + } + + @Override + protected String getApplicationName() { + return applicationName; + } + + @Override + protected String getOS() { + return os; + } + + @Override + protected String getApplicationVersion() { + return applicationVersion; + } +} \ No newline at end of file Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseUserAgentFake.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseUserAgentTest.java (from rev 24835, trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmenTest.java) =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseUserAgentTest.java (rev 0) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseUserAgentTest.java 2010-09-09 18:00:10 UTC (rev 24848) @@ -0,0 +1,276 @@ +/******************************************************************************* + * 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.test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.Dictionary; +import java.util.Enumeration; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.eclipse.core.runtime.Platform; +import org.jboss.tools.usage.reporting.EclipseEnvironment; +import org.jboss.tools.usage.reporting.JBossBundleGroups; +import org.junit.Test; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleException; +import org.osgi.framework.ServiceReference; +import org.osgi.framework.Version; + +/** + * @author Andre Dietisheim + */ +public class EclipseUserAgentTest { + + @Test + public void testLanguage() { + String userAgent = new EclipseUserAgentFake(EclipseUserAgentFake.LOCALE_US).toString(); + assertLanguage("en-US", userAgent); + } + + @Test + public void testApplicationNameAndVersion() { + String applicationName = "com.jboss.jbds.product"; + String applicationVersion = "3.0.1"; + String userAgent = new EclipseUserAgentFake().toString(); + assertApplicationNameAndVersion(applicationName, applicationVersion, userAgent); + } + + @Test + public void testMacOs() { + String userAgent = new EclipseUserAgentFake(EclipseUserAgentFake.LOCALE_US, Platform.OS_MACOSX).toString(); + assertOs("Macintosh", "Intel Mac OS X 10.5", userAgent); + } + + @Test + public void testLinux() { + String userAgent = new EclipseUserAgentFake(EclipseUserAgentFake.LOCALE_US, Platform.OS_LINUX).toString(); + assertOs("X11", "Linux i686", userAgent); + } + + @Test + public void testWindows() { + String userAgent = new EclipseUserAgentFake(EclipseUserAgentFake.LOCALE_US, Platform.OS_WIN32).toString(); + assertOs("Windows", "Windows NT 6.1", userAgent); + } + + @Test + public void testKeyword() { + EclipseEnvironment eclipseEnvironment = new EclipseEnvironmentFake() { + @Override + protected Bundle[] getBundles() { + return new Bundle[] { + new BundleSymbolicNameFake("org.jboss.tools.seam.ui"), + new BundleSymbolicNameFake("org.jboss.tools.seam.core"), + new BundleSymbolicNameFake("org.jboss.tools.gwt.ui"), + new BundleSymbolicNameFake("org.jboss.tools.gwt.core"), + new BundleSymbolicNameFake("org.jboss.tools.smooks.core"), + new BundleSymbolicNameFake("org.eclipse.core.runtime"), + }; + } + }; + String keyword = eclipseEnvironment.getKeyword(); + + Matcher matcher = Pattern.compile("(([A-Z]+)-){3}").matcher(keyword); + assertTrue(matcher.matches()); + assertTrue(keyword.indexOf(JBossBundleGroups.BundleGroup.GWT.name()) >= 0); + assertTrue(keyword.indexOf(JBossBundleGroups.BundleGroup.SEAM.name()) >= 0); + assertTrue(keyword.indexOf(JBossBundleGroups.BundleGroup.SMOOKS.name()) >= 0); + } + + private void assertApplicationNameAndVersion(String applicationName, String applicationVersion, String userAgent) { + Matcher matcher = Pattern.compile("([a-zA-Z\\.]+)/([0-9\\.]+).+").matcher(userAgent); + assertTrue(matcher.matches()); + assertEquals(2, matcher.groupCount()); + assertEquals(applicationName, matcher.group(1)); + assertEquals(applicationVersion, matcher.group(2)); + } + + private void assertOs(String platform, String os, String userAgent) { + Matcher matcher = Pattern.compile(".+ \\((.+); U; (.+); .+\\)").matcher(userAgent); + assertTrue(matcher.matches()); + assertEquals(2, matcher.groupCount()); + assertEquals(platform, matcher.group(1)); + assertEquals(os, matcher.group(2)); + } + + private void assertLanguage(String language, String userAgent) { + Matcher matcher = Pattern.compile(".+ \\(.+; U; .+ .+; (.+)\\)").matcher(userAgent); + assertTrue(matcher.matches()); + assertEquals(1, matcher.groupCount()); + assertEquals(language, matcher.group(1)); + } + + private class BundleSymbolicNameFake implements Bundle { + + private String symbolicName; + + public BundleSymbolicNameFake(String symbolicName) { + this.symbolicName = symbolicName; + } + + public Enumeration<?> findEntries(String path, String filePattern, boolean recurse) { + throw new UnsupportedOperationException(); + } + + public BundleContext getBundleContext() { + throw new UnsupportedOperationException(); + } + + public long getBundleId() { + throw new UnsupportedOperationException(); + } + + public URL getEntry(String path) { + throw new UnsupportedOperationException(); + } + + public Enumeration<?> getEntryPaths(String path) { + throw new UnsupportedOperationException(); + } + + public Dictionary<?, ?> getHeaders() { + throw new UnsupportedOperationException(); + } + + public Dictionary<?, ?> getHeaders(String locale) { + throw new UnsupportedOperationException(); + } + + public long getLastModified() { + throw new UnsupportedOperationException(); + } + + public String getLocation() { + throw new UnsupportedOperationException(); + } + + public ServiceReference[] getRegisteredServices() { + throw new UnsupportedOperationException(); + } + + public URL getResource(String name) { + throw new UnsupportedOperationException(); + } + + public Enumeration<?> getResources(String name) throws IOException { + throw new UnsupportedOperationException(); + } + + public ServiceReference[] getServicesInUse() { + throw new UnsupportedOperationException(); + } + + public Map<?, ?> getSignerCertificates(int signersType) { + throw new UnsupportedOperationException(); + } + + public int getState() { + throw new UnsupportedOperationException(); + } + + public String getSymbolicName() { + return this.symbolicName; + } + + public Version getVersion() { + throw new UnsupportedOperationException(); + + } + + public boolean hasPermission(Object permission) { + throw new UnsupportedOperationException(); + + } + + public Class<?> loadClass(String name) throws ClassNotFoundException { + throw new UnsupportedOperationException(); + } + + public void start() throws BundleException { + throw new UnsupportedOperationException(); + + } + + public void start(int options) throws BundleException { + throw new UnsupportedOperationException(); + } + + public void stop() throws BundleException { + throw new UnsupportedOperationException(); + } + + public void stop(int options) throws BundleException { + throw new UnsupportedOperationException(); + } + + public void uninstall() throws BundleException { + throw new UnsupportedOperationException(); + } + + public void update() throws BundleException { + throw new UnsupportedOperationException(); + } + + public void update(InputStream input) throws BundleException { + throw new UnsupportedOperationException(); + } + } + + @Test + public void testVisitsOnFirstVisit() { + EclipsePreferencesFake preferences = new EclipsePreferencesFake(); + EclipseEnvironment eclipseEnvironment = new EclipseEnvironmentFake(preferences); + String firstVisit = eclipseEnvironment.getFirstVisit(); + assertEquals(1, eclipseEnvironment.getVisitCount()); + assertEquals(firstVisit, eclipseEnvironment.getLastVisit()); + assertEquals(firstVisit, eclipseEnvironment.getLastVisit()); + assertEquals(firstVisit, eclipseEnvironment.getCurrentVisit()); + } + + @Test + public void testVisitsOnSecondVisit() throws InterruptedException { + EclipsePreferencesFake preferences = new EclipsePreferencesFake(); + EclipseEnvironment eclipseEnvironment = new EclipseEnvironmentFake(preferences); + String firstVisit = eclipseEnvironment.getFirstVisit(); + Thread.sleep(10); + eclipseEnvironment.visit(); + + assertEquals(2, eclipseEnvironment.getVisitCount()); + assertEquals(firstVisit, eclipseEnvironment.getFirstVisit()); + assertEquals(firstVisit, eclipseEnvironment.getLastVisit()); + assertTrue(!firstVisit.equals(eclipseEnvironment.getCurrentVisit())); + } + + @Test + public void testVisitsOnThirdVisit() throws InterruptedException { + EclipsePreferencesFake preferences = new EclipsePreferencesFake(); + EclipseEnvironment eclipseEnvironment = new EclipseEnvironmentFake(preferences); + String firstVisit = eclipseEnvironment.getFirstVisit(); + Thread.sleep(10); + eclipseEnvironment.visit(); + + String currentVisit = eclipseEnvironment.getCurrentVisit(); + Thread.sleep(10); + eclipseEnvironment.visit(); + + assertEquals(3, eclipseEnvironment.getVisitCount()); + assertEquals(currentVisit, eclipseEnvironment.getLastVisit()); + assertTrue(!firstVisit.equals(eclipseEnvironment.getCurrentVisit())); + } +} Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseUserAgentTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsFocusPoint.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsFocusPoint.java (rev 0) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsFocusPoint.java 2010-09-09 18:00:10 UTC (rev 24848) @@ -0,0 +1,26 @@ +/******************************************************************************* + * 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.test; + +import org.jboss.tools.usage.FocusPoint; + +/** + * @author Andre Dietisheim + */ +public class JBossToolsFocusPoint extends FocusPoint { + + public JBossToolsFocusPoint(String childFocusPoint) { + super("tools"); + setChild(new FocusPoint("usage") + .setChild(new FocusPoint(childFocusPoint))); + } + +} Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsFocusPoint.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java 2010-09-09 16:56:11 UTC (rev 24847) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java 2010-09-09 18:00:10 UTC (rev 24848) @@ -31,17 +31,15 @@ */ public class JBossToolsUsageIntegrationTest { - private IGoogleAnalyticsParameters eclipseEnvironment; - @Test public void sameUserIdOnSametEclipseInstance() throws Exception { - UrlRevealingTracker tracker = getTracker(eclipseEnvironment); + UrlRevealingTracker tracker = getTracker(EclipseEnvironmentFakeSingleton.INSTANCE); FocusPoint focusPoint = createFocusPoint("testSameUserIdOnSametEclipseInstance" + System.currentTimeMillis()); tracker.trackSynchronously(focusPoint); String userId = getUserId(tracker.getTrackingUrl()); assertTrue(userId != null); - tracker = getTracker(eclipseEnvironment ); + tracker = getTracker(EclipseEnvironmentFakeSingleton.INSTANCE); tracker.trackSynchronously(focusPoint); String newUserId = getUserId(tracker.getTrackingUrl()); @@ -52,7 +50,7 @@ @Test public void differentUserIdOnDifferentEclipseInstance() throws Exception { String focusPointName = "testDifferentUserIdOnDifferentEclipseInstance" - + System.currentTimeMillis(); + + System.currentTimeMillis(); UrlRevealingTracker tracker = getTracker(new EclipseEnvironmentFake()); tracker.trackSynchronously(createFocusPoint(focusPointName)); String userId = getUserId(tracker.getTrackingUrl()); Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java 2010-09-09 16:56:11 UTC (rev 24847) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java 2010-09-09 18:00:10 UTC (rev 24848) @@ -18,7 +18,7 @@ FocusPointTest.class, GoogleAnalyticsUrlStrategyTest.class, JBossToolsUsageIntegrationTest.class, - EclipseEnvironmenTest.class, + EclipseUserAgentTest.class, GlobalUsageReportingSettingsTest.class}) /**