Author: adietish Date: 2010-09-14 11:06:48 -0400 (Tue, 14 Sep 2010) New Revision: 24916 Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpGetRequest.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpResourceMap.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/IHttpGetRequest.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsTestsFocusPoint.java Removed: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpGetRequest.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpResourceMap.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/IHttpGetRequest.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsFocusPoint.java Modified: trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/FocusPoint.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/ITracker.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/IURLBuildingStrategy.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/Tracker.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsCookie.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/GoogleAnalyticsEclipseMessages.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/GlobalUsageReportingSettings.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportPreferences.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BrowserUtil.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtils.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/CompositeCollectionFilter.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/ICollectionEntryConverter.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/ICollectionFilter.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/NoopConverter.java trunk/usage/tests/org.jboss.tools.usage.test/UsageTestSuite.launch trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsComponentsTest.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/JBossToolsUsageRequestsTest.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageTestActivator.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/SystemOutLogger.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UrlRevealingTracker.java 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/fakes/BundleGroupProviderFake.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/EclipsePreferencesFake.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/EclipseUserAgentFake.java Log: [JBIDE-7063] base url for tests corrected, corrected missing copyright headers, author tags in all artifacts, refactored http related classes to be in a http-package Modified: trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF 2010-09-14 15:06:48 UTC (rev 24916) @@ -7,6 +7,7 @@ Export-Package: org.jboss.tools.usage, org.jboss.tools.usage.googleanalytics, org.jboss.tools.usage.googleanalytics.eclipse, + org.jboss.tools.usage.http, org.jboss.tools.usage.internal;x-friends:="org.jboss.tools.usage.test", org.jboss.tools.usage.preferences;x-friends:="org.jboss.tools.usage.test", org.jboss.tools.usage.reporting;x-friends:="org.jboss.tools.usage.test", Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/FocusPoint.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/FocusPoint.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/FocusPoint.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -15,6 +15,11 @@ /** * Focus point of the application. It can represent data points like application * load, application module load, user actions, error events etc. + * + * @author Andre Dietisheim + * @see based on <a + * href="http://jgoogleAnalytics.googlecode.com">http://jgoogleAnalytics + * .googlecode.com</a> */ public class FocusPoint { Deleted: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpGetRequest.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpGetRequest.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpGetRequest.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -1,100 +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; - -import java.io.IOException; -import java.net.HttpURLConnection; -import java.net.URL; -import java.text.MessageFormat; - - -/** - * Class that executes a HTTP Get request to the given url. - * - * @author Andre Dietisheim - */ -public class HttpGetRequest implements IHttpGetRequest { - - private static final String USER_AGENT = "User-Agent"; //$NON-NLS-1$ - - private static final String GET_METHOD_NAME = "GET"; //$NON-NLS-1$ - - private ILoggingAdapter loggingAdapter = null; - -// private CookieHandler cookieHandler; - - private String userAgent; - - public HttpGetRequest(String userAgent, ILoggingAdapter loggingAdapter) { - this.userAgent = userAgent; - this.loggingAdapter = loggingAdapter; -// this.cookieHandler = new CookieHandler(); -// this.cookieHandler = CookieHandler.getDefault(); -// cookieHandler.setCookiePolicy(CookiePolicy.ACCEPT_ALL); - } - - /* (non-Javadoc) - * @see org.jboss.tools.usage.IHttpGetRequest#request(java.lang.String) - */ - public void request(String urlString) { - -// CookieHandler currentCookieHandler = setCookieHandler(cookieHandler); - try { - HttpURLConnection urlConnection = createURLConnection(urlString, userAgent); - urlConnection.connect(); - int responseCode = getResponseCode(urlConnection); - if (responseCode == HttpURLConnection.HTTP_OK) { - loggingAdapter.logMessage(MessageFormat.format(UsageMessages.HttpGetMethod_Success, urlString, responseCode)); - } else { - loggingAdapter.logError(MessageFormat.format(UsageMessages.HttpGetMethod_Error_Http, urlString)); - } - } catch (Exception e) { - loggingAdapter.logMessage(MessageFormat.format(UsageMessages.HttpGetMethod_Error_Io, urlString, e.toString())); - } finally { -// setCookieHandler(currentCookieHandler); - } - } - - /** - * Returns the return code from the given {@link HttpURLConnection}. - * Provided to be called by test cases so that they can retrieve the return code. - * - * @param urlConnection to get the response code from - * @return the return code the HttpUrlConnection received - * @throws IOException Signals that an I/O exception has occurred. - */ - protected int getResponseCode(HttpURLConnection urlConnection) throws IOException { - return urlConnection.getResponseCode(); - } - -// private CookieHandler setCookieHandler(CookieHandler cookieHandler) { -// CookieHandler currentCookieHandler = CookieHandler.getDefault(); -// CookieHandler.setDefault(cookieHandler); -// return currentCookieHandler; -// } - - /** - * Creates a new url connection. - * - * @param urlString the url string - * @param userAgent the user agent - * @return the http url connection - * @throws IOException Signals that an I/O exception has occurred. - */ - protected HttpURLConnection createURLConnection(String urlString, String userAgent) throws IOException { - URL url = new URL(urlString); - HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection(); - urlConnection.setInstanceFollowRedirects(true); - urlConnection.setRequestMethod(GET_METHOD_NAME); - urlConnection.setRequestProperty(USER_AGENT, userAgent); - return urlConnection; - } -} Deleted: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpResourceMap.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpResourceMap.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpResourceMap.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -1,150 +0,0 @@ -package org.jboss.tools.usage; - -import java.io.BufferedInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.UnsupportedEncodingException; -import java.net.HttpURLConnection; -import java.net.URL; -import java.util.HashMap; -import java.util.Map; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Plugin; -import org.jboss.tools.usage.util.HttpEncodingUtils; -import org.jboss.tools.usage.util.StatusUtils; -import org.jboss.tools.usage.util.reader.ReaderUtils; - -public abstract class HttpResourceMap { - - static final String GET_METHOD_NAME = "GET"; //$NON-NLS-1$ - - protected Plugin plugin; - private Map<String, String> valuesMap; - - private String[] keys; - - private String url; - - private char valueDelimiter; - - public HttpResourceMap(String url, char valueDelimiter, Plugin plugin, String... keys) { - this.url = url; - this.keys = keys; - this.valueDelimiter = valueDelimiter; - this.plugin = plugin; - } - - protected Map<String, String> getValueMap() throws IOException { - if (valuesMap == null) { - HttpURLConnection urlConnection = createURLConnection(url); - InputStreamReader reader = request(urlConnection); - this.valuesMap = parse(keys, valueDelimiter, reader, new HashMap<String, String>()); - } - return valuesMap; - } - - /** - * Sends a http GET request to the given URL. Returns the response string or - * <tt>null</tt> if an error occurred. The errors catched are Exceptions or - * HTTP error codes. - * - * @param url - * the url to send the GET request to - * @return the response or <tt>null</tt> if an error occured. - * @throws UnsupportedEncodingException - * - * @see HttpURLConnection - */ - protected InputStreamReader request(HttpURLConnection urlConnection) throws IOException { - InputStreamReader responseReader = null; - try { - urlConnection.connect(); - int responseCode = getResponseCode(urlConnection); - if (responseCode == HttpURLConnection.HTTP_OK) { - IStatus status = StatusUtils.getDebugStatus( - plugin.getBundle().getSymbolicName() - , UsageMessages.KillSwitchPreference_Info_HttpQuery - , url); - plugin.getLog().log(status); - responseReader = getInputStreamReader(urlConnection.getInputStream(), urlConnection.getContentType()); - } else { - IStatus status = StatusUtils.getErrorStatus( - plugin.getBundle().getSymbolicName() - , UsageMessages.KillSwitchPreference_Error_Http, null, url); - plugin.getLog().log(status); - } - return responseReader; - } catch (IOException e) { - IStatus status = StatusUtils.getErrorStatus( - plugin.getBundle().getSymbolicName() - , UsageMessages.KillSwitchPreference_Error_Http, e, url); - plugin.getLog().log(status); - throw e; - } - } - - private InputStreamReader getInputStreamReader(InputStream inputStream, String contentType) throws UnsupportedEncodingException, IOException { - String contentTypeCharset = HttpEncodingUtils.getContentTypeCharset(contentType); - if (contentTypeCharset != null && contentTypeCharset.length() > 0) { - return new InputStreamReader(new BufferedInputStream(inputStream), - contentTypeCharset); - } else { - return new InputStreamReader(new BufferedInputStream(inputStream)); - } - } - - /** - * Parses the given string and extracts the enablement value. - * - * @param valueDelimiter - * - * @param input - * stream that holds - * @return - * @return true, if successful - */ - private Map<String, String> parse(String[] keys, char valueDelimiter, InputStreamReader reader, - Map<String, String> valuesMap) throws IOException { - for (String key = null; (key = ReaderUtils.skipUntil(reader, keys)) != null;) { - String value = ReaderUtils.readStringUntil(reader, valueDelimiter); - valuesMap.put(key, value); - } - return valuesMap; - } - - /** - * Creates a new url connection. - * - * @param urlString - * the url string - * @return the http url connection - * @throws IOException - * @throws IOException - * Signals that an I/O exception has occurred. - */ - protected HttpURLConnection createURLConnection(String urlString) throws IOException { - URL url = new URL(urlString); - HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection(); - urlConnection.setInstanceFollowRedirects(true); - urlConnection.setRequestMethod(GET_METHOD_NAME); - return urlConnection; - } - - /** - * Returns the return code from the given {@link HttpURLConnection}. - * Provided to be called by test cases so that they can retrieve the return - * code. - * - * @param urlConnection - * to get the response code from - * @return the return code the HttpUrlConnection received - * @throws IOException - * Signals that an I/O exception has occurred. - */ - protected int getResponseCode(HttpURLConnection urlConnection) throws IOException { - return urlConnection.getResponseCode(); - } - -} \ No newline at end of file Deleted: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/IHttpGetRequest.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/IHttpGetRequest.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/IHttpGetRequest.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -1,22 +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; - -/** - * A interface that represents a HTTP Get Request. - * - * @author Andre Dietisheim - */ -public interface IHttpGetRequest { - - public abstract void request(String urlString); - -} \ No newline at end of file Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/ITracker.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/ITracker.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/ITracker.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -1,3 +1,13 @@ +/******************************************************************************* + * 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; import java.io.UnsupportedEncodingException; @@ -2,3 +12,2 @@ - /** Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/IURLBuildingStrategy.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/IURLBuildingStrategy.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/IURLBuildingStrategy.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -12,7 +12,6 @@ import java.io.UnsupportedEncodingException; - /** * Interface for the URL building strategy * Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/Tracker.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/Tracker.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/Tracker.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -13,6 +13,8 @@ import java.io.UnsupportedEncodingException; import java.text.MessageFormat; +import org.jboss.tools.usage.http.IHttpGetRequest; + /** * Reports (tracks) usage * Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsCookie.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsCookie.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsCookie.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -11,6 +11,9 @@ package org.jboss.tools.usage.googleanalytics; +/** + * @author Andre Dietisheim + */ public class GoogleAnalyticsCookie { private CharSequence value; Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/GoogleAnalyticsEclipseMessages.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/GoogleAnalyticsEclipseMessages.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/GoogleAnalyticsEclipseMessages.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -12,6 +12,9 @@ import org.eclipse.osgi.util.NLS; +/** + * @author Andre Dietisheim + */ public class GoogleAnalyticsEclipseMessages extends NLS { private static final String BUNDLE_NAME = "org.jboss.tools.usage.googleanalytics.messages"; //$NON-NLS-1$ Copied: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpGetRequest.java (from rev 24574, trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpGetRequest.java) =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpGetRequest.java (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpGetRequest.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -0,0 +1,102 @@ +/******************************************************************************* + * 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.http; + +import java.io.IOException; +import java.net.HttpURLConnection; +import java.net.URL; +import java.text.MessageFormat; + +import org.jboss.tools.usage.ILoggingAdapter; +import org.jboss.tools.usage.UsageMessages; + +/** + * Class that executes a HTTP Get request to the given url. + * + * @author Andre Dietisheim + */ +public class HttpGetRequest implements IHttpGetRequest { + + private static final String USER_AGENT = "User-Agent"; //$NON-NLS-1$ + + private static final String GET_METHOD_NAME = "GET"; //$NON-NLS-1$ + + private ILoggingAdapter loggingAdapter = null; + +// private CookieHandler cookieHandler; + + private String userAgent; + + public HttpGetRequest(String userAgent, ILoggingAdapter loggingAdapter) { + this.userAgent = userAgent; + this.loggingAdapter = loggingAdapter; +// this.cookieHandler = new CookieHandler(); +// this.cookieHandler = CookieHandler.getDefault(); +// cookieHandler.setCookiePolicy(CookiePolicy.ACCEPT_ALL); + } + + /* (non-Javadoc) + * @see org.jboss.tools.usage.IHttpGetRequest#request(java.lang.String) + */ + public void request(String urlString) { + +// CookieHandler currentCookieHandler = setCookieHandler(cookieHandler); + try { + HttpURLConnection urlConnection = createURLConnection(urlString, userAgent); + urlConnection.connect(); + int responseCode = getResponseCode(urlConnection); + if (responseCode == HttpURLConnection.HTTP_OK) { + loggingAdapter.logMessage(MessageFormat.format(UsageMessages.HttpGetMethod_Success, urlString, responseCode)); + } else { + loggingAdapter.logError(MessageFormat.format(UsageMessages.HttpGetMethod_Error_Http, urlString)); + } + } catch (Exception e) { + loggingAdapter.logMessage(MessageFormat.format(UsageMessages.HttpGetMethod_Error_Io, urlString, e.toString())); + } finally { +// setCookieHandler(currentCookieHandler); + } + } + + /** + * Returns the return code from the given {@link HttpURLConnection}. + * Provided to be called by test cases so that they can retrieve the return code. + * + * @param urlConnection to get the response code from + * @return the return code the HttpUrlConnection received + * @throws IOException Signals that an I/O exception has occurred. + */ + protected int getResponseCode(HttpURLConnection urlConnection) throws IOException { + return urlConnection.getResponseCode(); + } + +// private CookieHandler setCookieHandler(CookieHandler cookieHandler) { +// CookieHandler currentCookieHandler = CookieHandler.getDefault(); +// CookieHandler.setDefault(cookieHandler); +// return currentCookieHandler; +// } + + /** + * Creates a new url connection. + * + * @param urlString the url string + * @param userAgent the user agent + * @return the http url connection + * @throws IOException Signals that an I/O exception has occurred. + */ + protected HttpURLConnection createURLConnection(String urlString, String userAgent) throws IOException { + URL url = new URL(urlString); + HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection(); + urlConnection.setInstanceFollowRedirects(true); + urlConnection.setRequestMethod(GET_METHOD_NAME); + urlConnection.setRequestProperty(USER_AGENT, userAgent); + return urlConnection; + } +} Copied: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpResourceMap.java (from rev 24574, trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpResourceMap.java) =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpResourceMap.java (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpResourceMap.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -0,0 +1,169 @@ +/******************************************************************************* + * 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.http; + +import java.io.BufferedInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.UnsupportedEncodingException; +import java.net.HttpURLConnection; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Plugin; +import org.jboss.tools.usage.UsageMessages; +import org.jboss.tools.usage.util.HttpEncodingUtils; +import org.jboss.tools.usage.util.StatusUtils; +import org.jboss.tools.usage.util.reader.ReaderUtils; + +/** + * Base class that holds a map that subclasses may get. The values in the map + * are fetched and parsed from a document that is fetched on a url that the + * subclass provides + * + * @author Andre Dietisheim + */ +public abstract class HttpResourceMap { + + static final String GET_METHOD_NAME = "GET"; //$NON-NLS-1$ + + protected Plugin plugin; + private Map<String, String> valuesMap; + + private String[] keys; + + private String url; + + private char valueDelimiter; + + public HttpResourceMap(String url, char valueDelimiter, Plugin plugin, String... keys) { + this.url = url; + this.keys = keys; + this.valueDelimiter = valueDelimiter; + this.plugin = plugin; + } + + protected Map<String, String> getValueMap() throws IOException { + if (valuesMap == null) { + HttpURLConnection urlConnection = createURLConnection(url); + InputStreamReader reader = request(urlConnection); + this.valuesMap = parse(keys, valueDelimiter, reader, new HashMap<String, String>()); + } + return valuesMap; + } + + /** + * Sends a http GET request to the given URL. Returns the response string or + * <tt>null</tt> if an error occurred. The errors catched are Exceptions or + * HTTP error codes. + * + * @param url + * the url to send the GET request to + * @return the response or <tt>null</tt> if an error occured. + * @throws UnsupportedEncodingException + * + * @see HttpURLConnection + */ + protected InputStreamReader request(HttpURLConnection urlConnection) throws IOException { + InputStreamReader responseReader = null; + try { + urlConnection.connect(); + int responseCode = getResponseCode(urlConnection); + if (responseCode == HttpURLConnection.HTTP_OK) { + IStatus status = StatusUtils.getDebugStatus( + plugin.getBundle().getSymbolicName() + , UsageMessages.KillSwitchPreference_Info_HttpQuery + , url); + plugin.getLog().log(status); + responseReader = getInputStreamReader(urlConnection.getInputStream(), urlConnection.getContentType()); + } else { + IStatus status = StatusUtils.getErrorStatus( + plugin.getBundle().getSymbolicName() + , UsageMessages.KillSwitchPreference_Error_Http, null, url); + plugin.getLog().log(status); + } + return responseReader; + } catch (IOException e) { + IStatus status = StatusUtils.getErrorStatus( + plugin.getBundle().getSymbolicName() + , UsageMessages.KillSwitchPreference_Error_Http, e, url); + plugin.getLog().log(status); + throw e; + } + } + + private InputStreamReader getInputStreamReader(InputStream inputStream, String contentType) + throws UnsupportedEncodingException, IOException { + String contentTypeCharset = HttpEncodingUtils.getContentTypeCharset(contentType); + if (contentTypeCharset != null && contentTypeCharset.length() > 0) { + return new InputStreamReader(new BufferedInputStream(inputStream), + contentTypeCharset); + } else { + return new InputStreamReader(new BufferedInputStream(inputStream)); + } + } + + /** + * Parses the given string and extracts the enablement value. + * + * @param valueDelimiter + * + * @param input + * stream that holds + * @return + * @return true, if successful + */ + private Map<String, String> parse(String[] keys, char valueDelimiter, InputStreamReader reader, + Map<String, String> valuesMap) throws IOException { + for (String key = null; (key = ReaderUtils.skipUntil(reader, keys)) != null;) { + String value = ReaderUtils.readStringUntil(reader, valueDelimiter); + valuesMap.put(key, value); + } + return valuesMap; + } + + /** + * Creates a new url connection. + * + * @param urlString + * the url string + * @return the http url connection + * @throws IOException + * @throws IOException + * Signals that an I/O exception has occurred. + */ + protected HttpURLConnection createURLConnection(String urlString) throws IOException { + URL url = new URL(urlString); + HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection(); + urlConnection.setInstanceFollowRedirects(true); + urlConnection.setRequestMethod(GET_METHOD_NAME); + return urlConnection; + } + + /** + * Returns the return code from the given {@link HttpURLConnection}. + * Provided to be called by test cases so that they can retrieve the return + * code. + * + * @param urlConnection + * to get the response code from + * @return the return code the HttpUrlConnection received + * @throws IOException + * Signals that an I/O exception has occurred. + */ + protected int getResponseCode(HttpURLConnection urlConnection) throws IOException { + return urlConnection.getResponseCode(); + } + +} \ No newline at end of file Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpResourceMap.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/IHttpGetRequest.java (from rev 24574, trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/IHttpGetRequest.java) =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/IHttpGetRequest.java (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/IHttpGetRequest.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -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.http; + +/** + * A interface that represents a HTTP Get Request. + * + * @author Andre Dietisheim + */ +public interface IHttpGetRequest { + + public abstract void request(String urlString); + +} \ No newline at end of file Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/IHttpGetRequest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/GlobalUsageReportingSettings.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/GlobalUsageReportingSettings.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/GlobalUsageReportingSettings.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -13,12 +13,14 @@ import java.util.Map; import org.eclipse.core.runtime.Plugin; -import org.jboss.tools.usage.HttpResourceMap; +import org.jboss.tools.usage.http.HttpResourceMap; /** * A class that implements a global reporting enablement setting. The current * implementation queries a given url and extracts the enablement value out of * the response. + * + * @author Andre Dietisheim */ public class GlobalUsageReportingSettings extends HttpResourceMap { Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -20,8 +20,6 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.progress.UIJob; import org.jboss.tools.usage.FocusPoint; -import org.jboss.tools.usage.HttpGetRequest; -import org.jboss.tools.usage.IHttpGetRequest; import org.jboss.tools.usage.ILoggingAdapter; import org.jboss.tools.usage.ITracker; import org.jboss.tools.usage.IURLBuildingStrategy; @@ -29,6 +27,8 @@ import org.jboss.tools.usage.Tracker; import org.jboss.tools.usage.googleanalytics.GoogleAnalyticsUrlStrategy; import org.jboss.tools.usage.googleanalytics.IGoogleAnalyticsParameters; +import org.jboss.tools.usage.http.HttpGetRequest; +import org.jboss.tools.usage.http.IHttpGetRequest; import org.jboss.tools.usage.internal.JBossToolsUsageActivator; import org.jboss.tools.usage.preferences.GlobalUsageReportingSettings; import org.jboss.tools.usage.util.PreferencesUtils; Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportPreferences.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportPreferences.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportPreferences.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -18,6 +18,9 @@ import org.jboss.tools.usage.util.StatusUtils; import org.osgi.service.prefs.BackingStoreException; +/** + * @author Andre Dietisheim + */ public class UsageReportPreferences { public static void setEnabled(boolean enabled) { Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BrowserUtil.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BrowserUtil.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BrowserUtil.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -19,6 +19,9 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.browser.IWebBrowser; +/** + * @author Andre Dietisheim + */ public class BrowserUtil { /** Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtils.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtils.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtils.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -19,6 +19,9 @@ import org.jboss.tools.usage.internal.JBossToolsUsageActivator; import org.osgi.service.prefs.BackingStoreException; +/** + * @author Andre Dietisheim + */ public class PreferencesUtils { private PreferencesUtils() { Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/CompositeCollectionFilter.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/CompositeCollectionFilter.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/CompositeCollectionFilter.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -11,6 +11,9 @@ package org.jboss.tools.usage.util.collectionfilter; +/** + * @author Andre Dietisheim + */ public class CompositeCollectionFilter<E> implements ICollectionFilter<E> { private ICollectionFilter<E> filters[]; Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/ICollectionEntryConverter.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/ICollectionEntryConverter.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/ICollectionEntryConverter.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -10,6 +10,9 @@ ******************************************************************************/ package org.jboss.tools.usage.util.collectionfilter; +/** + * @author Andre Dietisheim + */ public interface ICollectionEntryConverter<E, T> { public T convert(E entry); } \ No newline at end of file Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/ICollectionFilter.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/ICollectionFilter.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/ICollectionFilter.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -9,6 +9,7 @@ * Red Hat, Inc. - initial API and implementation ******************************************************************************/ package org.jboss.tools.usage.util.collectionfilter; + /** * @authro Andre Dietisheim */ Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/NoopConverter.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/NoopConverter.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/NoopConverter.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -10,7 +10,9 @@ ******************************************************************************/ package org.jboss.tools.usage.util.collectionfilter; - +/** + * @author Andre Dietisheim + */ public class NoopConverter<E, T> implements ICollectionEntryConverter<E, T> { @SuppressWarnings("unchecked") Modified: trunk/usage/tests/org.jboss.tools.usage.test/UsageTestSuite.launch =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/UsageTestSuite.launch 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/tests/org.jboss.tools.usage.test/UsageTestSuite.launch 2010-09-14 15:06:48 UTC (rev 24916) @@ -12,7 +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"/> +<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.gwt.ui,org.jboss.tools.gwt.core"/> <booleanAttribute key="includeOptional" value="true"/> <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> @@ -31,14 +31,14 @@ <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.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.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> <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"/> <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.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"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.osgi.services@default:default,org.eclipse.core.commands@default:default,javax.servlet@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.registry@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.core.jobs@default:default,org.eclipse.core.databinding.observable@default:default,org.junit4@default:default,org.eclipse.ui.workbench@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.jface@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.equinox.common@2:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.app@default:default,org.eclipse.jface.databinding@default:default,org.hamcrest.core@default:default,org.eclipse.ui@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.! runtime.compatibility.auth@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt@default:default,org.eclipse.core.databinding@default:default,com.ibm.icu@default:default,org.eclipse.help@default:default,org.eclipse.core.databinding.property@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default,org.jboss.tools.usage.test@default:default,org.jboss.tools.xulrunner.initializer@default:false"/> <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/JBossToolsComponentsTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsComponentsTest.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsComponentsTest.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -1,3 +1,13 @@ +/******************************************************************************* + * 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.assertFalse; Deleted: 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 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsFocusPoint.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -1,26 +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 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))); - } - -} Copied: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsTestsFocusPoint.java (from rev 24848, 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/JBossToolsTestsFocusPoint.java (rev 0) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsTestsFocusPoint.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -0,0 +1,27 @@ +/******************************************************************************* + * 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 JBossToolsTestsFocusPoint extends FocusPoint { + + public JBossToolsTestsFocusPoint(String childFocusPoint) { + super("tools"); + setChild(new FocusPoint("usage") + .setChild(new FocusPoint("tests") + .setChild(new FocusPoint(childFocusPoint)))); + } + +} Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsTestsFocusPoint.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-14 14:56:34 UTC (rev 24915) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -17,13 +17,13 @@ import java.util.regex.Pattern; import org.jboss.tools.usage.FocusPoint; -import org.jboss.tools.usage.HttpGetRequest; -import org.jboss.tools.usage.IHttpGetRequest; import org.jboss.tools.usage.ILoggingAdapter; import org.jboss.tools.usage.IURLBuildingStrategy; import org.jboss.tools.usage.PluginLogger; import org.jboss.tools.usage.googleanalytics.GoogleAnalyticsUrlStrategy; import org.jboss.tools.usage.googleanalytics.IGoogleAnalyticsParameters; +import org.jboss.tools.usage.http.HttpGetRequest; +import org.jboss.tools.usage.http.IHttpGetRequest; import org.jboss.tools.usage.test.fakes.ReportingEclipseEnvironmentFake; import org.jboss.tools.usage.test.fakes.RepportingEclipseEnvironmentFakeSingleton; import org.junit.Test; @@ -97,8 +97,6 @@ } private FocusPoint createFocusPoint(String childFocusPoint) { - return new FocusPoint("tools") - .setChild(new FocusPoint("usage") - .setChild(new FocusPoint(childFocusPoint))); + return new JBossToolsTestsFocusPoint(childFocusPoint); } } 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-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -14,8 +14,8 @@ import java.io.IOException; import java.net.HttpURLConnection; -import org.jboss.tools.usage.HttpGetRequest; import org.jboss.tools.usage.ILoggingAdapter; +import org.jboss.tools.usage.http.HttpGetRequest; import org.junit.Test; /** @@ -971,7 +971,7 @@ + "&utmfl=1.6.0_20" + "&utmr=0" + "&utm_content=1.0.0.qualifier" - + "&utmp=testJBossToolsVersionInAdContent" + + "&utmp=" + new JBossToolsTestsFocusPoint("testJBossToolsVersionInAdContent") + "&utmac=UA-17645367-1" + "&utmcc=__utma%3D999.43297294488397354581284108794036.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794025.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B" + "&gaq=1"; @@ -1013,7 +1013,7 @@ + "&utmdt=testWinWin7UserAgent" + "&utmfl=1.6.0_20" + "&utmr=1.0.0.qualifier" - + "&utmp=testWinWin7UserAgent" + + "&utmp=" + new JBossToolsTestsFocusPoint("testWinWin7UserAgent") + "&utmac=UA-17645367-1" + "&utmcc=__utma%3D999.43297885388356354581284108794036.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794025.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B" + "&gaq=1"; @@ -1034,7 +1034,7 @@ + "&utmdt=testWinVistaUserAgent" + "&utmfl=1.6.0_20" + "&utmr=1.0.0.qualifier" - + "&utmp=testWinVistaUserAgent" + + "&utmp=" + new JBossToolsTestsFocusPoint("testWinVistaUserAgent") + "&utmac=UA-17645367-1" + "&utmcc=__utma%3D999.43297885388397354581284108794036.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794025.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B" + "&gaq=1"; @@ -1055,7 +1055,7 @@ + "&utmdt=testWinXPUserAgent" + "&utmfl=1.6.0_20" + "&utmr=1.0.0.qualifier" - + "&utmp=testWinXPUserAgent" + + "&utmp=" + new JBossToolsTestsFocusPoint("testWinXPUserAgent") + "&utmac=UA-17645367-1" + "&utmcc=__utma%3D999.43297245388397354581284108794036.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794025.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B" + "&gaq=1"; @@ -1076,7 +1076,7 @@ + "&utmdt=testWin2000UserAgent" + "&utmfl=1.6.0_20" + "&utmr=1.0.0.qualifier" - + "&utmp=testWin2000UserAgent" + + "&utmp=" + new JBossToolsTestsFocusPoint("testWin2000UserAgent") + "&utmac=UA-17645367-1" + "&utmcc=__utma%3D999.43297292388397354581284108794036.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794025.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B" + "&gaq=1"; @@ -1097,7 +1097,7 @@ + "&utmdt=testMacLeopardUserAgent" + "&utmfl=1.6.0_20" + "&utmr=1.0.0.qualifier" - + "&utmp=testMacLeopardUserAgent" + + "&utmp=" + new JBossToolsTestsFocusPoint("testMacLeopardUserAgent") + "&utmac=UA-17645367-1" + "&utmcc=__utma%3D999.43297292388397333581284108794036.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794025.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B" + "&gaq=1"; @@ -1118,7 +1118,7 @@ + "&utmdt=testMacSnowLeopardUserAgent" + "&utmfl=1.6.0_20" + "&utmr=1.0.0.qualifier" - + "&utmp=testMacSnowLeopardUserAgent" + + "&utmp=" + new JBossToolsTestsFocusPoint("testMacSnowLeopardUserAgent") + "&utmac=UA-17645367-1" + "&utmcc=__utma%3D999.43297292388397333581222108794036.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794025.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B" + "&gaq=1"; Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageTestActivator.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageTestActivator.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageTestActivator.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -1,3 +1,12 @@ +/******************************************************************************* + * 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.eclipse.core.runtime.Plugin; Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/SystemOutLogger.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/SystemOutLogger.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/SystemOutLogger.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -1,3 +1,13 @@ +/******************************************************************************* + * 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.ILoggingAdapter; Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UrlRevealingTracker.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UrlRevealingTracker.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UrlRevealingTracker.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -15,10 +15,10 @@ import java.util.concurrent.locks.ReentrantLock; import org.jboss.tools.usage.FocusPoint; -import org.jboss.tools.usage.IHttpGetRequest; import org.jboss.tools.usage.ILoggingAdapter; import org.jboss.tools.usage.IURLBuildingStrategy; import org.jboss.tools.usage.Tracker; +import org.jboss.tools.usage.http.IHttpGetRequest; /** * @author Andre Dietisheim 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-14 14:56:34 UTC (rev 24915) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -15,11 +15,8 @@ /** * @author Andre Dietisheim - * */ @RunWith(Suite.class) -/** - */ @Suite.SuiteClasses({ FocusPointTest.class, GoogleAnalyticsUrlStrategyTest.class, Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/BundleGroupProviderFake.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/BundleGroupProviderFake.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/BundleGroupProviderFake.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -14,16 +14,9 @@ import org.eclipse.core.runtime.IBundleGroupProvider; import org.osgi.framework.Bundle; -/******************************************************************************* - * 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 - ******************************************************************************/ +/** + * @author Andre Dietisheim + */ public class BundleGroupProviderFake implements IBundleGroupProvider { private String[] featureNames; Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/EclipsePreferencesFake.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/EclipsePreferencesFake.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/EclipsePreferencesFake.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -18,6 +18,9 @@ import org.osgi.service.prefs.BackingStoreException; import org.osgi.service.prefs.Preferences; +/** + * @author Andre Dietisheim + */ public class EclipsePreferencesFake implements IEclipsePreferences { private Map<String, String> preferences; Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/EclipseUserAgentFake.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/EclipseUserAgentFake.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/EclipseUserAgentFake.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -1,3 +1,12 @@ +/******************************************************************************* + * 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.fakes; import org.eclipse.core.runtime.Assert; @@ -4,6 +13,9 @@ import org.eclipse.core.runtime.Platform; import org.jboss.tools.usage.googleanalytics.eclipse.EclipseUserAgent; +/** + * @author Andre Dietisheim + */ public class EclipseUserAgentFake extends EclipseUserAgent { private static final String APPLICATION_NAME = "com.jboss.jbds.product";