JBoss Tools SVN: r24427 - trunk/build/component.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-08-25 10:20:04 -0400 (Wed, 25 Aug 2010)
New Revision: 24427
Modified:
trunk/build/component/seam.xml
Log:
add hibernate tools as dep for seam build
Modified: trunk/build/component/seam.xml
===================================================================
--- trunk/build/component/seam.xml 2010-08-25 14:16:41 UTC (rev 24426)
+++ trunk/build/component/seam.xml 2010-08-25 14:20:04 UTC (rev 24427)
@@ -18,6 +18,7 @@
<!-- <module>../../xulrunner</module> -->
<module>../../vpe</module>
<module>../../jsf</module>
+ <module>../../hibernatetools</module>
<module>../../seam</module>
</modules>
</project>
15 years, 4 months
JBoss Tools SVN: r24426 - in trunk/usage: tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2010-08-25 10:16:41 -0400 (Wed, 25 Aug 2010)
New Revision: 24426
Added:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/GlobalUsageReportingSettings.java
Removed:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/GlobalUsageReportingEnablement.java
Modified:
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java
Log:
[JBIDE-6376] GlobalUsageReportingSettings renamed, tests corrected (false positive)
Deleted: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/GlobalUsageReportingEnablement.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/GlobalUsageReportingEnablement.java 2010-08-25 14:10:40 UTC (rev 24425)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/GlobalUsageReportingEnablement.java 2010-08-25 14:16:41 UTC (rev 24426)
@@ -1,168 +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.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-import org.eclipse.core.runtime.Assert;
-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;
-
-/**
- * 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.
- */
-public class GlobalUsageReportingEnablement {
-
- private static final String REPORTING_ENABLEMENT_ENABLEDVALUE = "ENABLED";
-
- private static final String GET_METHOD_NAME = "GET"; //$NON-NLS-1$
- private static final String REPORTING_ENABLEMENT_URL = "http://community.jboss.org/wiki/JBossToolsJBossDeveloperStudioUsageReport..."; //$NON-NLS-1$
- private static final String REPORTING_ENABLEMENT_STARTSEQUENCE = "Usage Reporting is "; //$NON-NLS-1$
-
- private Plugin plugin;
- private HttpURLConnection urlConnection;
-
- public GlobalUsageReportingEnablement(Plugin plugin) throws IOException {
- Assert.isNotNull(plugin);
-
- this.plugin = plugin;
- this.urlConnection = createURLConnection(REPORTING_ENABLEMENT_URL);
- }
-
- public boolean isEnabled() {
- try {
- return parse(request(REPORTING_ENABLEMENT_URL));
- } catch (IOException e) {
- IStatus status = StatusUtils.getErrorStatus(
- plugin.getBundle().getSymbolicName()
- , UsageMessages.KillSwitchPreference_Error_Exception, e);
- plugin.getLog().log(status);
- return false;
- }
- }
-
- /**
- * 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(String url) throws UnsupportedEncodingException {
- 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.getContentType());
- } else {
- IStatus status = StatusUtils.getErrorStatus(
- plugin.getBundle().getSymbolicName()
- , UsageMessages.KillSwitchPreference_Error_Http, null, url);
- plugin.getLog().log(status);
- }
- } catch (Exception e) {
- IStatus status = StatusUtils.getErrorStatus(
- plugin.getBundle().getSymbolicName()
- , UsageMessages.KillSwitchPreference_Error_Http, e, url);
- plugin.getLog().log(status);
- }
- return responseReader;
- }
-
- private InputStreamReader getInputStreamReader(String contentType) throws UnsupportedEncodingException, IOException {
- String contentTypeCharset = HttpEncodingUtils.getContentTypeCharset(contentType);
- if (contentTypeCharset != null && contentTypeCharset.length() > 0) {
- return new InputStreamReader(new BufferedInputStream(urlConnection.getInputStream()),
- contentTypeCharset);
- } else {
- return new InputStreamReader(new BufferedInputStream(urlConnection.getInputStream()));
- }
- }
-
- /**
- * Parses the given string and extracts the enablement value.
- *
- * @param input
- * stream that holds
- * @return true, if successful
- */
- private boolean parse(InputStreamReader reader) throws IOException {
- int i = 0;
- char[] reportingValueCharacters = new char[REPORTING_ENABLEMENT_ENABLEDVALUE.length()];
- for (int character = 0; character != -1; character = reader.read()) {
- if (REPORTING_ENABLEMENT_STARTSEQUENCE.charAt(i) == (char) character) {
- if (++i == REPORTING_ENABLEMENT_STARTSEQUENCE.length()) {
- reader.read(reportingValueCharacters);
- return isEnabled(new String(reportingValueCharacters));
- }
- } else {
- i = 0;
- }
- }
- return false;
- }
-
- private boolean isEnabled(String enablementValue) {
- return (enablementValue != null && REPORTING_ENABLEMENT_ENABLEDVALUE.equals(enablementValue.toUpperCase()));
- }
-
- /**
- * Creates a new url connection.
- *
- * @param urlString
- * the url string
- * @return the http url connection
- * @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();
- }
-}
Copied: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/GlobalUsageReportingSettings.java (from rev 24391, trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/GlobalUsageReportingEnablement.java)
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/GlobalUsageReportingSettings.java (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/GlobalUsageReportingSettings.java 2010-08-25 14:16:41 UTC (rev 24426)
@@ -0,0 +1,168 @@
+/*******************************************************************************
+ * 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.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+import org.eclipse.core.runtime.Assert;
+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;
+
+/**
+ * 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.
+ */
+public class GlobalUsageReportingSettings {
+
+ private static final String REPORTING_ENABLEMENT_ENABLEDVALUE = "ENABLED";
+
+ private static final String GET_METHOD_NAME = "GET"; //$NON-NLS-1$
+ private static final String REPORTING_ENABLEMENT_URL = "http://community.jboss.org/wiki/JBossToolsJBossDeveloperStudioUsageReport..."; //$NON-NLS-1$
+ private static final String REPORTING_ENABLEMENT_STARTSEQUENCE = "Usage Reporting is "; //$NON-NLS-1$
+
+ private Plugin plugin;
+ private HttpURLConnection urlConnection;
+
+ public GlobalUsageReportingSettings(Plugin plugin) throws IOException {
+ Assert.isNotNull(plugin);
+
+ this.plugin = plugin;
+ this.urlConnection = createURLConnection(REPORTING_ENABLEMENT_URL);
+ }
+
+ public boolean isEnabled() {
+ try {
+ return parse(request(REPORTING_ENABLEMENT_URL));
+ } catch (IOException e) {
+ IStatus status = StatusUtils.getErrorStatus(
+ plugin.getBundle().getSymbolicName()
+ , UsageMessages.KillSwitchPreference_Error_Exception, e);
+ plugin.getLog().log(status);
+ return false;
+ }
+ }
+
+ /**
+ * 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(String url) throws UnsupportedEncodingException {
+ 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.getContentType());
+ } else {
+ IStatus status = StatusUtils.getErrorStatus(
+ plugin.getBundle().getSymbolicName()
+ , UsageMessages.KillSwitchPreference_Error_Http, null, url);
+ plugin.getLog().log(status);
+ }
+ } catch (Exception e) {
+ IStatus status = StatusUtils.getErrorStatus(
+ plugin.getBundle().getSymbolicName()
+ , UsageMessages.KillSwitchPreference_Error_Http, e, url);
+ plugin.getLog().log(status);
+ }
+ return responseReader;
+ }
+
+ private InputStreamReader getInputStreamReader(String contentType) throws UnsupportedEncodingException, IOException {
+ String contentTypeCharset = HttpEncodingUtils.getContentTypeCharset(contentType);
+ if (contentTypeCharset != null && contentTypeCharset.length() > 0) {
+ return new InputStreamReader(new BufferedInputStream(urlConnection.getInputStream()),
+ contentTypeCharset);
+ } else {
+ return new InputStreamReader(new BufferedInputStream(urlConnection.getInputStream()));
+ }
+ }
+
+ /**
+ * Parses the given string and extracts the enablement value.
+ *
+ * @param input
+ * stream that holds
+ * @return true, if successful
+ */
+ private boolean parse(InputStreamReader reader) throws IOException {
+ int i = 0;
+ char[] reportingValueCharacters = new char[REPORTING_ENABLEMENT_ENABLEDVALUE.length()];
+ for (int character = 0; character != -1; character = reader.read()) {
+ if (REPORTING_ENABLEMENT_STARTSEQUENCE.charAt(i) == (char) character) {
+ if (++i == REPORTING_ENABLEMENT_STARTSEQUENCE.length()) {
+ reader.read(reportingValueCharacters);
+ return isEnabled(new String(reportingValueCharacters));
+ }
+ } else {
+ i = 0;
+ }
+ }
+ return false;
+ }
+
+ private boolean isEnabled(String enablementValue) {
+ return (enablementValue != null && REPORTING_ENABLEMENT_ENABLEDVALUE.equals(enablementValue.toUpperCase()));
+ }
+
+ /**
+ * Creates a new url connection.
+ *
+ * @param urlString
+ * the url string
+ * @return the http url connection
+ * @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();
+ }
+}
Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/GlobalUsageReportingSettings.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java 2010-08-25 14:10:40 UTC (rev 24425)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java 2010-08-25 14:16:41 UTC (rev 24426)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.usage.test;
+import static org.junit.Assert.*;
import static org.junit.Assert.assertTrue;
import java.io.ByteArrayInputStream;
@@ -27,27 +28,27 @@
@Test
public void canExtractEnabledValue() throws IOException {
- GlobalReportingEnablementFake reportEnablement = new GlobalReportingEnablementFake("ENABLED");
- assertTrue(reportEnablement.isEnabled());
+ GlobalReportingSettingsFake reportSettings= new GlobalReportingSettingsFake("ENABLED");
+ assertTrue(reportSettings.isEnabled());
}
@Test
public void canExtractDisabledValue() throws IOException {
- GlobalReportingEnablementFake reportEnablement = new GlobalReportingEnablementFake("DISABLED");
- assertTrue(reportEnablement.isEnabled());
+ GlobalReportingSettingsFake reportSettings = new GlobalReportingSettingsFake("DISABLED");
+ assertFalse(reportSettings.isEnabled());
}
@Test
public void canExtractDisabledOutUndefinedValue() throws IOException {
- GlobalReportingEnablementFake reportEnablement = new GlobalReportingEnablementFake("Rubbish");
- assertTrue(reportEnablement.isEnabled());
+ GlobalReportingSettingsFake reportEnablement = new GlobalReportingSettingsFake("Rubbish");
+ assertFalse(reportEnablement.isEnabled());
}
- private class GlobalReportingEnablementFake extends GlobalUsageReportingSettings {
+ private class GlobalReportingSettingsFake extends GlobalUsageReportingSettings {
private String enablementValue;
- public GlobalReportingEnablementFake(String enablementValue) throws IOException {
+ public GlobalReportingSettingsFake(String enablementValue) throws IOException {
super(JBossToolsUsageTestActivator.getDefault());
this.enablementValue = enablementValue;
}
@@ -112,10 +113,9 @@
+ " <div class=\"jive-content-body\"> "
+ " "
+ "<!-- [DocumentBodyStart:e26c60c0-cb73-47b7-bded-f4eb7320305b] --><div class=\"jive-rendered-content\"><p>This article is queried by the JBoss Tools / JBoss Developer Studio usage reporting plugin. It implements a global kill-switch that allows us to disable usage reporting stats. The plugin looks for a string of the format:</p><p style=\"min-height: 8pt; height: 8pt; padding: 0px;\"> </p><p><strong>Usage  Reporting  is <"
-
- + enablementValue
-
- + "></strong>. Any value that differs from ENABLED is interpreted as DISABLED.</p><p style=\"min-height: 8pt; height: 8pt; padding: 0px;\"> </p><h1>Usage Reporting is ENABLED</h1></div><!-- [DocumentBodyEnd:e26c60c0-cb73-47b7-bded-f4eb7320305b] --> "
+ + "ENABLED></strong>. Any value that differs from ENABLED is interpreted as DISABLED.</p><p style=\"min-height: 8pt; height: 8pt; padding: 0px;\"> </p><h1>Usage Reporting is "
+ + enablementValue
+ + "</h1></div><!-- [DocumentBodyEnd:e26c60c0-cb73-47b7-bded-f4eb7320305b] --> "
+ " "
+ " </div> "
+ " <div class=\"jive-content-footer\"> "
15 years, 4 months
JBoss Tools SVN: r24425 - in trunk/usage/tests/org.jboss.tools.usage.test: src/org/jboss/tools/usage/test and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2010-08-25 10:10:40 -0400 (Wed, 25 Aug 2010)
New Revision: 24425
Added:
trunk/usage/tests/org.jboss.tools.usage.test/UsageTestSuite.launch
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java
Removed:
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingEnablementTest.java
Modified:
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/EclipseEnvironmentFake.java
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.java
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/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/UsageTestSuite.java
Log:
[JBIDE-6376] tests refactored
Added: trunk/usage/tests/org.jboss.tools.usage.test/UsageTestSuite.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/UsageTestSuite.launch (rev 0)
+++ trunk/usage/tests/org.jboss.tools.usage.test/UsageTestSuite.launch 2010-08-25 14:10:40 UTC (rev 24425)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="false"/>
+<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/UsageTestSuite.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<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.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"/>
+<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.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"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="false"/>
+</launchConfiguration>
Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/UsageTestSuite.launch
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: 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-08-25 13:46:45 UTC (rev 24424)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmenTest.java 2010-08-25 14:10:40 UTC (rev 24425)
@@ -37,15 +37,9 @@
*/
public class EclipseEnvironmenTest {
- private static final String GANALYTICS_ACCOUNTNAME = "UA-17645367-1";
- private static final String HOSTNAME = "jboss.org";
- private static final String REFERRAL = "0";
- private static final String LOCALE_US = "en_US";
-
@Test
public void testMacOs() {
- EclipseEnvironment eclipseEnvironment = new EclipseEnvironmentFake(GANALYTICS_ACCOUNTNAME, HOSTNAME, REFERRAL,
- Platform.OS_MACOSX, LOCALE_US);
+ 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);
@@ -54,8 +48,7 @@
@Test
public void testLinux() {
- EclipseEnvironment eclipseEnvironment = new EclipseEnvironmentFake(GANALYTICS_ACCOUNTNAME, HOSTNAME, REFERRAL,
- Platform.OS_LINUX, LOCALE_US);
+ 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);
@@ -64,8 +57,7 @@
@Test
public void testWindows() {
- EclipseEnvironment eclipseEnvironment = new EclipseEnvironmentFake(GANALYTICS_ACCOUNTNAME, HOSTNAME, REFERRAL,
- Platform.OS_WIN32, LOCALE_US);
+ 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);
@@ -74,8 +66,7 @@
@Test
public void testKeyword() {
- EclipseEnvironment eclipseEnvironment = new EclipseEnvironmentFake(GANALYTICS_ACCOUNTNAME, HOSTNAME, REFERRAL,
- Platform.OS_WIN32, LOCALE_US) {
+ EclipseEnvironment eclipseEnvironment = new EclipseEnvironmentFake() {
@Override
protected Bundle[] getBundles() {
return new Bundle[] {
@@ -96,7 +87,7 @@
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());
@@ -119,7 +110,7 @@
assertEquals(1, matcher.groupCount());
assertEquals(language, matcher.group(1));
}
-
+
private class BundleSymbolicNameFake implements Bundle {
private String symbolicName;
@@ -242,12 +233,11 @@
throw new UnsupportedOperationException();
}
}
-
+
@Test
public void testVisitsOnFirstVisit() {
EclipsePreferencesFake preferences = new EclipsePreferencesFake();
- EclipseEnvironment eclipseEnvironment = new EclipseEnvironmentFake(GANALYTICS_ACCOUNTNAME, HOSTNAME, REFERRAL,
- Platform.OS_LINUX, LOCALE_US, preferences);
+ EclipseEnvironment eclipseEnvironment = new EclipseEnvironmentFake(preferences);
String firstVisit = eclipseEnvironment.getFirstVisit();
assertEquals(1, eclipseEnvironment.getVisitCount());
assertEquals(firstVisit, eclipseEnvironment.getLastVisit());
@@ -258,8 +248,7 @@
@Test
public void testVisitsOnSecondVisit() throws InterruptedException {
EclipsePreferencesFake preferences = new EclipsePreferencesFake();
- EclipseEnvironment eclipseEnvironment = new EclipseEnvironmentFake(GANALYTICS_ACCOUNTNAME, HOSTNAME, REFERRAL,
- Platform.OS_LINUX, LOCALE_US, preferences);
+ EclipseEnvironment eclipseEnvironment = new EclipseEnvironmentFake(preferences);
String firstVisit = eclipseEnvironment.getFirstVisit();
Thread.sleep(10);
eclipseEnvironment.visit();
@@ -273,8 +262,7 @@
@Test
public void testVisitsOnThirdVisit() throws InterruptedException {
EclipsePreferencesFake preferences = new EclipsePreferencesFake();
- EclipseEnvironment eclipseEnvironment = new EclipseEnvironmentFake(GANALYTICS_ACCOUNTNAME, HOSTNAME, REFERRAL,
- Platform.OS_LINUX, LOCALE_US, preferences);
+ EclipseEnvironment eclipseEnvironment = new EclipseEnvironmentFake(preferences);
String firstVisit = eclipseEnvironment.getFirstVisit();
Thread.sleep(10);
eclipseEnvironment.visit();
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-08-25 13:46:45 UTC (rev 24424)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmentFake.java 2010-08-25 14:10:40 UTC (rev 24425)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.usage.test;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.jboss.tools.usage.reporting.EclipseEnvironment;
@@ -18,15 +19,33 @@
*/
public class EclipseEnvironmentFake extends EclipseEnvironment {
+ 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";
+
private String locale;
private String os;
- public EclipseEnvironmentFake(String accountName, String hostName, String referral, String os, String locale, IEclipsePreferences preferences) {
+ public EclipseEnvironmentFake() {
+ this(GANALYTICS_ACCOUNTNAME, HOSTNAME, REFERRAL, Platform.OS_LINUX, LOCALE_US);
+ }
+
+ public EclipseEnvironmentFake(String platform) {
+ this(GANALYTICS_ACCOUNTNAME, HOSTNAME, REFERRAL, platform, LOCALE_US);
+ }
+
+ public EclipseEnvironmentFake(IEclipsePreferences preferences) {
+ this(GANALYTICS_ACCOUNTNAME, HOSTNAME, REFERRAL, Platform.OS_LINUX, LOCALE_US, preferences);
+ }
+
+ public EclipseEnvironmentFake(String accountName, String hostName, String referral, String os, String locale,
+ IEclipsePreferences preferences) {
super(accountName, hostName, referral, preferences);
this.os = os;
this.locale = locale;
}
-
+
public EclipseEnvironmentFake(String accountName, String hostName, String referral, String os, String locale) {
this(accountName, hostName, referral, os, locale, new EclipsePreferencesFake());
}
@@ -60,7 +79,7 @@
protected String getOS() {
return os;
}
-
+
@Override
protected String getApplicationVersion() {
return "3.0.1";
Deleted: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingEnablementTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingEnablementTest.java 2010-08-25 13:46:45 UTC (rev 24424)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingEnablementTest.java 2010-08-25 14:10:40 UTC (rev 24425)
@@ -1,141 +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.assertTrue;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-
-import org.jboss.tools.usage.GlobalUsageReportingEnablement;
-import org.junit.Test;
-
-/**
- * The Class GlobalReportingEnablementTest.
- */
-public class GlobalUsageReportingEnablementTest {
-
- @Test
- public void canExtractEnabledValue() throws IOException {
- GlobalReportingEnablementFake reportEnablement = new GlobalReportingEnablementFake("ENABLED");
- assertTrue(reportEnablement.isEnabled());
- }
-
- @Test
- public void canExtractDisabledValue() throws IOException {
- GlobalReportingEnablementFake reportEnablement = new GlobalReportingEnablementFake("DISABLED");
- assertTrue(reportEnablement.isEnabled());
- }
-
- @Test
- public void canExtractDisabledOutUndefinedValue() throws IOException {
- GlobalReportingEnablementFake reportEnablement = new GlobalReportingEnablementFake("Rubbish");
- assertTrue(reportEnablement.isEnabled());
- }
-
- private class GlobalReportingEnablementFake extends GlobalUsageReportingEnablement {
-
- private String enablementValue;
-
- public GlobalReportingEnablementFake(String enablementValue) throws IOException {
- super(JBossToolsUsageTestActivator.getDefault());
- this.enablementValue = enablementValue;
- }
-
- @Override
- protected InputStreamReader request(String url) throws UnsupportedEncodingException {
- return new InputStreamReader(new ByteArrayInputStream(getEnablementPageContent(enablementValue).getBytes()), "UTF-8");
-
- }
- }
-
- private String getEnablementPageContent(String enablementValue) {
- return "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\""
- + "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\"> "
- + " "
- + " "
- + "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\"> "
- + "<head> "
- + " <title> JBoss Tools / JBoss Developer Studio Usage Reporting Enablement - JBoss Community</title> "
- + " "
- + " <meta http-equiv=\"X-UA-Compatible\" content=\"IE=EmulateIE7\" /> "
- + " "
- + " <script type=\"text/javascript\"> "
- + " var javascriptIsCool = false;"
- + " </script> "
- + " "
- + "</head> "
- + "<body class=\"jive-body-content jive-body-content-document\" > "
- + " <div id=\"jive-body\"> "
- + " "
- + "<div class=\"jive-content\"> "
- + " <div class=\"jive-content-header\"> "
- + " <div class=\"jive-wiki-post-moderating jive-content-header-moderating\"> "
- + " <span class=\"jive-icon-med jive-icon-moderation\"></span>Currently Being Moderated"
- + " </div> "
- + " <div class=\"jive-content-title\"> "
- + " <h2><span class=\"jive-icon-big jive-icon-document\"></span> JBoss Tools / JBoss Developer Studio Usage Reporting Enablement</h2> "
- + " </div> "
- + " <div class=\"jive-content-header-version\"> "
- + " VERSION 5 "
- + " <a href=\"/wiki/JBossToolsJBossDeveloperStudioUsageReportingEnablement/diff?secondVersionNumber=5\" title=\"Click to view article history\"><img class=\"jive-icon-sml jive-icon-search\" src=\"/4.0.5/images/transparent.png\" alt=\"Click to view article history\" /></a> "
- + " </div> "
- + " <div class=\"jive-content-header-details\"> "
- + " "
- + "Created on: Aug 24, 2010 5:39 AM by"
- + "<a href=\"/people/adietish\""
- + "id=\"jive-72036899,987,346,482,238\""
- + "onmouseover=\"quickuserprofile.getUserProfileTooltip(72036);\""
- + "onmouseout=\"quickuserprofile.cancelTooltip();\""
- + "class=\"jiveTT-hover-user jive-username-link\""
- + ">Andre Dietisheim</a> <span>-</span> "
- + "Last Modified: "
- + "Aug 24, 2010 5:53 AM"
- + "by <a href=\"/people/adietish\""
- + "id=\"jive-72036899,987,347,353,238\""
- + "onmouseover=\"quickuserprofile.getUserProfileTooltip(72036);\""
- + "onmouseout=\"quickuserprofile.cancelTooltip();\""
- + "class=\"jiveTT-hover-user jive-username-link\""
- + ">Andre Dietisheim</a> </div> "
- + " "
- + " </div> "
- + " <div class=\"jive-content-body\"> "
- + " "
- + "<!-- [DocumentBodyStart:e26c60c0-cb73-47b7-bded-f4eb7320305b] --><div class=\"jive-rendered-content\"><p>This article is queried by the JBoss Tools / JBoss Developer Studio usage reporting plugin. It implements a global kill-switch that allows us to disable usage reporting stats. The plugin looks for a string of the format:</p><p style=\"min-height: 8pt; height: 8pt; padding: 0px;\"> </p><p><strong>Usage  Reporting  is <"
-
- + enablementValue
-
- + "></strong>. Any value that differs from ENABLED is interpreted as DISABLED.</p><p style=\"min-height: 8pt; height: 8pt; padding: 0px;\"> </p><h1>Usage Reporting is ENABLED</h1></div><!-- [DocumentBodyEnd:e26c60c0-cb73-47b7-bded-f4eb7320305b] --> "
- + " "
- + " </div> "
- + " <div class=\"jive-content-footer\"> "
- + " "
- + " "
- + " <!-- BEGIN content details --> "
- + " <span class=\"jive-content-footer-item\"> "
- + " 18 Views</a> "
- + " </span> "
- + " "
- + " "
- + " </div> "
- + "</div> "
- + "</body> "
- + "</html> ";
- }
-
- @Test
- public void isPageAccessible() throws IOException {
- GlobalUsageReportingEnablement reportEnablement = new GlobalUsageReportingEnablement(JBossToolsUsageTestActivator.getDefault());
- System.err.println("Usage reporting is globally \"" + reportEnablement.isEnabled() + "\"");
- }
-}
Copied: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java (from rev 24391, trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingEnablementTest.java)
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java (rev 0)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java 2010-08-25 14:10:40 UTC (rev 24425)
@@ -0,0 +1,141 @@
+/*******************************************************************************
+ * 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.assertTrue;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+
+import org.jboss.tools.usage.GlobalUsageReportingSettings;
+import org.junit.Test;
+
+/**
+ * The Class GlobalReportingEnablementTest.
+ */
+public class GlobalUsageReportingSettingsTest {
+
+ @Test
+ public void canExtractEnabledValue() throws IOException {
+ GlobalReportingEnablementFake reportEnablement = new GlobalReportingEnablementFake("ENABLED");
+ assertTrue(reportEnablement.isEnabled());
+ }
+
+ @Test
+ public void canExtractDisabledValue() throws IOException {
+ GlobalReportingEnablementFake reportEnablement = new GlobalReportingEnablementFake("DISABLED");
+ assertTrue(reportEnablement.isEnabled());
+ }
+
+ @Test
+ public void canExtractDisabledOutUndefinedValue() throws IOException {
+ GlobalReportingEnablementFake reportEnablement = new GlobalReportingEnablementFake("Rubbish");
+ assertTrue(reportEnablement.isEnabled());
+ }
+
+ private class GlobalReportingEnablementFake extends GlobalUsageReportingSettings {
+
+ private String enablementValue;
+
+ public GlobalReportingEnablementFake(String enablementValue) throws IOException {
+ super(JBossToolsUsageTestActivator.getDefault());
+ this.enablementValue = enablementValue;
+ }
+
+ @Override
+ protected InputStreamReader request(String url) throws UnsupportedEncodingException {
+ return new InputStreamReader(new ByteArrayInputStream(getEnablementPageContent(enablementValue).getBytes()), "UTF-8");
+
+ }
+ }
+
+ private String getEnablementPageContent(String enablementValue) {
+ return "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\""
+ + "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\"> "
+ + " "
+ + " "
+ + "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\"> "
+ + "<head> "
+ + " <title> JBoss Tools / JBoss Developer Studio Usage Reporting Enablement - JBoss Community</title> "
+ + " "
+ + " <meta http-equiv=\"X-UA-Compatible\" content=\"IE=EmulateIE7\" /> "
+ + " "
+ + " <script type=\"text/javascript\"> "
+ + " var javascriptIsCool = false;"
+ + " </script> "
+ + " "
+ + "</head> "
+ + "<body class=\"jive-body-content jive-body-content-document\" > "
+ + " <div id=\"jive-body\"> "
+ + " "
+ + "<div class=\"jive-content\"> "
+ + " <div class=\"jive-content-header\"> "
+ + " <div class=\"jive-wiki-post-moderating jive-content-header-moderating\"> "
+ + " <span class=\"jive-icon-med jive-icon-moderation\"></span>Currently Being Moderated"
+ + " </div> "
+ + " <div class=\"jive-content-title\"> "
+ + " <h2><span class=\"jive-icon-big jive-icon-document\"></span> JBoss Tools / JBoss Developer Studio Usage Reporting Enablement</h2> "
+ + " </div> "
+ + " <div class=\"jive-content-header-version\"> "
+ + " VERSION 5 "
+ + " <a href=\"/wiki/JBossToolsJBossDeveloperStudioUsageReportingEnablement/diff?secondVersionNumber=5\" title=\"Click to view article history\"><img class=\"jive-icon-sml jive-icon-search\" src=\"/4.0.5/images/transparent.png\" alt=\"Click to view article history\" /></a> "
+ + " </div> "
+ + " <div class=\"jive-content-header-details\"> "
+ + " "
+ + "Created on: Aug 24, 2010 5:39 AM by"
+ + "<a href=\"/people/adietish\""
+ + "id=\"jive-72036899,987,346,482,238\""
+ + "onmouseover=\"quickuserprofile.getUserProfileTooltip(72036);\""
+ + "onmouseout=\"quickuserprofile.cancelTooltip();\""
+ + "class=\"jiveTT-hover-user jive-username-link\""
+ + ">Andre Dietisheim</a> <span>-</span> "
+ + "Last Modified: "
+ + "Aug 24, 2010 5:53 AM"
+ + "by <a href=\"/people/adietish\""
+ + "id=\"jive-72036899,987,347,353,238\""
+ + "onmouseover=\"quickuserprofile.getUserProfileTooltip(72036);\""
+ + "onmouseout=\"quickuserprofile.cancelTooltip();\""
+ + "class=\"jiveTT-hover-user jive-username-link\""
+ + ">Andre Dietisheim</a> </div> "
+ + " "
+ + " </div> "
+ + " <div class=\"jive-content-body\"> "
+ + " "
+ + "<!-- [DocumentBodyStart:e26c60c0-cb73-47b7-bded-f4eb7320305b] --><div class=\"jive-rendered-content\"><p>This article is queried by the JBoss Tools / JBoss Developer Studio usage reporting plugin. It implements a global kill-switch that allows us to disable usage reporting stats. The plugin looks for a string of the format:</p><p style=\"min-height: 8pt; height: 8pt; padding: 0px;\"> </p><p><strong>Usage  Reporting  is <"
+
+ + enablementValue
+
+ + "></strong>. Any value that differs from ENABLED is interpreted as DISABLED.</p><p style=\"min-height: 8pt; height: 8pt; padding: 0px;\"> </p><h1>Usage Reporting is ENABLED</h1></div><!-- [DocumentBodyEnd:e26c60c0-cb73-47b7-bded-f4eb7320305b] --> "
+ + " "
+ + " </div> "
+ + " <div class=\"jive-content-footer\"> "
+ + " "
+ + " "
+ + " <!-- BEGIN content details --> "
+ + " <span class=\"jive-content-footer-item\"> "
+ + " 18 Views</a> "
+ + " </span> "
+ + " "
+ + " "
+ + " </div> "
+ + "</div> "
+ + "</body> "
+ + "</html> ";
+ }
+
+ @Test
+ public void isPageAccessible() throws IOException {
+ GlobalUsageReportingSettings reportEnablement = new GlobalUsageReportingSettings(JBossToolsUsageTestActivator.getDefault());
+ System.err.println("Usage reporting is globally \"" + reportEnablement.isEnabled() + "\"");
+ }
+}
Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.java 2010-08-25 13:46:45 UTC (rev 24424)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.java 2010-08-25 14:10:40 UTC (rev 24425)
@@ -14,7 +14,6 @@
import java.io.UnsupportedEncodingException;
-import org.eclipse.core.runtime.Platform;
import org.jboss.tools.usage.FocusPoint;
import org.jboss.tools.usage.googleanalytics.GoogleAnalyticsUrlStrategy;
import org.jboss.tools.usage.googleanalytics.IGoogleAnalyticsParameters;
@@ -26,11 +25,6 @@
*/
public class GoogleAnalyticsUrlStrategyTest {
- private static final String GANALYTICS_ACCOUNTNAME = "UA-17645367-1";
- private static final String HOSTNAME = "jboss.org";
- private static final String REFERRAL = "0";
- private static final String LOCALE_US = "en_US";
-
// private static final String COOKIE_DELIMITER = EncodingUtils.checkedEncodeUtf8(String
// .valueOf(IGoogleAnalyticsParameters.PLUS_SIGN));
@@ -38,7 +32,7 @@
@Before
public void setUp() {
- this.urlStrategy = new EclipseEnvironmentGAUrlStrategy();
+ this.urlStrategy = new GoogleAnalyticsUrlStrategy(new EclipseEnvironmentFake());
}
@Test
@@ -117,31 +111,4 @@
}
return value;
}
-
- private class EclipseEnvironmentGAUrlStrategy extends GoogleAnalyticsUrlStrategy {
-
- private EclipseEnvironmentGAUrlStrategy() {
- super(new EclipseEnvironmentFake(GANALYTICS_ACCOUNTNAME, HOSTNAME, REFERRAL, Platform.OS_LINUX, LOCALE_US) {
-
- @Override
- public String getScreenColorDepth() {
- return "24-bit";
- }
-
- @Override
- public String getScreenResolution() {
- return "1920x1080";
- }
-
- @Override
- public String getBrowserLanguage() {
- return "en_us";
- }
-
- @Override
- public String getUserId() {
- return String.valueOf(System.currentTimeMillis());
- }});
- }
- }
}
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-08-25 13:46:45 UTC (rev 24424)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java 2010-08-25 14:10:40 UTC (rev 24425)
@@ -46,7 +46,7 @@
@Test
public void sameUserIdOnSametEclipseInstance() throws Exception {
UrlRevealingTracker tracker = getTracker(getEclipseEnvironmentInstance());
- FocusPoint focusPoint = createFocusPoint("/testSameUserIdOnSametEclipseInstance" + System.currentTimeMillis());
+ FocusPoint focusPoint = createFocusPoint("testSameUserIdOnSametEclipseInstance" + System.currentTimeMillis());
tracker.trackSynchronously(focusPoint);
String userId = getUserId(tracker.getTrackingUrl());
assertTrue(userId != null);
@@ -67,7 +67,7 @@
assertTrue(userId != null);
tracker = getTracker(createEclipseEnvironment());
- FocusPoint focusPoint = createFocusPoint("/testDifferentUserIdOnDifferentEclipseInstance"
+ FocusPoint focusPoint = createFocusPoint("testDifferentUserIdOnDifferentEclipseInstance"
+ System.currentTimeMillis());
tracker.trackSynchronously(focusPoint);
String newUserId = getUserId(tracker.getTrackingUrl());
@@ -133,6 +133,7 @@
try {
lock.lock();
super.trackAsynchronously(focusPoint);
+ lock.unlock();
} catch (Exception e) {
lock.unlock();
throw new RuntimeException(e);
@@ -141,9 +142,7 @@
@Override
protected String getTrackingUrl(FocusPoint focusPoint) throws UnsupportedEncodingException {
- trackingUrl = super.getTrackingUrl(focusPoint);
- lock.unlock();
- return trackingUrl;
+ return trackingUrl = super.getTrackingUrl(focusPoint);
}
private String getTrackingUrl() {
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-08-25 13:46:45 UTC (rev 24424)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-08-25 14:10:40 UTC (rev 24425)
@@ -17,7 +17,6 @@
import org.jboss.tools.usage.HttpGetRequest;
import org.jboss.tools.usage.ILoggingAdapter;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
/**
@@ -32,567 +31,567 @@
this.loggingAdapter = new SystemOutLogger();
}
- @Ignore
- @Test
- public void testUrl0() throws IOException {
- String userAgent = "Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.4) Gecko/20100614 Ubuntu/10.04 (lucid) Firefox/10.0.0";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
- String url = "http://www.google-analytics.com/__utm.gif?"
- + "utmwv=4.7.2"
- + "&utmn=338321265"
- + "&utmhn=jboss.org"
- + "&utmcs=UTF-8"
- + "&utmsr=1920x1080"
- + "&utmsc=24-bit"
- + "&utmul=en-us"
- + "&utmje=1"
- + "&utmfl=10.1%20r53"
- + "&utmdt=-%20JBoss%20Community"
- + "&utmhid=1087431432"
- + "&utmr=0"
- + "&utmp=%2Ftools%2Fusage%2FtestUrl0"
- + "&utmac=UA-17645367-1"
- + "&utmcc=__utma%3D156030507.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
- + "&gaq=1";
- method.request(url);
- assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
- }
+// @Ignore
+// @Test
+// public void testUrl0() throws IOException {
+// String userAgent = "Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.4) Gecko/20100614 Ubuntu/10.04 (lucid) Firefox/10.0.0";
+// TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
+// String url = "http://www.google-analytics.com/__utm.gif?"
+// + "utmwv=4.7.2"
+// + "&utmn=338321265"
+// + "&utmhn=jboss.org"
+// + "&utmcs=UTF-8"
+// + "&utmsr=1920x1080"
+// + "&utmsc=24-bit"
+// + "&utmul=en-us"
+// + "&utmje=1"
+// + "&utmfl=10.1%20r53"
+// + "&utmdt=-%20JBoss%20Community"
+// + "&utmhid=1087431432"
+// + "&utmr=0"
+// + "&utmp=%2Ftools%2Fusage%2FtestUrl0"
+// + "&utmac=UA-17645367-1"
+// + "&utmcc=__utma%3D156030507.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+// + "&gaq=1";
+// method.request(url);
+// assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+// }
+//
+// @Ignore
+// @Test
+// public void testUrl0_0() throws IOException {
+// String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US)";
+// TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
+// String url = "http://www.google-analytics.com/__utm.gif?"
+// + "utmwv=4.7.2"
+// + "&utmn=338321288"
+// + "&utmhn=jboss.org"
+// + "&utmcs=UTF-8"
+// + "&utmsr=1920x1080"
+// + "&utmsc=24-bit"
+// + "&utmul=en-us"
+// + "&utmje=1"
+// + "&utmfl=10.1%20r53"
+// + "&utmdt=-%20JBoss%20Community"
+// + "&utmhid=1087431432"
+// + "&utmr=0"
+// + "&utmp=%2Ftools%2Fusage%2FtestUrl0_0"
+// + "&utmac=UA-17645367-1"
+// + "&utmcc=__utma%3D156032507.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+// + "&gaq=1";
+// method.request(url);
+// assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+// }
+//
+// @Ignore
+// @Test
+// public void testUrl0_1() throws IOException {
+// String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US; rv:1.9.2.4) Gecko/20100614 Ubuntu/10.04 (lucid) v201006010437R-H98-GA";
+// TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
+// String url = "http://www.google-analytics.com/__utm.gif?"
+// + "utmwv=4.7.2"
+// + "&utmn=3383212651"
+// + "&utmhn=jboss.org"
+// + "&utmcs=UTF-8"
+// + "&utmsr=1920x1080"
+// + "&utmsc=24-bit"
+// + "&utmul=en-us"
+// + "&utmje=1"
+// + "&utmfl=10.1%20r53"
+// + "&utmdt=-%20JBoss%20Community"
+// + "&utmhid=1087431432"
+// + "&utmr=0"
+// + "&utmp=%2Ftools%2Fusage%2FtestUrl0_1"
+// + "&utmac=UA-17645367-1"
+// + "&utmcc=__utma%3D156030508.195542053.1281528584.1281528584.1281528584.1%3B%2B__utmz%3D156030500.1281528584.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+// + "&gaq=1";
+// method.request(url);
+// assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+// }
+//
+// @Ignore
+// @Test
+// public void testUrl0_2() throws IOException {
+// String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US; rv:1.9.2.4) Gecko/20100614 Ubuntu/10.04 (lucid) Eclipse/3.5.0";
+// TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
+// String url = "http://www.google-analytics.com/__utm.gif?"
+// + "utmwv=4.7.2"
+// + "&utmn=3383212652"
+// + "&utmhn=jboss.org"
+// + "&utmcs=UTF-8"
+// + "&utmsr=1920x1080"
+// + "&utmsc=24-bit"
+// + "&utmul=en-us"
+// + "&utmje=1"
+// + "&utmfl=10.1%20r53"
+// + "&utmdt=-%20JBoss%20Community"
+// + "&utmhid=1087431432"
+// + "&utmr=0"
+// + "&utmp=%2Ftools%2Fusage%2FtestUrl0_2"
+// + "&utmac=UA-17645367-1"
+// + "&utmcc=__utma%3D156030509.1285760712.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+// + "&gaq=1";
+// method.request(url);
+// assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+// }
+//
+// @Ignore
+// @Test
+// public void testUrl0_3() throws IOException {
+// String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US;) Eclipse/3.5.0";
+// TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
+// String url = "http://www.google-analytics.com/__utm.gif?"
+// + "utmwv=4.7.2"
+// + "&utmn=3383212651"
+// + "&utmhn=jboss.org"
+// + "&utmcs=UTF-8"
+// + "&utmsr=1920x1080"
+// + "&utmsc=24-bit"
+// + "&utmul=en-us"
+// + "&utmje=1"
+// + "&utmfl=10.1%20r53"
+// + "&utmdt=-%20JBoss%20Community"
+// + "&utmhid=1087431432"
+// + "&utmr=0"
+// + "&utmp=%2Ftools%2Fusage%2FtestUrl0_3"
+// + "&utmac=UA-17645367-1"
+// + "&utmcc=__utma%3D156030501.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+// + "&gaq=1";
+// method.request(url);
+// assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+// }
+//
+// @Ignore
+// @Test
+// public void testUrl0_4() throws IOException {
+// String userAgent = "com.jboss.jbds.product/3.0.1";
+// TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
+// String url = "http://www.google-analytics.com/__utm.gif?"
+// + "utmwv=4.7.2"
+// + "&utmn=3383212651"
+// + "&utmhn=jboss.org"
+// + "&utmcs=UTF-8"
+// + "&utmsr=1920x1080"
+// + "&utmsc=24-bit"
+// + "&utmul=en-us"
+// + "&utmje=1"
+// + "&utmfl=10.1%20r53"
+// + "&utmdt=-%20JBoss%20Community"
+// + "&utmhid=1087431432"
+// + "&utmr=0"
+// + "&utmp=%2Ftools%2Fusage%2FtestUrl0_4"
+// + "&utmac=UA-17645367-1"
+// + "&utmcc=__utma%3D156030502.195542053.1281528584.1281528584.1281528584.1%3B%2B__utmz%3D156030500.1281528584.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+// + "&gaq=1";
+// method.request(url);
+// assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+// }
+//
+// @Ignore
+// @Test
+// public void testUrl0_5() throws IOException {
+// String userAgent = "com.jboss.jbds.product/3.0.1 (Linux x86_64)";
+// TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
+// String url = "http://www.google-analytics.com/__utm.gif?"
+// + "utmwv=4.7.2"
+// + "&utmn=33832126513"
+// + "&utmhn=jboss.org"
+// + "&utmcs=UTF-8"
+// + "&utmsr=1920x1080"
+// + "&utmsc=24-bit"
+// + "&utmul=en-us"
+// + "&utmje=1"
+// + "&utmfl=10.1%20r53"
+// + "&utmdt=-%20JBoss%20Community"
+// + "&utmhid=1087431432"
+// + "&utmr=0"
+// + "&utmp=%2Ftools%2Fusage%2FtestUrl0_5"
+// + "&utmac=UA-17645367-1"
+// + "&__utma%3D156030503.195542053.1281528584.1281528584.1281528584.1%3B%2B__utmz%3D156030500.1281528584.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+// + "&gaq=1";
+// method.request(url);
+// assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+// }
+//
+// @Ignore
+// @Test
+// public void testUrl0_6() throws IOException {
+// String userAgent = "Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.4) Gecko/20100614 Ubuntu/10.04 (lucid) com.jboss.jbds.product/3.0.1";
+// TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
+// String url = "http://www.google-analytics.com/__utm.gif?"
+// + "utmwv=4.7.2"
+// + "&utmn=338321265"
+// + "&utmhn=jboss.org"
+// + "&utmcs=UTF-8"
+// + "&utmsr=1920x1080"
+// + "&utmsc=24-bit"
+// + "&utmul=en-us"
+// + "&utmje=1"
+// + "&utmfl=10.1%20r53"
+// + "&utmdt=-%20JBoss%20Community"
+// + "&utmhid=1087431432"
+// + "&utmr=0"
+// + "&utmp=%2Ftools%2Fusage%2FtestUrl0_6"
+// + "&utmac=UA-17645367-1"
+// + "&utmcc=__utma%3D156030507.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+// + "&gaq=1";
+// method.request(url);
+// assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+// }
+//
+// @Ignore
+// @Test
+// public void testUrl0_7() throws IOException {
+// String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US)";
+// TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
+// String url = "http://www.google-analytics.com/__utm.gif?"
+// + "utmwv=4.7.2"
+// + "&utmn=338321268"
+// + "&utmhn=jboss.org"
+// + "&utmcs=UTF-8"
+// + "&utmsr=1920x1080"
+// + "&utmsc=24-bit"
+// + "&utmul=en-us"
+// + "&utmje=1"
+// + "&utmfl=10.1%20r53"
+// + "&utmdt=-%20JBoss%20Community"
+// + "&utmhid=1087431432"
+// + "&utmr=0"
+// + "&utmp=%2Ftools%2Fusage%2FtestUrl0_7"
+// + "&utmac=UA-17645367-1"
+// + "&utmcc=__utma%3D156030507.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+// + "&gaq=1";
+// method.request(url);
+// assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+// }
+//
+// @Ignore
+// @Test
+// public void testUrl0_7_1() throws IOException {
+// String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-us)";
+// TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
+// String url = "http://www.google-analytics.com/__utm.gif?"
+// + "utmwv=4.7.2"
+// + "&utmn=338321068"
+// + "&utmhn=jboss.org"
+// + "&utmcs=UTF-8"
+// + "&utmsr=1920x1080"
+// + "&utmsc=24-bit"
+// + "&utmje=1"
+// + "&utmfl=10.1%20r53"
+// + "&utmdt=-%20JBoss%20Community"
+// + "&utmhid=1087431432"
+// + "&utmr=0"
+// + "&utmp=%2Ftools%2Fusage%2FtestUrl0_7_1"
+// + "&utmac=UA-17645367-1"
+// + "&utmcc=__utma%3D156030507.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+// + "&gaq=1";
+// method.request(url);
+// assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+// }
+//
+// @Ignore
+// @Test
+// public void testUrl0_7_2() throws IOException {
+// String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US)";
+// TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
+// String url = "http://www.google-analytics.com/__utm.gif?"
+// + "utmwv=4.7.2"
+// + "&utmn=338333268"
+// + "&utmhn=jboss.org"
+// + "&utmcs=UTF-8"
+// + "&utmsr=1920x1080"
+// + "&utmsc=24-bit"
+// + "&utmul=en-us"
+// + "&utmdt=-%20JBoss%20Community"
+// + "&utmhid=1087431432"
+// + "&utmr=0"
+// + "&utmp=%2Ftools%2Fusage%2FtestUrl0_7_2"
+// + "&utmac=UA-17645367-1"
+// + "&utmcc=__utma%3D156620507.1285760111.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+// + "&gaq=1";
+// method.request(url);
+// assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+// }
+//
+// @Ignore
+// @Test
+// public void testUrl0_7_3() throws IOException {
+// String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US)";
+// TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
+// String url = "http://www.google-analytics.com/__utm.gif?"
+// + "utmwv=4.7.2"
+// + "&utmn=311333268"
+// + "&utmhn=jboss.org"
+// + "&utmcs=UTF-8"
+// + "&utmsr=1920x1080"
+// + "&utmsc=24-bit"
+// + "&utmul=en-us"
+// + "&utmdt=tools-usage-test_0_7_3"
+// + "&utmhid=1087431432"
+// + "&utmr=0"
+// + "&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3"
+// + "&utmac=UA-17645367-1"
+// + "&utmcc=__utma%3D112660507.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+// + "&gaq=1";
+// method.request(url);
+// assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+// }
+//
+// @Ignore
+// @Test
+// public void testUrl0_7_3_mac() throws IOException {
+// String userAgent = "com.jboss.jbds.product/3.0.1 (Macintosh; U; Intel Mac OS X 10.5; fr)";
+// TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
+// String url = "http://www.google-analytics.com/__utm.gif?"
+// + "utmwv=4.7.2"
+// + "&utmn=351333268"
+// + "&utmhn=jboss.org"
+// + "&utmcs=UTF-8"
+// + "&utmsr=1920x1080"
+// + "&utmsc=24-bit"
+// + "&utmul=en-us"
+// + "&utmdt=tools-usage-test_0_7_3"
+// + "&utmhid=1087431432"
+// + "&utmr=0"
+// + "&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3_mac"
+// + "&utmac=UA-17645367-1"
+// + "&utmcc=__utma%3D133660507.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+// + "&gaq=1";
+// method.request(url);
+// assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+// }
+//
+// @Ignore
+// @Test
+// public void testUrl0_7_3_win() throws IOException {
+// String userAgent = "com.jboss.jbds.product/3.0.1 (Windows; U; Windows NT 6.1; en-US)";
+// TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
+// String url = "http://www.google-analytics.com/__utm.gif?"
+// + "utmwv=4.7.2"
+// + "&utmn=351333254"
+// + "&utmhn=jboss.org"
+// + "&utmcs=UTF-8"
+// + "&utmsr=1920x1080"
+// + "&utmsc=24-bit"
+// + "&utmul=en-us"
+// + "&utmdt=tools-usage-test_0_7_3_win"
+// + "&utmhid=1087431432"
+// + "&utmr=0"
+// + "&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3_win"
+// + "&utmac=UA-17645367-1"
+// + "&utmcc=__utma%3D133660522.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+// + "&gaq=1";
+// method.request(url);
+// assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+// }
+//
+// @Ignore
+// @Test
+// public void testUrl0_7_3_1() throws IOException {
+// String userAgent = "com.jboss.jbds.product/3.0.1 (Windows; U; Windows NT 6.1; en-US)";
+// TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
+// String url = "http://www.google-analytics.com/__utm.gif?"
+// + "utmwv=4.7.2"
+// + "&utmn=358333254"
+// + "&utmhn=jboss.org"
+// + "&utmcs=UTF-8"
+// + "&utmsr=1920x1080"
+// + "&utmsc=24-bit"
+// + "&utmul=en-us"
+// + "&utmdt=tools-usage-test_0_7_3_1"
+// + "&utmhid=1087431432"
+// + "&utmr=smooks|seam|drools|esb"
+// + "&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3_1"
+// + "&utmac=UA-17645367-1"
+// + "&utmcc=__utma%3D133860522.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+// + "&gaq=1";
+// method.request(url);
+// assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+// }
+//
+// @Ignore
+// @Test
+// public void testUrl8() throws IOException {
+// String userAgent = "com.jboss.jbds.product/3.0.1 (Windows; U; Windows NT 6.1; en-US)";
+// TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
+// String url = "http://www.google-analytics.com/__utm.gif?"
+// + "utmwv=4.7.2"
+// + "&utmn=453325272"
+// + "&utmhn=jboss.org"
+// + "&utmcs=UTF-8"
+// + "&utmsr=1920x1080"
+// + "&utmsc=24-bit"
+// + "&utmul=en-US"
+// + "&utmdt=jboss.org-tools-usage-instance"
+// + "&utmhid=1722580305"
+// + "&utmr=org.jboss.tools.usage.tests"
+// + "&utmp=%2Fjboss.org%2Ftools%2Fusage%2FtestUrl8"
+// + "&utmac=UA-17645367-1"
+// + "&utmcc=__utma%3D999.69517276658961975851281943564260.1281943564259.1281943564259.1281943564259.-1%3B%2B__utmz%3D999.1281943564259.1.1.utmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%3B"
+// + "&gaq=1";
+// method.request(url);
+// assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+// }
+//
+// @Ignore
+// @Test
+// public void testUrl0_7_3_win_referral() throws IOException {
+// String userAgent = "com.jboss.jbds.product/3.0.1 (Windows; U; Windows NT 6.1; en-US)";
+// TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
+// String url = "http://www.google-analytics.com/__utm.gif?"
+// + "utmwv=4.7.2"
+// + "&utmn=351334444"
+// + "&utmhn=jboss.org"
+// + "&utmcs=UTF-8"
+// + "&utmsr=1920x1080"
+// + "&utmsc=24-bit"
+// + "&utmul=en-us"
+// + "&utmdt=tools-usage-test_0_7_3_win_referral"
+// + "&utmhid=1087431432"
+// + "&utmr=seam|esb|smooks|birt|bpel|cdi|deltacloud|drools"
+// + "&utm_content=test1%7Ctest2%7Ctest3"
+// + "&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3_win_referral"
+// + "&utmac=UA-17645367-1"
+// + "&utmcc=__utma%3D133663892.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+// + "&gaq=1";
+// method.request(url);
+// assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+// }
+//
+// @Ignore
+// @Test
+// public void testUrl0_7_3_win_adcontent() throws IOException {
+// String userAgent = "com.jboss.jbds.product/3.0.1 (Windows; U; Windows NT 6.1; en-US)";
+// TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
+// String url = "http://www.google-analytics.com/__utm.gif?"
+// + "utmwv=4.7.2"
+// + "&utmn=378334444"
+// + "&utmhn=jboss.org"
+// + "&utmcs=UTF-8"
+// + "&utmsr=1920x1080"
+// + "&utmsc=24-bit"
+// + "&utmul=en-us"
+// + "&utmdt=tools-usage-test_0_7_3_win_adcontent"
+// + "&utmhid=1087431432"
+// + "&utmr=seam|esb|smooks|birt|bpel|cdi|deltacloud|drools"
+// + "&utm_content=test1%7Ctest2%7Ctest3%7test4"
+// + "&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3_win_adcontent"
+// + "&utmac=UA-17645367-1"
+// + "&utmcc=__utma%3D455663892.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+// + "&gaq=1";
+// method.request(url);
+// assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+// }
+//
+// @Ignore
+// @Test
+// public void testUrl0_7_3_win_keyword() throws IOException {
+// String userAgent = "com.jboss.jbds.product/3.0.1 (Windows; U; Windows NT 6.1; en-US)";
+// TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
+// String url = "http://www.google-analytics.com/__utm.gif?"
+// + "utmwv=4.7.2"
+// + "&utmn=378334354"
+// + "&utmhn=jboss.org"
+// + "&utmcs=UTF-8"
+// + "&utmsr=1920x1080"
+// + "&utmsc=24-bit"
+// + "&utmul=en-us"
+// + "&utmdt=tools-usage-test_0_7_3_win_keyword"
+// + "&utmhid=1087431432"
+// + "&utmr=seam|esb|smooks|birt|bpel|cdi|deltacloud|drools"
+// + "&term=test1%7Ctest2%7Ctest3%7test4"
+// + "&utm_term=test1a%7Ctest2a%7Ctest3a%7test4a"
+// + "&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3_win_keyword"
+// + "&utmac=UA-17645367-1"
+// + "&utmcc=__utma%3D887463892.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+// + "&gaq=1";
+// method.request(url);
+// assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+// }
+//
+// @Ignore
+// @Test
+// public void testUrl0_7_3_win_utmz() throws IOException {
+// String userAgent = "com.jboss.jbds.product/3.0.1 (Windows; U; Windows NT 6.1; en-US)";
+// TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
+// String url = "http://www.google-analytics.com/__utm.gif?"
+// + "utmwv=4.7.2"
+// + "&utmn=351334444"
+// + "&utmhn=jboss.org"
+// + "&utmcs=UTF-8"
+// + "&utmsr=1920x1080"
+// + "&utmsc=24-bit"
+// + "&utmul=en-us"
+// + "&utmdt=tools-usage-test_0_7_3_win__utmz"
+// + "&utmhid=1087431432"
+// + "&utmr=seam|esb|smooks|birt|bpel|cdi|deltacloud|drools"
+// + "&utm_content=test1%7Ctest2%7Ctest3"
+// + "&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3_win__utmz"
+// + "&utmac=UA-17645367-1"
+// + "&utmz=test1%7Ctest2%7Ctest3"
+// + "&utmcc=__utma%3D133663892.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+// + "&gaq=1";
+// method.request(url);
+// assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+// }
+//
+// @Ignore
+// @Test
+// public void testUrl0_7_3_win_utmctr() throws IOException {
+// String userAgent = "com.jboss.jbds.product/3.0.1 (Windows; U; Windows NT 6.1; en-US)";
+// TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
+// String url = "http://www.google-analytics.com/__utm.gif?"
+// + "utmwv=4.7.2"
+// + "&utmn=351334444"
+// + "&utmhn=jboss.org"
+// + "&utmcs=UTF-8"
+// + "&utmsr=1920x1080"
+// + "&utmsc=24-bit"
+// + "&utmul=en-us"
+// + "&utmdt=tools-usage-test_0_7_3_win__utmctr"
+// + "&utmhid=1087431432"
+// + "&utmr=seam|esb|smooks|birt|bpel|cdi|deltacloud|drools"
+// + "&utm_content=test1%7Ctest2%7Ctest3"
+// + "&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3_win_utctr"
+// + "&utmac=UA-17645367-1"
+// + "&utmz=test1%7Ctest2%7Ctest3"
+// + "&utmcc=__utma%3D133663892.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3D%7Cutmctr%3Dtest1%7Ctest2%7Ctest3%3B"
+// + "&gaq=1";
+// method.request(url);
+// assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+// }
+//
+// @Ignore
+// @Test
+// public void testUrl0_7_3_win_utmctr_lengthtest() throws IOException {
+// String userAgent = "com.jboss.jbds.product/3.0.1 (Windows; U; Windows NT 6.1; en-US)";
+// TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
+// String url = "http://www.google-analytics.com/__utm.gif?"
+// + "utmwv=4.7.2"
+// + "&utmn=351334794"
+// + "&utmhn=jboss.org"
+// + "&utmcs=UTF-8"
+// + "&utmsr=1920x1080"
+// + "&utmsc=24-bit"
+// + "&utmul=en-us"
+// + "&utmdt=tools-usage-test_0_7_3_win_lengthtest"
+// + "&utmhid=1087431432"
+// + "&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3_win_lengthtest"
+// + "&utmac=UA-17645367-1"
+// + "&utmcc="
+// + "__utma%3D133697892.1285760711.1281430767.1281430767.1281430767.1%3B%2B"
+// + "__utmz%3D156030500.1281430767.1.1."
+// + "utmcsr%3D(direct)%7C"
+// + "utmccn%3D(direct)%7C"
+// + "utmcmd%3D(none)%7C"
+// + "utmctr%3Dtest1%7Ctest2%7Ctest3%7Ctest4%7Ctest5%7Ctest6%7Ctest7%7Ctest8%7Ctest8%7Ctest9%7Ctest10%7Ctest11%7Ctest12%7Ctest13%7Ctest514%7Ctest14%7Ctest15%7Ctest16%7Ctest17%7Ctest18%7Ctest19%7Ctest20%7Ctest20%7Ctest21%7Ctest22%7Ctest23%7Ctest514%7Ctest24%7Ctest25%7Ctest26%7Ctest27%7Ctest28%7Ctest29%7Ctest30%7Ctest31%3B"
+// + "&gaq=1";
+// method.request(url);
+// assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+// }
- @Ignore
@Test
- public void testUrl0_0() throws IOException {
- String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US)";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
- String url = "http://www.google-analytics.com/__utm.gif?"
- + "utmwv=4.7.2"
- + "&utmn=338321288"
- + "&utmhn=jboss.org"
- + "&utmcs=UTF-8"
- + "&utmsr=1920x1080"
- + "&utmsc=24-bit"
- + "&utmul=en-us"
- + "&utmje=1"
- + "&utmfl=10.1%20r53"
- + "&utmdt=-%20JBoss%20Community"
- + "&utmhid=1087431432"
- + "&utmr=0"
- + "&utmp=%2Ftools%2Fusage%2FtestUrl0_0"
- + "&utmac=UA-17645367-1"
- + "&utmcc=__utma%3D156032507.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
- + "&gaq=1";
- method.request(url);
- assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
- }
-
- @Ignore
- @Test
- public void testUrl0_1() throws IOException {
- String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US; rv:1.9.2.4) Gecko/20100614 Ubuntu/10.04 (lucid) v201006010437R-H98-GA";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
- String url = "http://www.google-analytics.com/__utm.gif?"
- + "utmwv=4.7.2"
- + "&utmn=3383212651"
- + "&utmhn=jboss.org"
- + "&utmcs=UTF-8"
- + "&utmsr=1920x1080"
- + "&utmsc=24-bit"
- + "&utmul=en-us"
- + "&utmje=1"
- + "&utmfl=10.1%20r53"
- + "&utmdt=-%20JBoss%20Community"
- + "&utmhid=1087431432"
- + "&utmr=0"
- + "&utmp=%2Ftools%2Fusage%2FtestUrl0_1"
- + "&utmac=UA-17645367-1"
- + "&utmcc=__utma%3D156030508.195542053.1281528584.1281528584.1281528584.1%3B%2B__utmz%3D156030500.1281528584.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
- + "&gaq=1";
- method.request(url);
- assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
- }
-
- @Ignore
- @Test
- public void testUrl0_2() throws IOException {
- String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US; rv:1.9.2.4) Gecko/20100614 Ubuntu/10.04 (lucid) Eclipse/3.5.0";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
- String url = "http://www.google-analytics.com/__utm.gif?"
- + "utmwv=4.7.2"
- + "&utmn=3383212652"
- + "&utmhn=jboss.org"
- + "&utmcs=UTF-8"
- + "&utmsr=1920x1080"
- + "&utmsc=24-bit"
- + "&utmul=en-us"
- + "&utmje=1"
- + "&utmfl=10.1%20r53"
- + "&utmdt=-%20JBoss%20Community"
- + "&utmhid=1087431432"
- + "&utmr=0"
- + "&utmp=%2Ftools%2Fusage%2FtestUrl0_2"
- + "&utmac=UA-17645367-1"
- + "&utmcc=__utma%3D156030509.1285760712.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
- + "&gaq=1";
- method.request(url);
- assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
- }
-
- @Ignore
- @Test
- public void testUrl0_3() throws IOException {
- String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US;) Eclipse/3.5.0";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
- String url = "http://www.google-analytics.com/__utm.gif?"
- + "utmwv=4.7.2"
- + "&utmn=3383212651"
- + "&utmhn=jboss.org"
- + "&utmcs=UTF-8"
- + "&utmsr=1920x1080"
- + "&utmsc=24-bit"
- + "&utmul=en-us"
- + "&utmje=1"
- + "&utmfl=10.1%20r53"
- + "&utmdt=-%20JBoss%20Community"
- + "&utmhid=1087431432"
- + "&utmr=0"
- + "&utmp=%2Ftools%2Fusage%2FtestUrl0_3"
- + "&utmac=UA-17645367-1"
- + "&utmcc=__utma%3D156030501.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
- + "&gaq=1";
- method.request(url);
- assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
- }
-
- @Ignore
- @Test
- public void testUrl0_4() throws IOException {
- String userAgent = "com.jboss.jbds.product/3.0.1";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
- String url = "http://www.google-analytics.com/__utm.gif?"
- + "utmwv=4.7.2"
- + "&utmn=3383212651"
- + "&utmhn=jboss.org"
- + "&utmcs=UTF-8"
- + "&utmsr=1920x1080"
- + "&utmsc=24-bit"
- + "&utmul=en-us"
- + "&utmje=1"
- + "&utmfl=10.1%20r53"
- + "&utmdt=-%20JBoss%20Community"
- + "&utmhid=1087431432"
- + "&utmr=0"
- + "&utmp=%2Ftools%2Fusage%2FtestUrl0_4"
- + "&utmac=UA-17645367-1"
- + "&utmcc=__utma%3D156030502.195542053.1281528584.1281528584.1281528584.1%3B%2B__utmz%3D156030500.1281528584.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
- + "&gaq=1";
- method.request(url);
- assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
- }
-
- @Ignore
- @Test
- public void testUrl0_5() throws IOException {
- String userAgent = "com.jboss.jbds.product/3.0.1 (Linux x86_64)";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
- String url = "http://www.google-analytics.com/__utm.gif?"
- + "utmwv=4.7.2"
- + "&utmn=33832126513"
- + "&utmhn=jboss.org"
- + "&utmcs=UTF-8"
- + "&utmsr=1920x1080"
- + "&utmsc=24-bit"
- + "&utmul=en-us"
- + "&utmje=1"
- + "&utmfl=10.1%20r53"
- + "&utmdt=-%20JBoss%20Community"
- + "&utmhid=1087431432"
- + "&utmr=0"
- + "&utmp=%2Ftools%2Fusage%2FtestUrl0_5"
- + "&utmac=UA-17645367-1"
- + "&__utma%3D156030503.195542053.1281528584.1281528584.1281528584.1%3B%2B__utmz%3D156030500.1281528584.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
- + "&gaq=1";
- method.request(url);
- assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
- }
-
- @Ignore
- @Test
- public void testUrl0_6() throws IOException {
- String userAgent = "Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.4) Gecko/20100614 Ubuntu/10.04 (lucid) com.jboss.jbds.product/3.0.1";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
- String url = "http://www.google-analytics.com/__utm.gif?"
- + "utmwv=4.7.2"
- + "&utmn=338321265"
- + "&utmhn=jboss.org"
- + "&utmcs=UTF-8"
- + "&utmsr=1920x1080"
- + "&utmsc=24-bit"
- + "&utmul=en-us"
- + "&utmje=1"
- + "&utmfl=10.1%20r53"
- + "&utmdt=-%20JBoss%20Community"
- + "&utmhid=1087431432"
- + "&utmr=0"
- + "&utmp=%2Ftools%2Fusage%2FtestUrl0_6"
- + "&utmac=UA-17645367-1"
- + "&utmcc=__utma%3D156030507.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
- + "&gaq=1";
- method.request(url);
- assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
- }
-
- @Ignore
- @Test
- public void testUrl0_7() throws IOException {
- String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US)";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
- String url = "http://www.google-analytics.com/__utm.gif?"
- + "utmwv=4.7.2"
- + "&utmn=338321268"
- + "&utmhn=jboss.org"
- + "&utmcs=UTF-8"
- + "&utmsr=1920x1080"
- + "&utmsc=24-bit"
- + "&utmul=en-us"
- + "&utmje=1"
- + "&utmfl=10.1%20r53"
- + "&utmdt=-%20JBoss%20Community"
- + "&utmhid=1087431432"
- + "&utmr=0"
- + "&utmp=%2Ftools%2Fusage%2FtestUrl0_7"
- + "&utmac=UA-17645367-1"
- + "&utmcc=__utma%3D156030507.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
- + "&gaq=1";
- method.request(url);
- assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
- }
-
- @Ignore
- @Test
- public void testUrl0_7_1() throws IOException {
- String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-us)";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
- String url = "http://www.google-analytics.com/__utm.gif?"
- + "utmwv=4.7.2"
- + "&utmn=338321068"
- + "&utmhn=jboss.org"
- + "&utmcs=UTF-8"
- + "&utmsr=1920x1080"
- + "&utmsc=24-bit"
- + "&utmje=1"
- + "&utmfl=10.1%20r53"
- + "&utmdt=-%20JBoss%20Community"
- + "&utmhid=1087431432"
- + "&utmr=0"
- + "&utmp=%2Ftools%2Fusage%2FtestUrl0_7_1"
- + "&utmac=UA-17645367-1"
- + "&utmcc=__utma%3D156030507.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
- + "&gaq=1";
- method.request(url);
- assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
- }
-
- @Ignore
- @Test
- public void testUrl0_7_2() throws IOException {
- String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US)";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
- String url = "http://www.google-analytics.com/__utm.gif?"
- + "utmwv=4.7.2"
- + "&utmn=338333268"
- + "&utmhn=jboss.org"
- + "&utmcs=UTF-8"
- + "&utmsr=1920x1080"
- + "&utmsc=24-bit"
- + "&utmul=en-us"
- + "&utmdt=-%20JBoss%20Community"
- + "&utmhid=1087431432"
- + "&utmr=0"
- + "&utmp=%2Ftools%2Fusage%2FtestUrl0_7_2"
- + "&utmac=UA-17645367-1"
- + "&utmcc=__utma%3D156620507.1285760111.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
- + "&gaq=1";
- method.request(url);
- assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
- }
-
- @Ignore
- @Test
- public void testUrl0_7_3() throws IOException {
- String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US)";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
- String url = "http://www.google-analytics.com/__utm.gif?"
- + "utmwv=4.7.2"
- + "&utmn=311333268"
- + "&utmhn=jboss.org"
- + "&utmcs=UTF-8"
- + "&utmsr=1920x1080"
- + "&utmsc=24-bit"
- + "&utmul=en-us"
- + "&utmdt=tools-usage-test_0_7_3"
- + "&utmhid=1087431432"
- + "&utmr=0"
- + "&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3"
- + "&utmac=UA-17645367-1"
- + "&utmcc=__utma%3D112660507.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
- + "&gaq=1";
- method.request(url);
- assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
- }
-
- @Ignore
- @Test
- public void testUrl0_7_3_mac() throws IOException {
- String userAgent = "com.jboss.jbds.product/3.0.1 (Macintosh; U; Intel Mac OS X 10.5; fr)";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
- String url = "http://www.google-analytics.com/__utm.gif?"
- + "utmwv=4.7.2"
- + "&utmn=351333268"
- + "&utmhn=jboss.org"
- + "&utmcs=UTF-8"
- + "&utmsr=1920x1080"
- + "&utmsc=24-bit"
- + "&utmul=en-us"
- + "&utmdt=tools-usage-test_0_7_3"
- + "&utmhid=1087431432"
- + "&utmr=0"
- + "&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3_mac"
- + "&utmac=UA-17645367-1"
- + "&utmcc=__utma%3D133660507.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
- + "&gaq=1";
- method.request(url);
- assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
- }
-
- @Ignore
- @Test
- public void testUrl0_7_3_win() throws IOException {
- String userAgent = "com.jboss.jbds.product/3.0.1 (Windows; U; Windows NT 6.1; en-US)";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
- String url = "http://www.google-analytics.com/__utm.gif?"
- + "utmwv=4.7.2"
- + "&utmn=351333254"
- + "&utmhn=jboss.org"
- + "&utmcs=UTF-8"
- + "&utmsr=1920x1080"
- + "&utmsc=24-bit"
- + "&utmul=en-us"
- + "&utmdt=tools-usage-test_0_7_3_win"
- + "&utmhid=1087431432"
- + "&utmr=0"
- + "&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3_win"
- + "&utmac=UA-17645367-1"
- + "&utmcc=__utma%3D133660522.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
- + "&gaq=1";
- method.request(url);
- assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
- }
-
- @Ignore
- @Test
- public void testUrl0_7_3_1() throws IOException {
- String userAgent = "com.jboss.jbds.product/3.0.1 (Windows; U; Windows NT 6.1; en-US)";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
- String url = "http://www.google-analytics.com/__utm.gif?"
- + "utmwv=4.7.2"
- + "&utmn=358333254"
- + "&utmhn=jboss.org"
- + "&utmcs=UTF-8"
- + "&utmsr=1920x1080"
- + "&utmsc=24-bit"
- + "&utmul=en-us"
- + "&utmdt=tools-usage-test_0_7_3_1"
- + "&utmhid=1087431432"
- + "&utmr=smooks|seam|drools|esb"
- + "&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3_1"
- + "&utmac=UA-17645367-1"
- + "&utmcc=__utma%3D133860522.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
- + "&gaq=1";
- method.request(url);
- assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
- }
-
- @Ignore
- @Test
- public void testUrl8() throws IOException {
- String userAgent = "com.jboss.jbds.product/3.0.1 (Windows; U; Windows NT 6.1; en-US)";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
- String url = "http://www.google-analytics.com/__utm.gif?"
- + "utmwv=4.7.2"
- + "&utmn=453325272"
- + "&utmhn=jboss.org"
- + "&utmcs=UTF-8"
- + "&utmsr=1920x1080"
- + "&utmsc=24-bit"
- + "&utmul=en-US"
- + "&utmdt=jboss.org-tools-usage-instance"
- + "&utmhid=1722580305"
- + "&utmr=org.jboss.tools.usage.tests"
- + "&utmp=%2Fjboss.org%2Ftools%2Fusage%2FtestUrl8"
- + "&utmac=UA-17645367-1"
- + "&utmcc=__utma%3D999.69517276658961975851281943564260.1281943564259.1281943564259.1281943564259.-1%3B%2B__utmz%3D999.1281943564259.1.1.utmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%3B"
- + "&gaq=1";
- method.request(url);
- assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
- }
-
- @Ignore
- @Test
- public void testUrl0_7_3_win_referral() throws IOException {
- String userAgent = "com.jboss.jbds.product/3.0.1 (Windows; U; Windows NT 6.1; en-US)";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
- String url = "http://www.google-analytics.com/__utm.gif?"
- + "utmwv=4.7.2"
- + "&utmn=351334444"
- + "&utmhn=jboss.org"
- + "&utmcs=UTF-8"
- + "&utmsr=1920x1080"
- + "&utmsc=24-bit"
- + "&utmul=en-us"
- + "&utmdt=tools-usage-test_0_7_3_win_referral"
- + "&utmhid=1087431432"
- + "&utmr=seam|esb|smooks|birt|bpel|cdi|deltacloud|drools"
- + "&utm_content=test1%7Ctest2%7Ctest3"
- + "&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3_win_referral"
- + "&utmac=UA-17645367-1"
- + "&utmcc=__utma%3D133663892.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
- + "&gaq=1";
- method.request(url);
- assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
- }
-
- @Ignore
- @Test
- public void testUrl0_7_3_win_adcontent() throws IOException {
- String userAgent = "com.jboss.jbds.product/3.0.1 (Windows; U; Windows NT 6.1; en-US)";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
- String url = "http://www.google-analytics.com/__utm.gif?"
- + "utmwv=4.7.2"
- + "&utmn=378334444"
- + "&utmhn=jboss.org"
- + "&utmcs=UTF-8"
- + "&utmsr=1920x1080"
- + "&utmsc=24-bit"
- + "&utmul=en-us"
- + "&utmdt=tools-usage-test_0_7_3_win_adcontent"
- + "&utmhid=1087431432"
- + "&utmr=seam|esb|smooks|birt|bpel|cdi|deltacloud|drools"
- + "&utm_content=test1%7Ctest2%7Ctest3%7test4"
- + "&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3_win_adcontent"
- + "&utmac=UA-17645367-1"
- + "&utmcc=__utma%3D455663892.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
- + "&gaq=1";
- method.request(url);
- assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
- }
-
- @Ignore
- @Test
- public void testUrl0_7_3_win_keyword() throws IOException {
- String userAgent = "com.jboss.jbds.product/3.0.1 (Windows; U; Windows NT 6.1; en-US)";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
- String url = "http://www.google-analytics.com/__utm.gif?"
- + "utmwv=4.7.2"
- + "&utmn=378334354"
- + "&utmhn=jboss.org"
- + "&utmcs=UTF-8"
- + "&utmsr=1920x1080"
- + "&utmsc=24-bit"
- + "&utmul=en-us"
- + "&utmdt=tools-usage-test_0_7_3_win_keyword"
- + "&utmhid=1087431432"
- + "&utmr=seam|esb|smooks|birt|bpel|cdi|deltacloud|drools"
- + "&term=test1%7Ctest2%7Ctest3%7test4"
- + "&utm_term=test1a%7Ctest2a%7Ctest3a%7test4a"
- + "&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3_win_keyword"
- + "&utmac=UA-17645367-1"
- + "&utmcc=__utma%3D887463892.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
- + "&gaq=1";
- method.request(url);
- assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
- }
-
- @Ignore
- @Test
- public void testUrl0_7_3_win_utmz() throws IOException {
- String userAgent = "com.jboss.jbds.product/3.0.1 (Windows; U; Windows NT 6.1; en-US)";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
- String url = "http://www.google-analytics.com/__utm.gif?"
- + "utmwv=4.7.2"
- + "&utmn=351334444"
- + "&utmhn=jboss.org"
- + "&utmcs=UTF-8"
- + "&utmsr=1920x1080"
- + "&utmsc=24-bit"
- + "&utmul=en-us"
- + "&utmdt=tools-usage-test_0_7_3_win__utmz"
- + "&utmhid=1087431432"
- + "&utmr=seam|esb|smooks|birt|bpel|cdi|deltacloud|drools"
- + "&utm_content=test1%7Ctest2%7Ctest3"
- + "&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3_win__utmz"
- + "&utmac=UA-17645367-1"
- + "&utmz=test1%7Ctest2%7Ctest3"
- + "&utmcc=__utma%3D133663892.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
- + "&gaq=1";
- method.request(url);
- assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
- }
-
- @Ignore
- @Test
- public void testUrl0_7_3_win_utmctr() throws IOException {
- String userAgent = "com.jboss.jbds.product/3.0.1 (Windows; U; Windows NT 6.1; en-US)";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
- String url = "http://www.google-analytics.com/__utm.gif?"
- + "utmwv=4.7.2"
- + "&utmn=351334444"
- + "&utmhn=jboss.org"
- + "&utmcs=UTF-8"
- + "&utmsr=1920x1080"
- + "&utmsc=24-bit"
- + "&utmul=en-us"
- + "&utmdt=tools-usage-test_0_7_3_win__utmctr"
- + "&utmhid=1087431432"
- + "&utmr=seam|esb|smooks|birt|bpel|cdi|deltacloud|drools"
- + "&utm_content=test1%7Ctest2%7Ctest3"
- + "&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3_win_utctr"
- + "&utmac=UA-17645367-1"
- + "&utmz=test1%7Ctest2%7Ctest3"
- + "&utmcc=__utma%3D133663892.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3D%7Cutmctr%3Dtest1%7Ctest2%7Ctest3%3B"
- + "&gaq=1";
- method.request(url);
- assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
- }
-
- @Ignore
- @Test
- public void testUrl0_7_3_win_utmctr_lengthtest() throws IOException {
- String userAgent = "com.jboss.jbds.product/3.0.1 (Windows; U; Windows NT 6.1; en-US)";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
- String url = "http://www.google-analytics.com/__utm.gif?"
- + "utmwv=4.7.2"
- + "&utmn=351334794"
- + "&utmhn=jboss.org"
- + "&utmcs=UTF-8"
- + "&utmsr=1920x1080"
- + "&utmsc=24-bit"
- + "&utmul=en-us"
- + "&utmdt=tools-usage-test_0_7_3_win_lengthtest"
- + "&utmhid=1087431432"
- + "&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3_win_lengthtest"
- + "&utmac=UA-17645367-1"
- + "&utmcc="
- + "__utma%3D133697892.1285760711.1281430767.1281430767.1281430767.1%3B%2B"
- + "__utmz%3D156030500.1281430767.1.1."
- + "utmcsr%3D(direct)%7C"
- + "utmccn%3D(direct)%7C"
- + "utmcmd%3D(none)%7C"
- + "utmctr%3Dtest1%7Ctest2%7Ctest3%7Ctest4%7Ctest5%7Ctest6%7Ctest7%7Ctest8%7Ctest8%7Ctest9%7Ctest10%7Ctest11%7Ctest12%7Ctest13%7Ctest514%7Ctest14%7Ctest15%7Ctest16%7Ctest17%7Ctest18%7Ctest19%7Ctest20%7Ctest20%7Ctest21%7Ctest22%7Ctest23%7Ctest514%7Ctest24%7Ctest25%7Ctest26%7Ctest27%7Ctest28%7Ctest29%7Ctest30%7Ctest31%3B"
- + "&gaq=1";
- method.request(url);
- assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
- }
-
- @Test
public void testUrl_utmaCookies_0() throws IOException {
String userAgent = "com.jboss.jbds.product/3.0.1 (Windows; U; Windows NT 6.1; en-US)";
TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
@@ -682,33 +681,33 @@
assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
}
- @Test
- public void testUrl_utmaCookies_1B() throws IOException {
- String userAgent = "com.jboss.jbds.product/3.0.1 (Windows; U; Windows NT 6.1; en-US)";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
- String url = "http://www.google-analytics.com/__utm.gif?"
- + "utmwv=4.7.2"
- + "&utmn=261390794"
- + "&utmhn=jboss.org"
- + "&utmcs=UTF-8"
- + "&utmsr=1920x1080"
- + "&utmsc=24-bit"
- + "&utmul=en-us"
- + "&utmdt=tools-usage-testUrl_utmaCookies_1B"
- + "&utmhid=1087431432"
- + "&utmp=%2Ftools%2Fusage%2FtestUrl_utmaCookies_1B"
- + "&utmac=UA-17645367-1"
- + "&utmcc="
- + "__utma%3D133697892.1285760711.1281430767.1281430767.1281430867.2%3B%2B"
- + "__utmz%3D156030500.1281430767.1.1."
- + "utmcsr%3D(direct)%7C"
- + "utmccn%3D(direct)%7C"
- + "utmcmd%3D(none)%7C"
- + "utmctr%3Dtest1%7Ctest2%7Ctest3%7Ctest4%7Ctest5%7Ctest6%7Ctest7%7Ctest8%7Ctest8%7Ctest9%7Ctest10%7Ctest11%7Ctest12%7Ctest13%7Ctest514%7Ctest14%7Ctest15%7Ctest16%7Ctest17%7Ctest18%7Ctest19%7Ctest20%7Ctest20%7Ctest21%7Ctest22%7Ctest23%7Ctest514%7Ctest24%7Ctest25%7Ctest26%7Ctest27%7Ctest28%7Ctest29%7Ctest30%7Ctest31%3B"
- + "&gaq=1";
- method.request(url);
- assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
- }
+// @Test
+// public void testUrl_utmaCookies_1B() throws IOException {
+// String userAgent = "com.jboss.jbds.product/3.0.1 (Windows; U; Windows NT 6.1; en-US)";
+// TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
+// String url = "http://www.google-analytics.com/__utm.gif?"
+// + "utmwv=4.7.2"
+// + "&utmn=261390794"
+// + "&utmhn=jboss.org"
+// + "&utmcs=UTF-8"
+// + "&utmsr=1920x1080"
+// + "&utmsc=24-bit"
+// + "&utmul=en-us"
+// + "&utmdt=tools-usage-testUrl_utmaCookies_1B"
+// + "&utmhid=1087431432"
+// + "&utmp=%2Ftools%2Fusage%2FtestUrl_utmaCookies_1B"
+// + "&utmac=UA-17645367-1"
+// + "&utmcc="
+// + "__utma%3D133697892.1285760711.1281430767.1281430767.1281430867.2%3B%2B"
+// + "__utmz%3D156030500.1281430767.1.1."
+// + "utmcsr%3D(direct)%7C"
+// + "utmccn%3D(direct)%7C"
+// + "utmcmd%3D(none)%7C"
+// + "utmctr%3Dtest1%7Ctest2%7Ctest3%7Ctest4%7Ctest5%7Ctest6%7Ctest7%7Ctest8%7Ctest8%7Ctest9%7Ctest10%7Ctest11%7Ctest12%7Ctest13%7Ctest514%7Ctest14%7Ctest15%7Ctest16%7Ctest17%7Ctest18%7Ctest19%7Ctest20%7Ctest20%7Ctest21%7Ctest22%7Ctest23%7Ctest514%7Ctest24%7Ctest25%7Ctest26%7Ctest27%7Ctest28%7Ctest29%7Ctest30%7Ctest31%3B"
+// + "&gaq=1";
+// method.request(url);
+// assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+// }
@Test
public void testUrl_utmaCookies_2() throws IOException {
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-08-25 13:46:45 UTC (rev 24424)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java 2010-08-25 14:10:40 UTC (rev 24425)
@@ -19,7 +19,7 @@
GoogleAnalyticsUrlStrategyTest.class,
JBossToolsUsageIntegrationTest.class,
EclipseEnvironmenTest.class,
- GlobalUsageReportingEnablementTest.class})
+ GlobalUsageReportingSettingsTest.class})
/**
* @author Andre Dietisheim
15 years, 4 months
JBoss Tools SVN: r24424 - trunk/jsf/plugins/org.jboss.tools.jsf/META-INF.
by jbosstools-commits@lists.jboss.org
Author: akazakov
Date: 2010-08-25 09:46:45 -0400 (Wed, 25 Aug 2010)
New Revision: 24424
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF
Log:
Fixed compilation errors.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF 2010-08-25 13:38:33 UTC (rev 24423)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF 2010-08-25 13:46:45 UTC (rev 24424)
@@ -10,6 +10,10 @@
org.jboss.tools.jsf.facelet.model,
org.jboss.tools.jsf.jsf2.model,
org.jboss.tools.jsf.jsf2.refactoring,
+ org.jboss.tools.jsf.jsf2.refactoring.action.rename,
+ org.jboss.tools.jsf.jsf2.refactoring.core,
+ org.jboss.tools.jsf.jsf2.refactoring.view,
+ org.jboss.tools.jsf.jsf2.util,
org.jboss.tools.jsf.messages,
org.jboss.tools.jsf.model,
org.jboss.tools.jsf.model.handlers,
@@ -28,10 +32,15 @@
org.jboss.tools.jsf.preferences,
org.jboss.tools.jsf.project,
org.jboss.tools.jsf.project.capabilities,
+ org.jboss.tools.jsf.project.facet,
org.jboss.tools.jsf.web,
org.jboss.tools.jsf.web.helpers.context,
org.jboss.tools.jsf.web.pattern,
- org.jboss.tools.jsf.web.validation
+ org.jboss.tools.jsf.web.validation,
+ org.jboss.tools.jsf.web.validation.jsf2,
+ org.jboss.tools.jsf.web.validation.jsf2.action,
+ org.jboss.tools.jsf.web.validation.jsf2.components,
+ org.jboss.tools.jsf.web.validation.jsf2.util
Require-Bundle: org.jboss.tools.jst.web;visibility:=reexport,
org.jboss.tools.jst.web.kb;visibility:=reexport,
org.jboss.tools.common.el.core,
15 years, 4 months
JBoss Tools SVN: r24423 - in trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui: wizard and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2010-08-25 09:38:33 -0400 (Wed, 25 Aug 2010)
New Revision: 24423
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorWizardPage.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorWizardPage.java
Log:
https://jira.jboss.org/browse/JBIDE-6856
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java 2010-08-25 13:06:38 UTC (rev 24422)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java 2010-08-25 13:38:33 UTC (rev 24423)
@@ -39,9 +39,11 @@
public static String NEW_INTERCEPTOR_WIZARD_TITLE;
public static String NEW_INTERCEPTOR_WIZARD_PAGE_NAME;
+ public static String NEW_INTERCEPTOR_WIZARD_DESCRIPTION;
public static String NEW_DECORATOR_WIZARD_TITLE;
public static String NEW_DECORATOR_WIZARD_PAGE_NAME;
+ public static String NEW_DECORATOR_WIZARD_DESCRIPTION;
public static String SELECT_STEREOTYPE;
public static String SELECT_INTERCEPTOR_BINDING;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties 2010-08-25 13:06:38 UTC (rev 24422)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties 2010-08-25 13:38:33 UTC (rev 24423)
@@ -28,9 +28,11 @@
NEW_INTERCEPTOR_WIZARD_TITLE=New Interceptor
NEW_INTERCEPTOR_WIZARD_PAGE_NAME=Interceptor Type
+NEW_INTERCEPTOR_WIZARD_DESCRIPTION=Create a new Interceptor Java class
NEW_DECORATOR_WIZARD_TITLE=New Decorator
NEW_DECORATOR_WIZARD_PAGE_NAME=Decorator Type
+NEW_DECORATOR_WIZARD_DESCRIPTION=Create a new Decorator Java class
SELECT_STEREOTYPE=Select Stereotype Annotation Type
SELECT_INTERCEPTOR_BINDING=Select Interceptor Binding Annotation Type
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorWizardPage.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorWizardPage.java 2010-08-25 13:06:38 UTC (rev 24422)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorWizardPage.java 2010-08-25 13:38:33 UTC (rev 24423)
@@ -69,7 +69,7 @@
public NewDecoratorWizardPage() {
setTitle(CDIUIMessages.NEW_DECORATOR_WIZARD_PAGE_NAME);
- setDescription("Create a new Decorator Java class");
+ setDescription(CDIUIMessages.NEW_DECORATOR_WIZARD_DESCRIPTION);
}
public void init(IStructuredSelection selection) {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorWizardPage.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorWizardPage.java 2010-08-25 13:06:38 UTC (rev 24422)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorWizardPage.java 2010-08-25 13:38:33 UTC (rev 24423)
@@ -84,7 +84,7 @@
public NewInterceptorWizardPage() {
setTitle(CDIUIMessages.NEW_INTERCEPTOR_WIZARD_PAGE_NAME);
- setDescription("Create a new Interceptor Java class");
+ setDescription(CDIUIMessages.NEW_INTERCEPTOR_WIZARD_DESCRIPTION);
}
public void init(IStructuredSelection selection) {
15 years, 4 months
JBoss Tools SVN: r24422 - trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2010-08-25 09:06:38 -0400 (Wed, 25 Aug 2010)
New Revision: 24422
Modified:
trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBCoreValidator.java
Log:
Modified: trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBCoreValidator.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBCoreValidator.java 2010-08-25 12:49:16 UTC (rev 24421)
+++ trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBCoreValidator.java 2010-08-25 13:06:38 UTC (rev 24422)
@@ -226,4 +226,8 @@
ITextSourceReference getSourceReference(XModelObject o, String attr) {
return new XMLValueInfo(o, attr);
}
+
+ public boolean isEnabled(IProject project) {
+ return true;
+ }
}
15 years, 4 months
JBoss Tools SVN: r24421 - trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile.
by jbosstools-commits@lists.jboss.org
Author: mareshkau
Date: 2010-08-25 08:49:16 -0400 (Wed, 25 Aug 2010)
New Revision: 24421
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewXHTMLWizard.java
Log:
https://jira.jboss.org/browse/JBIDE-6687
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewXHTMLWizard.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewXHTMLWizard.java 2010-08-25 12:45:11 UTC (rev 24420)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewXHTMLWizard.java 2010-08-25 12:49:16 UTC (rev 24421)
@@ -126,7 +126,9 @@
try {
NewFileContextEx newFileContext = newXHTMLFileWizard.getFileContext();
CreateJSPFileSupport jspFileSupport = (CreateJSPFileSupport)newFileContext.getSupport();
- templateString = jspFileSupport.addTaglibs(templateString);
+ if(jspFileSupport.getAttributeValue(1, "taglibs").length()>0){
+ templateString = jspFileSupport.addTaglibs(templateString);
+ }
} catch (IOException ex) {
WebUiPlugin.getDefault().logWarning("Problems with adding taglibs",ex); //$NON-NLS-1$
}
15 years, 4 months
JBoss Tools SVN: r24420 - in trunk/usage: plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2010-08-25 08:45:11 -0400 (Wed, 25 Aug 2010)
New Revision: 24420
Added:
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/IHttpGetRequest.java
Removed:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpGetMethod.java
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/reporting/UsageReport.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
Log:
[JBIDE-6376] httpGetRequest extracted to interface (shall be replaceable)
Deleted: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpGetMethod.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpGetMethod.java 2010-08-25 12:39:11 UTC (rev 24419)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpGetMethod.java 2010-08-25 12:45:11 UTC (rev 24420)
@@ -1,97 +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 HttpGetMethod {
-
- 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 HttpGetMethod(String userAgent, ILoggingAdapter loggingAdapter) {
- this.userAgent = userAgent;
- this.loggingAdapter = loggingAdapter;
-// this.cookieHandler = new CookieHandler();
-// this.cookieHandler = CookieHandler.getDefault();
-// cookieHandler.setCookiePolicy(CookiePolicy.ACCEPT_ALL);
- }
-
- 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/HttpGetRequest.java (from rev 24374, trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpGetMethod.java)
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpGetRequest.java (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpGetRequest.java 2010-08-25 12:45:11 UTC (rev 24420)
@@ -0,0 +1,100 @@
+/*******************************************************************************
+ * 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;
+ }
+}
Added: 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 (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/IHttpGetRequest.java 2010-08-25 12:45:11 UTC (rev 24420)
@@ -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;
+
+/**
+ * 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/IHttpGetRequest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
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-08-25 12:39:11 UTC (rev 24419)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/Tracker.java 2010-08-25 12:45:11 UTC (rev 24420)
@@ -24,11 +24,11 @@
public class Tracker implements ITracker {
private IURLBuildingStrategy urlBuildingStrategy = null;
- private HttpGetMethod httpRequest;
+ private IHttpGetRequest httpRequest;
private ILoggingAdapter loggingAdapter;
- public Tracker(IURLBuildingStrategy urlBuildingStrategy, String userAgent, ILoggingAdapter loggingAdapter) {
- this.httpRequest = new HttpGetMethod(userAgent, loggingAdapter);
+ public Tracker(IURLBuildingStrategy urlBuildingStrategy, IHttpGetRequest httpGetRequest, ILoggingAdapter loggingAdapter) {
+ this.httpRequest = httpGetRequest;
this.loggingAdapter = loggingAdapter;
this.urlBuildingStrategy = urlBuildingStrategy;
}
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-08-25 12:39:11 UTC (rev 24419)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java 2010-08-25 12:45:11 UTC (rev 24420)
@@ -14,6 +14,8 @@
import org.eclipse.jface.window.Window;
import org.eclipse.ui.PlatformUI;
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;
@@ -76,13 +78,14 @@
}
private ITracker getTracker() {
- IGoogleAnalyticsParameters eclipseSettings = new EclipseEnvironment(
+ IGoogleAnalyticsParameters eclipseEnvironment = new EclipseEnvironment(
GANALYTICS_ACCOUNTNAME
, HOST_NAME
, IGoogleAnalyticsParameters.VALUE_NO_REFERRAL
, PreferencesUtils.getPreferences());
ILoggingAdapter loggingAdapter = new PluginLogger(JBossToolsUsageActivator.getDefault());
- IURLBuildingStrategy urlStrategy = new GoogleAnalyticsUrlStrategy(eclipseSettings);
- return new Tracker(urlStrategy, eclipseSettings.getUserAgent(), loggingAdapter);
+ IURLBuildingStrategy urlStrategy = new GoogleAnalyticsUrlStrategy(eclipseEnvironment);
+ IHttpGetRequest httpGetRequest = new HttpGetRequest(eclipseEnvironment.getUserAgent(), loggingAdapter);
+ return new Tracker(urlStrategy, httpGetRequest, loggingAdapter);
}
}
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-08-25 12:39:11 UTC (rev 24419)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java 2010-08-25 12:45:11 UTC (rev 24420)
@@ -21,6 +21,8 @@
import org.eclipse.core.runtime.Platform;
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;
@@ -44,7 +46,7 @@
@Test
public void sameUserIdOnSametEclipseInstance() throws Exception {
UrlRevealingTracker tracker = getTracker(getEclipseEnvironmentInstance());
- FocusPoint focusPoint = createFocusPoint("testSameUserIdOnSametEclipseInstance" + System.currentTimeMillis());
+ FocusPoint focusPoint = createFocusPoint("/testSameUserIdOnSametEclipseInstance" + System.currentTimeMillis());
tracker.trackSynchronously(focusPoint);
String userId = getUserId(tracker.getTrackingUrl());
assertTrue(userId != null);
@@ -65,7 +67,7 @@
assertTrue(userId != null);
tracker = getTracker(createEclipseEnvironment());
- FocusPoint focusPoint = createFocusPoint("testDifferentUserIdOnDifferentEclipseInstance"
+ FocusPoint focusPoint = createFocusPoint("/testDifferentUserIdOnDifferentEclipseInstance"
+ System.currentTimeMillis());
tracker.trackSynchronously(focusPoint);
String newUserId = getUserId(tracker.getTrackingUrl());
@@ -88,7 +90,8 @@
private UrlRevealingTracker getTracker(IGoogleAnalyticsParameters environment) {
ILoggingAdapter loggingAdapter = new PluginLogger(JBossToolsUsageTestActivator.getDefault());
IURLBuildingStrategy urlStrategy = new GoogleAnalyticsUrlStrategy(environment);
- return new UrlRevealingTracker(urlStrategy, environment.getUserAgent(), loggingAdapter);
+ IHttpGetRequest httpGetRequest = new HttpGetRequest(environment.getUserAgent(), loggingAdapter);
+ return new UrlRevealingTracker(urlStrategy, httpGetRequest, loggingAdapter);
}
private IGoogleAnalyticsParameters getEclipseEnvironmentInstance() {
@@ -119,16 +122,21 @@
private String trackingUrl;
private Lock lock;
- public UrlRevealingTracker(IURLBuildingStrategy urlBuildingStrategy, String userAgent,
+ public UrlRevealingTracker(IURLBuildingStrategy urlBuildingStrategy, IHttpGetRequest httpGetRequest,
ILoggingAdapter loggingAdapter) {
- super(urlBuildingStrategy, userAgent, loggingAdapter);
+ super(urlBuildingStrategy, httpGetRequest, loggingAdapter);
lock = new ReentrantLock();
}
@Override
public void trackAsynchronously(FocusPoint focusPoint) {
- lock.lock();
- super.trackAsynchronously(focusPoint);
+ try {
+ lock.lock();
+ super.trackAsynchronously(focusPoint);
+ } catch (Exception e) {
+ lock.unlock();
+ throw new RuntimeException(e);
+ }
}
@Override
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-08-25 12:39:11 UTC (rev 24419)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-08-25 12:45:11 UTC (rev 24420)
@@ -14,7 +14,7 @@
import java.io.IOException;
import java.net.HttpURLConnection;
-import org.jboss.tools.usage.HttpGetMethod;
+import org.jboss.tools.usage.HttpGetRequest;
import org.jboss.tools.usage.ILoggingAdapter;
import org.junit.Before;
import org.junit.Ignore;
@@ -802,7 +802,7 @@
assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
}
- protected class TestHttpGetMethod extends HttpGetMethod {
+ protected class TestHttpGetMethod extends HttpGetRequest {
private HttpURLConnection urlConnection;
15 years, 4 months
JBoss Tools SVN: r24419 - in trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui: wizard and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2010-08-25 08:39:11 -0400 (Wed, 25 Aug 2010)
New Revision: 24419
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorWizardPage.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorWizardPage.java
Log:
https://jira.jboss.org/browse/JBIDE-6885
https://jira.jboss.org/browse/JBIDE-6856
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java 2010-08-25 12:25:06 UTC (rev 24418)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java 2010-08-25 12:39:11 UTC (rev 24419)
@@ -57,4 +57,6 @@
public static String MESSAGE_FIELD_NAME_EMPTY;
public static String MESSAGE_FIELD_NAME_NOT_VALID;
+ public static String MESSAGE_INTERCEPTOR_BINDINGS_EMPTY;
+
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties 2010-08-25 12:25:06 UTC (rev 24418)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties 2010-08-25 12:39:11 UTC (rev 24419)
@@ -46,3 +46,4 @@
MESSAGE_FIELD_NAME_EMPTY=Field Name is empty.
MESSAGE_FIELD_NAME_NOT_VALID=Field Name is not valid. {0}
+MESSAGE_INTERCEPTOR_BINDINGS_EMPTY=Interceptor Bindings list is empty
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorWizardPage.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorWizardPage.java 2010-08-25 12:25:06 UTC (rev 24418)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorWizardPage.java 2010-08-25 12:39:11 UTC (rev 24419)
@@ -69,6 +69,7 @@
public NewDecoratorWizardPage() {
setTitle(CDIUIMessages.NEW_DECORATOR_WIZARD_PAGE_NAME);
+ setDescription("Create a new Decorator Java class");
}
public void init(IStructuredSelection selection) {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorWizardPage.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorWizardPage.java 2010-08-25 12:25:06 UTC (rev 24418)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorWizardPage.java 2010-08-25 12:39:11 UTC (rev 24419)
@@ -84,6 +84,7 @@
public NewInterceptorWizardPage() {
setTitle(CDIUIMessages.NEW_INTERCEPTOR_WIZARD_PAGE_NAME);
+ setDescription("Create a new Interceptor Java class");
}
public void init(IStructuredSelection selection) {
@@ -197,7 +198,7 @@
void onInterceptorBindingChange() {
interceptorBindingsStatus = new StatusInfo();
if(((List)interceptorBindings.getValue()).isEmpty()) {
- interceptorBindingsStatus.setWarning("Interseptor Bindings list is empty.");
+ interceptorBindingsStatus.setWarning(CDIUIMessages.MESSAGE_INTERCEPTOR_BINDINGS_EMPTY);
}
}
15 years, 4 months
JBoss Tools SVN: r24418 - in trunk/ws/tests/org.jboss.tools.ws.ui.test: resources/jbide6865 and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: jlukas(a)redhat.com
Date: 2010-08-25 08:25:06 -0400 (Wed, 25 Aug 2010)
New Revision: 24418
Added:
trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6865/
trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6865/wsdl1.wsdl
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.test/src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java
Log:
test for JBIDE6865
Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6865/wsdl1.wsdl
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6865/wsdl1.wsdl (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6865/wsdl1.wsdl 2010-08-25 12:25:06 UTC (rev 24418)
@@ -0,0 +1,1039 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="DirectFlight" targetNamespace="http://directflight.flightaware.com/soap/DirectFlight" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:FlightAwareDirectFlight="http://directflight.flightaware.com/soap/DirectFlight" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/">
+
+<wsdl:types>
+ <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://directflight.flightaware.com/soap/DirectFlight">
+
+ <!--added import namespaces so WSDL.exe (.NET) does not complain-->
+ <s:import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
+ <s:import namespace="http://schemas.xmlsoap.org/wsdl/"/>
+
+
+
+<xs:complexType name="ArrayOfScheduledFlightStruct">
+ <xs:complexContent mixed="false">
+ <xs:restriction base="SOAP-ENC:Array">
+ <xs:attribute wsdl:arrayType="FlightAwareDirectFlight:ScheduledFlightStruct[]" ref="SOAP-ENC:arrayType"/>
+ </xs:restriction>
+ </xs:complexContent>
+</xs:complexType>
+
+
+<xs:complexType name="DepartureStruct">
+ <xs:all>
+
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="next_offset"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="FlightAwareDirectFlight:ArrayOfDepartureFlightStruct" nillable="true" name="departures"/>
+ </xs:all>
+</xs:complexType>
+
+
+<xs:complexType name="ArrayOfTrackStruct">
+ <xs:complexContent mixed="false">
+ <xs:restriction base="SOAP-ENC:Array">
+ <xs:attribute wsdl:arrayType="FlightAwareDirectFlight:TrackStruct[]" ref="SOAP-ENC:arrayType"/>
+ </xs:restriction>
+ </xs:complexContent>
+</xs:complexType>
+
+
+<xs:complexType name="TafStruct">
+ <xs:all>
+
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="airport"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="timeString"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="FlightAwareDirectFlight:ArrayOfString" nillable="true" name="forecast"/>
+ </xs:all>
+</xs:complexType>
+
+<xs:complexType name="FlightStruct">
+ <xs:all>
+
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="ident"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="aircrafttype"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="filed_ete"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="filed_time"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="filed_departuretime"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="filed_airspeed_kts"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="filed_airspeed_mach"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="filed_altitude"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="route"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="actualdeparturetime"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="estimatedarrivaltime"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="actualarrivaltime"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="diverted"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="origin"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="destination"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="originName"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="originCity"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="destinationName"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="destinationCity"/>
+ </xs:all>
+</xs:complexType>
+
+<xs:complexType name="ScheduledFlightStruct">
+ <xs:all>
+
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="ident"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="aircrafttype"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="filed_departuretime"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="estimatedarrivaltime"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="origin"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="destination"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="originName"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="originCity"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="destinationName"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="destinationCity"/>
+ </xs:all>
+</xs:complexType>
+
+<xs:complexType name="EnrouteStruct">
+ <xs:all>
+
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="next_offset"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="FlightAwareDirectFlight:ArrayOfEnrouteFlightStruct" nillable="true" name="enroute"/>
+ </xs:all>
+</xs:complexType>
+
+
+<xs:complexType name="ArrayOfRoutesBetweenAirportsStruct">
+ <xs:complexContent mixed="false">
+ <xs:restriction base="SOAP-ENC:Array">
+ <xs:attribute wsdl:arrayType="FlightAwareDirectFlight:RoutesBetweenAirportsStruct[]" ref="SOAP-ENC:arrayType"/>
+ </xs:restriction>
+ </xs:complexContent>
+</xs:complexType>
+
+
+<xs:complexType name="AirportInfoStruct">
+ <xs:all>
+
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="name"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="location"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:float" nillable="true" name="longitude"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:float" nillable="true" name="latitude"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="timezone"/>
+ </xs:all>
+</xs:complexType>
+
+<xs:complexType name="TrackStruct">
+ <xs:all>
+
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="timestamp"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:float" nillable="true" name="latitude"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:float" nillable="true" name="longitude"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="groundspeed"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="altitude"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="altitudeStatus"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="updateType"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="altitudeChange"/>
+ </xs:all>
+</xs:complexType>
+
+<xs:complexType name="ArrivalStruct">
+ <xs:all>
+
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="next_offset"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="FlightAwareDirectFlight:ArrayOfArrivalFlightStruct" nillable="true" name="arrivals"/>
+ </xs:all>
+</xs:complexType>
+
+<xs:complexType name="ZipcodeInfoStruct">
+ <xs:all>
+
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:float" nillable="true" name="latitude"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:float" nillable="true" name="longitude"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="city"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="state"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="county"/>
+ </xs:all>
+</xs:complexType>
+
+
+<xs:complexType name="ArrayOfEnrouteFlightStruct">
+ <xs:complexContent mixed="false">
+ <xs:restriction base="SOAP-ENC:Array">
+ <xs:attribute wsdl:arrayType="FlightAwareDirectFlight:EnrouteFlightStruct[]" ref="SOAP-ENC:arrayType"/>
+ </xs:restriction>
+ </xs:complexContent>
+</xs:complexType>
+
+
+<xs:complexType name="AircraftSuffixDescriptionStruct">
+ <xs:all>
+
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="description"/>
+ </xs:all>
+</xs:complexType>
+
+<xs:complexType name="RoutesBetweenAirportsStruct">
+ <xs:all>
+
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="count"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="route"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="filedAltitude"/>
+ </xs:all>
+</xs:complexType>
+
+<xs:complexType name="MetarStruct">
+ <xs:all>
+
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="name"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="timeString"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="reading"/>
+ </xs:all>
+</xs:complexType>
+
+<xs:complexType name="InFlightAircraftStruct">
+ <xs:all>
+
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="faFlightID"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="ident"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="prefix"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="type"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="suffix"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="origin"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="destination"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="timeout"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="timestamp"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="departureTime"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="firstPositionTime"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="arrivalTime"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:float" nillable="true" name="longitude"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:float" nillable="true" name="latitude"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:float" nillable="true" name="lowLongitude"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:float" nillable="true" name="lowLatitude"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:float" nillable="true" name="highLongitude"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:float" nillable="true" name="highLatitude"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="groundspeed"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="altitude"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="heading"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="altitudeStatus"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="updateType"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="altitudeChange"/>
+ </xs:all>
+</xs:complexType>
+
+
+<xs:complexType name="ArrayOfFlightStruct">
+ <xs:complexContent mixed="false">
+ <xs:restriction base="SOAP-ENC:Array">
+ <xs:attribute wsdl:arrayType="FlightAwareDirectFlight:FlightStruct[]" ref="SOAP-ENC:arrayType"/>
+ </xs:restriction>
+ </xs:complexContent>
+</xs:complexType>
+
+
+<xs:complexType name="EnrouteFlightStruct">
+ <xs:all>
+
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="ident"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="aircrafttype"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="actualdeparturetime"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="estimatedarrivaltime"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="filed_departuretime"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="origin"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="destination"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="originName"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="originCity"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="destinationName"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="destinationCity"/>
+ </xs:all>
+</xs:complexType>
+
+<xs:complexType name="ScheduledStruct">
+ <xs:all>
+
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="next_offset"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="FlightAwareDirectFlight:ArrayOfScheduledFlightStruct" nillable="true" name="scheduled"/>
+ </xs:all>
+</xs:complexType>
+
+<xs:complexType name="InFlightStruct">
+ <xs:all>
+
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="next_offset"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="FlightAwareDirectFlight:ArrayOfInFlightAircraftStruct" nillable="true" name="aircraft"/>
+ </xs:all>
+</xs:complexType>
+
+<xs:complexType name="countAirportOperationsStruct">
+ <xs:all>
+
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="enroute"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="departed"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="scheduled_departures"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="scheduled_arrivals"/>
+ </xs:all>
+</xs:complexType>
+
+
+<xs:complexType name="ArrayOfDepartureFlightStruct">
+ <xs:complexContent mixed="false">
+ <xs:restriction base="SOAP-ENC:Array">
+ <xs:attribute wsdl:arrayType="FlightAwareDirectFlight:DepartureFlightStruct[]" ref="SOAP-ENC:arrayType"/>
+ </xs:restriction>
+ </xs:complexContent>
+</xs:complexType>
+
+
+
+<xs:complexType name="ArrayOfArrivalFlightStruct">
+ <xs:complexContent mixed="false">
+ <xs:restriction base="SOAP-ENC:Array">
+ <xs:attribute wsdl:arrayType="FlightAwareDirectFlight:ArrivalFlightStruct[]" ref="SOAP-ENC:arrayType"/>
+ </xs:restriction>
+ </xs:complexContent>
+</xs:complexType>
+
+
+<xs:complexType name="TailOwnerStruct">
+ <xs:all>
+
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="owner"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="location"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="location2"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="website"/>
+ </xs:all>
+</xs:complexType>
+
+
+<xs:complexType name="ArrayOfInFlightAircraftStruct">
+ <xs:complexContent mixed="false">
+ <xs:restriction base="SOAP-ENC:Array">
+ <xs:attribute wsdl:arrayType="FlightAwareDirectFlight:InFlightAircraftStruct[]" ref="SOAP-ENC:arrayType"/>
+ </xs:restriction>
+ </xs:complexContent>
+</xs:complexType>
+
+
+
+<xs:complexType name="ArrayOfString">
+ <xs:complexContent mixed="false">
+ <xs:restriction base="SOAP-ENC:Array">
+ <xs:attribute wsdl:arrayType="xsd:string[]" ref="SOAP-ENC:arrayType"/>
+ </xs:restriction>
+ </xs:complexContent>
+</xs:complexType>
+
+
+<xs:complexType name="DepartureFlightStruct">
+ <xs:all>
+
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="ident"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="aircrafttype"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="actualdeparturetime"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="estimatedarrivaltime"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="actualarrivaltime"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="origin"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="destination"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="originName"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="originCity"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="destinationName"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="destinationCity"/>
+ </xs:all>
+</xs:complexType>
+
+<xs:complexType name="AircraftTypeStruct">
+ <xs:all>
+
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="manufacturer"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="type"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="description"/>
+ </xs:all>
+</xs:complexType>
+
+<xs:complexType name="ArrivalFlightStruct">
+ <xs:all>
+
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="ident"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="aircrafttype"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="actualdeparturetime"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="actualarrivaltime"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="origin"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="destination"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="originName"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="originCity"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="destinationName"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:string" nillable="true" name="destinationCity"/>
+ </xs:all>
+</xs:complexType>
+
+<xs:complexType name="FlightInfoStruct">
+ <xs:all>
+
+ <xs:element minOccurs="0" maxOccurs="1" type="xsd:int" nillable="true" name="next_offset"/>
+ <xs:element minOccurs="0" maxOccurs="1" type="FlightAwareDirectFlight:ArrayOfFlightStruct" nillable="true" name="flights"/>
+ </xs:all>
+</xs:complexType>
+
+ </xs:schema>
+</wsdl:types>
+ <wsdl:message name="FlightInfoIn"><wsdl:part name="ident" type="xsd:string"/><wsdl:part name="howMany" type="xsd:int"/>
+ </wsdl:message>
+
+ <wsdl:message name="FlightInfoOut">
+ <wsdl:part name="return" type="FlightAwareDirectFlight:FlightInfoStruct"/>
+ </wsdl:message>
+ <wsdl:message name="InFlightInfoIn"><wsdl:part name="ident" type="xsd:string"/>
+ </wsdl:message>
+
+ <wsdl:message name="InFlightInfoOut">
+ <wsdl:part name="return" type="FlightAwareDirectFlight:InFlightAircraftStruct"/>
+ </wsdl:message>
+ <wsdl:message name="GetLastTrackIn"><wsdl:part name="ident" type="xsd:string"/>
+ </wsdl:message>
+
+ <wsdl:message name="GetLastTrackOut">
+ <wsdl:part name="return" type="FlightAwareDirectFlight:ArrayOfTrackStruct"/>
+ </wsdl:message>
+ <wsdl:message name="SearchIn"><wsdl:part name="query" type="xsd:string"/><wsdl:part name="howMany" type="xsd:int"/><wsdl:part name="offset" type="xsd:int"/>
+ </wsdl:message>
+
+ <wsdl:message name="SearchOut">
+ <wsdl:part name="return" type="FlightAwareDirectFlight:InFlightStruct"/>
+ </wsdl:message>
+ <wsdl:message name="SearchCountIn"><wsdl:part name="query" type="xsd:string"/>
+ </wsdl:message>
+
+ <wsdl:message name="SearchCountOut">
+ <wsdl:part name="return" type="xsd:int"/>
+ </wsdl:message>
+ <wsdl:message name="ScheduledIn"><wsdl:part name="airport" type="xsd:string"/><wsdl:part name="howMany" type="xsd:int"/><wsdl:part name="filter" type="xsd:string"/><wsdl:part name="offset" type="xsd:int"/>
+ </wsdl:message>
+
+ <wsdl:message name="ScheduledOut">
+ <wsdl:part name="return" type="FlightAwareDirectFlight:ScheduledStruct"/>
+ </wsdl:message>
+ <wsdl:message name="DepartedIn"><wsdl:part name="airport" type="xsd:string"/><wsdl:part name="howMany" type="xsd:int"/><wsdl:part name="filter" type="xsd:string"/><wsdl:part name="offset" type="xsd:int"/>
+ </wsdl:message>
+
+ <wsdl:message name="DepartedOut">
+ <wsdl:part name="return" type="FlightAwareDirectFlight:DepartureStruct"/>
+ </wsdl:message>
+ <wsdl:message name="EnrouteIn"><wsdl:part name="airport" type="xsd:string"/><wsdl:part name="howMany" type="xsd:int"/><wsdl:part name="filter" type="xsd:string"/><wsdl:part name="offset" type="xsd:int"/>
+ </wsdl:message>
+
+ <wsdl:message name="EnrouteOut">
+ <wsdl:part name="return" type="FlightAwareDirectFlight:EnrouteStruct"/>
+ </wsdl:message>
+ <wsdl:message name="FleetArrivedIn"><wsdl:part name="fleet" type="xsd:string"/><wsdl:part name="howMany" type="xsd:int"/><wsdl:part name="offset" type="xsd:int"/>
+ </wsdl:message>
+
+ <wsdl:message name="FleetArrivedOut">
+ <wsdl:part name="return" type="FlightAwareDirectFlight:ArrivalStruct"/>
+ </wsdl:message>
+ <wsdl:message name="ArrivedIn"><wsdl:part name="airport" type="xsd:string"/><wsdl:part name="howMany" type="xsd:int"/><wsdl:part name="filter" type="xsd:string"/><wsdl:part name="offset" type="xsd:int"/>
+ </wsdl:message>
+
+ <wsdl:message name="ArrivedOut">
+ <wsdl:part name="return" type="FlightAwareDirectFlight:ArrivalStruct"/>
+ </wsdl:message>
+ <wsdl:message name="AllAirportsIn">
+ </wsdl:message>
+
+ <wsdl:message name="AllAirportsOut">
+ <wsdl:part name="return" type="FlightAwareDirectFlight:ArrayOfString"/>
+ </wsdl:message>
+ <wsdl:message name="ZipcodeInfoIn"><wsdl:part name="zipcode" type="xsd:string"/>
+ </wsdl:message>
+
+ <wsdl:message name="ZipcodeInfoOut">
+ <wsdl:part name="return" type="FlightAwareDirectFlight:ZipcodeInfoStruct"/>
+ </wsdl:message>
+ <wsdl:message name="AirportInfoIn"><wsdl:part name="airportCode" type="xsd:string"/>
+ </wsdl:message>
+
+ <wsdl:message name="AirportInfoOut">
+ <wsdl:part name="return" type="FlightAwareDirectFlight:AirportInfoStruct"/>
+ </wsdl:message>
+ <wsdl:message name="TailOwnerIn"><wsdl:part name="ident" type="xsd:string"/>
+ </wsdl:message>
+
+ <wsdl:message name="TailOwnerOut">
+ <wsdl:part name="return" type="FlightAwareDirectFlight:TailOwnerStruct"/>
+ </wsdl:message>
+ <wsdl:message name="RoutesBetweenAirportsIn"><wsdl:part name="origin" type="xsd:string"/><wsdl:part name="destination" type="xsd:string"/>
+ </wsdl:message>
+
+ <wsdl:message name="RoutesBetweenAirportsOut">
+ <wsdl:part name="return" type="FlightAwareDirectFlight:ArrayOfRoutesBetweenAirportsStruct"/>
+ </wsdl:message>
+ <wsdl:message name="AircraftTypeIn"><wsdl:part name="type" type="xsd:string"/>
+ </wsdl:message>
+
+ <wsdl:message name="AircraftTypeOut">
+ <wsdl:part name="return" type="FlightAwareDirectFlight:AircraftTypeStruct"/>
+ </wsdl:message>
+ <wsdl:message name="countAirportOperationsIn"><wsdl:part name="airport" type="xsd:string"/>
+ </wsdl:message>
+
+ <wsdl:message name="countAirportOperationsOut">
+ <wsdl:part name="return" type="FlightAwareDirectFlight:countAirportOperationsStruct"/>
+ </wsdl:message>
+ <wsdl:message name="blockIdentCheckIn"><wsdl:part name="ident" type="xsd:string"/>
+ </wsdl:message>
+
+ <wsdl:message name="blockIdentCheckOut">
+ <wsdl:part name="return" type="xsd:int"/>
+ </wsdl:message>
+ <wsdl:message name="METARIn"><wsdl:part name="airport" type="xsd:string"/>
+ </wsdl:message>
+
+ <wsdl:message name="METAROut">
+ <wsdl:part name="return" type="xsd:string"/>
+ </wsdl:message>
+ <wsdl:message name="TAFIn"><wsdl:part name="airport" type="xsd:string"/>
+ </wsdl:message>
+
+ <wsdl:message name="TAFOut">
+ <wsdl:part name="return" type="xsd:string"/>
+ </wsdl:message>
+ <wsdl:message name="NTAFIn"><wsdl:part name="airport" type="xsd:string"/>
+ </wsdl:message>
+
+ <wsdl:message name="NTAFOut">
+ <wsdl:part name="return" type="FlightAwareDirectFlight:TafStruct"/>
+ </wsdl:message>
+ <wsdl:message name="LatLongsToDistanceIn"><wsdl:part name="lat1" type="xsd:float"/><wsdl:part name="lon1" type="xsd:float"/><wsdl:part name="lat2" type="xsd:float"/><wsdl:part name="lon2" type="xsd:float"/>
+ </wsdl:message>
+
+ <wsdl:message name="LatLongsToDistanceOut">
+ <wsdl:part name="return" type="xsd:int"/>
+ </wsdl:message>
+ <wsdl:message name="LatLongsToHeadingIn"><wsdl:part name="lat1" type="xsd:float"/><wsdl:part name="lon1" type="xsd:float"/><wsdl:part name="lat2" type="xsd:float"/><wsdl:part name="lon2" type="xsd:float"/>
+ </wsdl:message>
+
+ <wsdl:message name="LatLongsToHeadingOut">
+ <wsdl:part name="return" type="xsd:int"/>
+ </wsdl:message>
+ <wsdl:message name="MapFlight_BetaIn"><wsdl:part name="ident" type="xsd:string"/><wsdl:part name="mapHeight" type="xsd:int"/><wsdl:part name="mapWidth" type="xsd:int"/>
+ </wsdl:message>
+
+ <wsdl:message name="MapFlight_BetaOut">
+ <wsdl:part name="return" type="xsd:string"/>
+ </wsdl:message>
+ <wsdl:portType name="DirectFlightSoap">
+ <wsdl:operation name="FlightInfo">
+ <wsdl:documentation><p>FlightInfo returns information about flights for a specific tail number (e.g., <strong>N12345</strong>) or ICAO airline and flight
+number (e.g., <strong>SWA2558</strong>) and the maximum number of flights to be returned. Flight information will be returned from newest to old
+est with the oldest not being more than 3-4 days in the past.</p>
+<p>Times are in integer seconds-since-1970 (UNIX epoch) time, except for estimated time enroute, which is in hours and minutes.</p></wsdl:documentation>
+
+ <wsdl:input message="FlightAwareDirectFlight:FlightInfoIn"/>
+ <wsdl:output message="FlightAwareDirectFlight:FlightInfoOut"/>
+ </wsdl:operation>
+ <wsdl:operation name="InFlightInfo">
+ <wsdl:documentation>InFlightInfo looks up a specific tail number (e.g., <strong>N12345</strong>) or ICAO airline and flight number (e.g., <strong>SWA2558</strong>)
+and returns current position/direction/speed information. It is only useful for airborne flights.</wsdl:documentation>
+
+ <wsdl:input message="FlightAwareDirectFlight:InFlightInfoIn"/>
+ <wsdl:output message="FlightAwareDirectFlight:InFlightInfoOut"/>
+ </wsdl:operation>
+ <wsdl:operation name="GetLastTrack">
+ <wsdl:documentation><p>GetLastTrack looks up a flight by specific tail number (e.g., <strong>N12345</strong>) or ICAO airline and flight number (e.g., <strong>SWA2558</strong>). It returns the track log from the current IFR flight or, if the aircraft is not airborne, the most recent IFR flight. It returns an array of positions, with each including the timestamp, longitude, latitude groundspeed, altitude, altitudestatus, updatetype, and altitudechange. Altitude is in hundreds of feet or Flight Level where appropriate, see http://flightaware.com/about/faq.rvt#flightLevel. Also included altitude status, update type, and altitude change
+<p>Altitude status is 'C' when the flight is more than 200 feet away from its ATC-assigned altitude. (For example, the aircraft is transitioning to its assigned altitude.) Altitude change is 'C' if the aircraft is climbing (compared to the previous position reported), 'D' for descending, and empty if it is level. This happens for VFR flights with flight following, among other things. Timestamp is integer seconds-since-1970.
+</p></wsdl:documentation>
+
+ <wsdl:input message="FlightAwareDirectFlight:GetLastTrackIn"/>
+ <wsdl:output message="FlightAwareDirectFlight:GetLastTrackOut"/>
+ </wsdl:operation>
+ <wsdl:operation name="Search">
+ <wsdl:documentation>Search searches data on all airborne aircraft to find ones matching the search query. Query parameters include a latitude/longitude box, aircraft ident with wildcards, type with wildcards, prefix, suffix, origin airport, destination airport, origin or destination airport, groundspeed, and altitude. It takes search terms in a single string comprising "-key value" pairs and returns an array of flight structures.
+<p>
+Keys include:
+<ul>
+ <li>-prefix</li>
+ <li>-type</li>
+ <li>-suffix</li>
+ <li>-idents</li>
+ <li>-destination</li>
+ <li>-origin
+ <li>-originOrDestination</li>
+ <li>-aboveAltitude</li>
+ <li>-belowAltitude</li>
+ <li>-aboveGroundspeed</li>
+ <li>-belowGroundspeed</li>
+ <li>-latlong</li>
+</ul>
+
+<p>
+ To search for all aircraft below ten-thousand feet with a groundspeed over
+ 200 kts:
+ <div class="indent">
+ -belowAltitude 100 -aboveGroundspeed 200
+ </div>
+</p>
+
+<p>
+To search for all in-air Boeing 777s:
+ <div class="indent">
+ -type B77*
+ </div>
+</p>
+
+<p>
+To search for all aircraft heading to Los Angeles International Airport (LAX) that are "heavy" aircraft:
+ <div class="indent">
+ -destination LAX -prefix H
+ </div>
+</p>
+
+<p>
+To search for all Continental Airlines flights in Boeing 737s
+ <div class="indent">
+ -idents COA* -type B73*
+ <?div>
+</p>
+</wsdl:documentation>
+
+ <wsdl:input message="FlightAwareDirectFlight:SearchIn"/>
+ <wsdl:output message="FlightAwareDirectFlight:SearchOut"/>
+ </wsdl:operation>
+ <wsdl:operation name="SearchCount">
+ <wsdl:documentation>SearchCount works like Search but returns a count of matching flights rather than information about each flight.
+</wsdl:documentation>
+
+ <wsdl:input message="FlightAwareDirectFlight:SearchCountIn"/>
+ <wsdl:output message="FlightAwareDirectFlight:SearchCountOut"/>
+ </wsdl:operation>
+ <wsdl:operation name="Scheduled">
+ <wsdl:documentation><p>Scheduled returns information about scheduled flights (technically, filed IFR flights) for a specified airport and a maximum number of flights to be returned. Scheduled flights are returned from soonest to furthest in the future to depart.</p>
+
+<p>
+ The <strong>airport</strong> argument must be the ICAO airport ID (e.g., KLAX, KSFO, KIAH, KHOU, KJFK, KEWR, KORD, KATL, etc.
+</p>
+
+<p>
+ The <strong>howMany</strong> argument must be an integer value less than or equal to 15 and determines the number of results.
+</p>
+
+<p>
+ The <strong>offset</strong> argument must be an integer value of the offset row count you want the search to start at. Most requests should be 0.
+</p>
+
+<p>
+ The <strong>filter</strong> argument can be &quot;ga&quot; or &quot;airline&quot; to only show GA or Airline traffic, respectively, or null/empty to show all traffic.
+</p>
+
+<p>
+ The <strong>next_offset</strong> value returned advises an application of the next offset to use (if more data is available).
+</p>
+
+<p>Times returned are UNIX epoch (integer seconds since 1970) format.</p>
+</wsdl:documentation>
+
+ <wsdl:input message="FlightAwareDirectFlight:ScheduledIn"/>
+ <wsdl:output message="FlightAwareDirectFlight:ScheduledOut"/>
+ </wsdl:operation>
+ <wsdl:operation name="Departed">
+ <wsdl:documentation><p>Departed returns information about already departed flights for a specified airport and maximum number of flights to be returned. Departed flights are returned in order from most recently to least recently departed.</p>
+
+<p>
+ The <strong>airport</strong> argument must be the ICAO airport ID (e.g., KLAX, KSFO, KIAH, KHOU, KJFK, KEWR, KORD, KATL, etc.
+</p>
+
+<p>
+ The <strong>howMany</strong> argument must be an integer value less than or equal to 15 and determines the number of results.
+</p>
+
+<p>
+ The <strong>offset</strong> argument must be an integer value of the offset row count you want the search to start at. Most requests should be 0.
+</p>
+
+<p>
+ The <strong>filter</strong> argument can be &quot;ga&quot; or &quot;airline&quot; to only show GA or Airline traffic, respectively, or null/empty to show all traffic.
+</p>
+
+<p>
+ The <strong>next_offset</strong> value returned advises an application of the next offset to use (if more data is available).
+</p></wsdl:documentation>
+
+ <wsdl:input message="FlightAwareDirectFlight:DepartedIn"/>
+ <wsdl:output message="FlightAwareDirectFlight:DepartedOut"/>
+ </wsdl:operation>
+ <wsdl:operation name="Enroute">
+ <wsdl:documentation><p>Enroute returns information about flights already in the air for the specified airport and maximum number of flights to be returned. Enroute flights are returned from soonest estimated arrival to least soon estimated arrival.</p>
+
+<p>
+ The <strong>airport</strong> argument must be the ICAO airport ID (e.g., KLAX, KSFO, KIAH, KHOU, KJFK, KEWR, KORD, KATL, etc.
+</p>
+
+<p>
+ The <strong>howMany</strong> argument must be an integer value less than or equal to 15 and determines the number of results.
+</p>
+
+<p>
+ The <strong>offset</strong> argument must be an integer value of the offset row count you want the search to start at. Most requests should be 0.
+</p>
+
+<p>
+ The <strong>filter</strong> argument can be &quot;ga&quot; or &quot;airline&quot; to only show GA or Airline traffic, respectively, or null/empty to show all traffic.
+</p>
+
+<p>
+ The <strong>next_offset</strong> value returned advises an application of the next offset to use (if more data is available).
+</p></wsdl:documentation>
+
+ <wsdl:input message="FlightAwareDirectFlight:EnrouteIn"/>
+ <wsdl:output message="FlightAwareDirectFlight:EnrouteOut"/>
+ </wsdl:operation>
+ <wsdl:operation name="FleetArrived">
+ <wsdl:documentation><p>
+ The <strong>fleet</strong> argument must be an ICAO prefix (e.g., COA, DAL, UAL, OPT, etc.)
+</p>
+
+<p>
+ The <strong>howMany</strong> argument must be an integer value less than or equal to 15 and determines the number of results.
+</p>
+
+<p>
+ The <strong>offset</strong> argument must be an integer value of the offset row count you want the search to start at. Most requests should be 0.
+</p>
+
+<p>
+ The <strong>next_offset</strong> value returned advises an application of the next offset to use (if more data is available).
+</p></wsdl:documentation>
+
+ <wsdl:input message="FlightAwareDirectFlight:FleetArrivedIn"/>
+ <wsdl:output message="FlightAwareDirectFlight:FleetArrivedOut"/>
+ </wsdl:operation>
+ <wsdl:operation name="Arrived">
+ <wsdl:documentation><p>Arrived returns information about flights that have recently arrived for the specified airport and maximum number of flights to be returned. Flights are returned from most to least recent.</p>
+<p>
+ The <strong>airport</strong> argument must be the ICAO airport ID (e.g., KLAX, KSFO, KIAH, KHOU, KJFK, KEWR, KORD, KATL, etc.
+</p>
+
+<p>
+ The <strong>howMany</strong> argument must be an integer value less than or equal to 15 and determines the number of results.
+</p>
+
+<p>
+ The <strong>offset</strong> argument must be an integer value of the offset row count you want the search to start at. Most requests should be 0.
+</p>
+
+<p>
+ The <strong>filter</strong> argument can be &quot;ga&quot; or &quot;airline&quot; to only show GA or Airline traffic, respectively, or null/empty to show all traffic.
+</p>
+
+<p>
+ The <strong>next_offset</strong> value returned advises an application of the next offset to use (if more data is available).
+</p></wsdl:documentation>
+
+ <wsdl:input message="FlightAwareDirectFlight:ArrivedIn"/>
+ <wsdl:output message="FlightAwareDirectFlight:ArrivedOut"/>
+ </wsdl:operation>
+ <wsdl:operation name="AllAirports">
+ <wsdl:documentation>AllAirports returns the ICAO airport IDs of all known airports.</wsdl:documentation>
+
+ <wsdl:input message="FlightAwareDirectFlight:AllAirportsIn"/>
+ <wsdl:output message="FlightAwareDirectFlight:AllAirportsOut"/>
+ </wsdl:operation>
+ <wsdl:operation name="ZipcodeInfo">
+ <wsdl:documentation>ZipcodeInfo returns information about a five-digit zipcode. Of particular importance is latitude and longitude.</wsdl:documentation>
+
+ <wsdl:input message="FlightAwareDirectFlight:ZipcodeInfoIn"/>
+ <wsdl:output message="FlightAwareDirectFlight:ZipcodeInfoOut"/>
+ </wsdl:operation>
+ <wsdl:operation name="AirportInfo">
+ <wsdl:documentation>AirportInfo returns information about an airport given an ICAO airport code such as KLAX, KSFO, KORD, KIAH, O07, etc. Data returned includes name (Houston Intercontinental Airport), location (typically city and state), latitude and longitude.</wsdl:documentation>
+
+ <wsdl:input message="FlightAwareDirectFlight:AirportInfoIn"/>
+ <wsdl:output message="FlightAwareDirectFlight:AirportInfoOut"/>
+ </wsdl:operation>
+ <wsdl:operation name="TailOwner">
+ <wsdl:documentation>TailOwner returns information about an the owner of an aircraft, given a flight number or N-number. Data returned includes owner's name, location (typically city and state), and website, if any.</wsdl:documentation>
+
+ <wsdl:input message="FlightAwareDirectFlight:TailOwnerIn"/>
+ <wsdl:output message="FlightAwareDirectFlight:TailOwnerOut"/>
+ </wsdl:operation>
+ <wsdl:operation name="RoutesBetweenAirports">
+ <wsdl:documentation>RoutesBetweenAirports returns information about assigned IFR routings between two airports. For each known routing, the route, number of times that route has been assigned and the filed altitude are returned.</wsdl:documentation>
+
+ <wsdl:input message="FlightAwareDirectFlight:RoutesBetweenAirportsIn"/>
+ <wsdl:output message="FlightAwareDirectFlight:RoutesBetweenAirportsOut"/>
+ </wsdl:operation>
+ <wsdl:operation name="AircraftType">
+ <wsdl:documentation>Given an aircraft type string such as GALX, AircraftType returns information about that type, comprising the manufacturer (for instance, "IAI"), type (for instance, "Gulfstream G200"), and description (like "twin-jet").</wsdl:documentation>
+
+ <wsdl:input message="FlightAwareDirectFlight:AircraftTypeIn"/>
+ <wsdl:output message="FlightAwareDirectFlight:AircraftTypeOut"/>
+ </wsdl:operation>
+ <wsdl:operation name="countAirportOperations">
+ <wsdl:documentation>Given an airport, returns integer values on the number of aircraft scheduled or actually en route or departing from the airport. Scheduled arrival is a non-airborne flight that is scheduled to the airport in question.</wsdl:documentation>
+
+ <wsdl:input message="FlightAwareDirectFlight:countAirportOperationsIn"/>
+ <wsdl:output message="FlightAwareDirectFlight:countAirportOperationsOut"/>
+ </wsdl:operation>
+ <wsdl:operation name="blockIdentCheck">
+ <wsdl:documentation>Given an aircraft identification, returns 1 if the aircraft is blocked from public tracking, 0 if it is not.</wsdl:documentation>
+
+ <wsdl:input message="FlightAwareDirectFlight:blockIdentCheckIn"/>
+ <wsdl:output message="FlightAwareDirectFlight:blockIdentCheckOut"/>
+ </wsdl:operation>
+ <wsdl:operation name="METAR">
+ <wsdl:documentation>Given an airport, return the METAR weather info, if available.</wsdl:documentation>
+
+ <wsdl:input message="FlightAwareDirectFlight:METARIn"/>
+ <wsdl:output message="FlightAwareDirectFlight:METAROut"/>
+ </wsdl:operation>
+ <wsdl:operation name="TAF">
+ <wsdl:documentation>Given an airport, return the terminal area forecast, if available.</wsdl:documentation>
+
+ <wsdl:input message="FlightAwareDirectFlight:TAFIn"/>
+ <wsdl:output message="FlightAwareDirectFlight:TAFOut"/>
+ </wsdl:operation>
+ <wsdl:operation name="NTAF">
+ <wsdl:documentation>Given an airport, return the terminal area forecast, if available.</wsdl:documentation>
+
+ <wsdl:input message="FlightAwareDirectFlight:NTAFIn"/>
+ <wsdl:output message="FlightAwareDirectFlight:NTAFOut"/>
+ </wsdl:operation>
+ <wsdl:operation name="LatLongsToDistance">
+ <wsdl:documentation>Given two latitudes and longitudes, lat1 lon1 lat2 and lon2, respectively, determine the great circle distance between those positions in miles.</wsdl:documentation>
+
+ <wsdl:input message="FlightAwareDirectFlight:LatLongsToDistanceIn"/>
+ <wsdl:output message="FlightAwareDirectFlight:LatLongsToDistanceOut"/>
+ </wsdl:operation>
+ <wsdl:operation name="LatLongsToHeading">
+ <wsdl:documentation>Given two latitudes and longitudes, lat1 lon1 lat2 and lon2, respectively, calculate and return the initial compass heading (where 360 is North) from position one to position two. Quite accurate for relatively short distances but since it assumes the earth is a sphere rather than on irregular oblate sphereoid may be inaccurate for flights around a good chunk of the world, etc.</wsdl:documentation>
+
+ <wsdl:input message="FlightAwareDirectFlight:LatLongsToHeadingIn"/>
+ <wsdl:output message="FlightAwareDirectFlight:LatLongsToHeadingOut"/>
+ </wsdl:operation>
+ <wsdl:operation name="MapFlight_Beta">
+ <wsdl:documentation>This function will return a base64 encoded GIF (with the height and width as specified in pixels) of the most recent
+ (past or current) flight of a specified ident. This service is in beta. Future versions will allow viewing of past
+ flights, configuring nexrad, and configuring zoom.</wsdl:documentation>
+
+ <wsdl:input message="FlightAwareDirectFlight:MapFlight_BetaIn"/>
+ <wsdl:output message="FlightAwareDirectFlight:MapFlight_BetaOut"/>
+ </wsdl:operation></wsdl:portType>
+ <wsdl:binding name="DirectFlightSoap" type="FlightAwareDirectFlight:DirectFlightSoap">
+ <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="FlightInfo">
+ <soap:operation soapAction="FlightAwareDirectFlight"/>
+ <wsdl:input>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="InFlightInfo">
+ <soap:operation soapAction="FlightAwareDirectFlight"/>
+ <wsdl:input>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="GetLastTrack">
+ <soap:operation soapAction="FlightAwareDirectFlight"/>
+ <wsdl:input>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="Search">
+ <soap:operation soapAction="FlightAwareDirectFlight"/>
+ <wsdl:input>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="SearchCount">
+ <soap:operation soapAction="FlightAwareDirectFlight"/>
+ <wsdl:input>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="Scheduled">
+ <soap:operation soapAction="FlightAwareDirectFlight"/>
+ <wsdl:input>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="Departed">
+ <soap:operation soapAction="FlightAwareDirectFlight"/>
+ <wsdl:input>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="Enroute">
+ <soap:operation soapAction="FlightAwareDirectFlight"/>
+ <wsdl:input>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="FleetArrived">
+ <soap:operation soapAction="FlightAwareDirectFlight"/>
+ <wsdl:input>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="Arrived">
+ <soap:operation soapAction="FlightAwareDirectFlight"/>
+ <wsdl:input>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="AllAirports">
+ <soap:operation soapAction="FlightAwareDirectFlight"/>
+ <wsdl:input>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="ZipcodeInfo">
+ <soap:operation soapAction="FlightAwareDirectFlight"/>
+ <wsdl:input>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="AirportInfo">
+ <soap:operation soapAction="FlightAwareDirectFlight"/>
+ <wsdl:input>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="TailOwner">
+ <soap:operation soapAction="FlightAwareDirectFlight"/>
+ <wsdl:input>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="RoutesBetweenAirports">
+ <soap:operation soapAction="FlightAwareDirectFlight"/>
+ <wsdl:input>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="AircraftType">
+ <soap:operation soapAction="FlightAwareDirectFlight"/>
+ <wsdl:input>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="countAirportOperations">
+ <soap:operation soapAction="FlightAwareDirectFlight"/>
+ <wsdl:input>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="blockIdentCheck">
+ <soap:operation soapAction="FlightAwareDirectFlight"/>
+ <wsdl:input>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="METAR">
+ <soap:operation soapAction="FlightAwareDirectFlight"/>
+ <wsdl:input>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="TAF">
+ <soap:operation soapAction="FlightAwareDirectFlight"/>
+ <wsdl:input>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="NTAF">
+ <soap:operation soapAction="FlightAwareDirectFlight"/>
+ <wsdl:input>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="LatLongsToDistance">
+ <soap:operation soapAction="FlightAwareDirectFlight"/>
+ <wsdl:input>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="LatLongsToHeading">
+ <soap:operation soapAction="FlightAwareDirectFlight"/>
+ <wsdl:input>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="MapFlight_Beta">
+ <soap:operation soapAction="FlightAwareDirectFlight"/>
+ <wsdl:input>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="encoded" namespace="FlightAwareDirectFlight" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </wsdl:output>
+ </wsdl:operation>
+
+ </wsdl:binding>
+ <wsdl:service name="DirectFlight">
+ <wsdl:documentation>FlightAware DirectFlight Web Service</wsdl:documentation>
+ <wsdl:port name="DirectFlightSoap" binding="FlightAwareDirectFlight:DirectFlightSoap">
+ <soap:address location="http://directflight.flightaware.com:80/soap/DirectFlight/go"/>
+
+ </wsdl:port>
+ </wsdl:service>
+ </wsdl:definitions>
\ No newline at end of file
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.test/src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.test/src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java 2010-08-25 12:23:17 UTC (rev 24417)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.test/src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java 2010-08-25 12:25:06 UTC (rev 24418)
@@ -112,6 +112,12 @@
Assert.assertTrue(s2.contains("<toUnit>?</toUnit>"));
}
+ @Test
+ public void testJBIDE6865() {
+ String s1 = getSampleMessage("/jbide6865/wsdl1.wsdl", "DirectFlight", "DirectFlightSoap", "FlightAwareDirectFlight:DirectFlightSoap", "AirportInfo");
+ Assert.assertTrue(s1.contains("<airportCode>?</airportCode>"));
+ }
+
private String getSampleMessage(String res, String service, String port, String binding, String operation) {
Definition def = readWSDL(res);
return TesterWSDLUtils.getSampleSOAPInputMessage(def, service, port, binding, operation);
15 years, 4 months