JBoss Tools SVN: r27028 - in trunk/usage: plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-30 11:14:44 -0500 (Tue, 30 Nov 2010)
New Revision: 27028
Added:
trunk/usage/tests/org.jboss.tools.usage.test/EclipseEnvironmentTest.launch
trunk/usage/tests/org.jboss.tools.usage.test/UsageIntegrationTest.launch
trunk/usage/tests/org.jboss.tools.usage.test/UsageReportIntegrationTest.launch
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageReportIntegrationTest.java
Removed:
trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsEclipseEnvironmentTest.launch
trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageIntegrationTest.launch
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsEclipseEnvironmentTest.java
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsFocusPointTest.java
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java
Modified:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferences.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReport.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReportEnablementDialog.java
trunk/usage/tests/org.jboss.tools.usage.test/JBoss Tools Usage Reporter.launch
trunk/usage/tests/org.jboss.tools.usage.test/UsageTestSuite.launch
Log:
[JBIDE-7757] added integration tests for UsageReport
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferences.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferences.java 2010-11-30 16:02:52 UTC (rev 27027)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferences.java 2010-11-30 16:14:44 UTC (rev 27028)
@@ -18,35 +18,64 @@
import org.jboss.tools.usage.tracker.internal.UsagePluginLogger;
import org.osgi.service.prefs.BackingStoreException;
+// TODO: Auto-generated Javadoc
/**
+ * The Class UsageReportPreferences.
+ *
* @author Andre Dietisheim
*/
public class UsageReportPreferences {
+ /**
+ * Enables (<code>true</code>) or disables (<code>false</code>) usage
+ * reporting preferences.
+ *
+ * @param enabled
+ * the new enabled
+ */
public static void setEnabled(boolean enabled) {
UsageReportPreferencesUtils.getStore().putValue(
IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_ID, String.valueOf(enabled));
save();
}
+ /**
+ * Returns <code>true</code> if usage reporting is enabled
+ *
+ * @return true, if is enabled
+ */
public static boolean isEnabled() {
return UsageReportPreferencesUtils.getPreferences().getBoolean(
IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_ID,
IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_DEFAULTVALUE);
}
+ /**
+ * Checks if is ask user.
+ *
+ * @return true, if is ask user
+ */
public static boolean isAskUser() {
return UsageReportPreferencesUtils.getPreferences().getBoolean(
IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_ID,
IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_DEFAULTVALUE);
}
+ /**
+ * Sets the ask user.
+ *
+ * @param askUser
+ * the new ask user
+ */
public static void setAskUser(boolean askUser) {
UsageReportPreferencesUtils.getStore().putValue(IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_ID,
String.valueOf(askUser));
save();
}
+ /**
+ * Save.
+ */
private static void save() {
try {
UsageReportPreferencesUtils.getStore().save();
@@ -57,10 +86,21 @@
}
+ /**
+ * Flush.
+ *
+ * @throws BackingStoreException
+ * the backing store exception
+ */
public static void flush() throws BackingStoreException {
UsageReportPreferencesUtils.getPreferences().flush();
}
+ /**
+ * Creates the preference store.
+ *
+ * @return the i preference store
+ */
public static IPreferenceStore createPreferenceStore() {
return UsageReportPreferencesUtils.getStore();
}
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReport.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReport.java 2010-11-30 16:02:52 UTC (rev 27027)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReport.java 2010-11-30 16:14:44 UTC (rev 27028)
@@ -13,12 +13,10 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.IJobChangeListener;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.window.Window;
+import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.progress.UIJob;
import org.jboss.tools.usage.googleanalytics.GoogleAnalyticsUrlStrategy;
import org.jboss.tools.usage.googleanalytics.IJBossToolsEclipseEnvironment;
import org.jboss.tools.usage.http.HttpGetRequest;
@@ -32,7 +30,6 @@
import org.jboss.tools.usage.tracker.internal.SuffixFocusPoint;
import org.jboss.tools.usage.tracker.internal.Tracker;
import org.jboss.tools.usage.tracker.internal.UsagePluginLogger;
-import org.osgi.framework.InvalidSyntaxException;
import org.osgi.service.prefs.BackingStoreException;
/**
@@ -47,32 +44,103 @@
private IJBossToolsEclipseEnvironment eclipseEnvironment;
UsagePluginLogger logger = new UsagePluginLogger(JBossToolsUsageActivator.getDefault());
-
- public UsageReport() throws InvalidSyntaxException {
- eclipseEnvironment = JBossToolsUsageActivator.getDefault().getJBossToolsEclipseEnvironment();
- focusPoint = new SuffixFocusPoint("tools", eclipseEnvironment.getJBossToolsVersion()) //$NON-NLS-1$
- .setChild(new FocusPoint("usage") //$NON-NLS-1$
- .setChild(new FocusPoint("action") //$NON-NLS-1$
- .setChild(new FocusPoint("wsstartup")))); //$NON-NLS-1$
- globalSettings = new GlobalUsageSettings(JBossToolsUsageActivator
- .getDefault());
+
+ public UsageReport() {
+ this(JBossToolsUsageActivator.getDefault().getJBossToolsEclipseEnvironment());
+
}
+ /**
+ * Instantiates a new usage report.
+ *
+ * @param eclipseEnvironment
+ * the eclipse environment
+ */
+ protected UsageReport(IJBossToolsEclipseEnvironment eclipseEnvironment) {
+ this(
+ new SuffixFocusPoint("tools", eclipseEnvironment.getJBossToolsVersion()) //$NON-NLS-1$
+ .setChild(new FocusPoint("usage") //$NON-NLS-1$
+ .setChild(new FocusPoint("action") //$NON-NLS-1$
+ .setChild(new FocusPoint("wsstartup")))), //$NON-NLS-1$
+ eclipseEnvironment,
+ new GlobalUsageSettings(JBossToolsUsageActivator.getDefault()));
+ }
+
+ /**
+ * Instantiates a new usage report.
+ *
+ * @param focusPoint
+ * the focus point
+ * @param eclipseEnvironment
+ * the eclipse environment
+ * @param globalSettings
+ * the global settings
+ */
+ protected UsageReport(IFocusPoint focusPoint, IJBossToolsEclipseEnvironment eclipseEnvironment,
+ GlobalUsageSettings globalSettings) {
+ this.eclipseEnvironment = eclipseEnvironment;
+ this.focusPoint = focusPoint;
+ this.globalSettings = globalSettings;
+ }
+
+ /**
+ * Reports the usage of this eclipse/jboss tools instance.
+ */
public void report() {
new ReportingJob().schedule();
}
+ protected boolean isReportingGloballyEnabled() {
+ return globalSettings.isReportingEnabled();
+ }
+
+ /**
+ * Asks the user is he allows us to report usage. Opens a dialog for this
+ * sake.
+ */
private void askUser() {
- UsageReportEnablementDialog dialog = new UsageReportEnablementDialog(
- true,
- PlatformUI.getWorkbench().getActiveWorkbenchWindow());
- if (dialog.open() == Window.OK) {
- UsageReportPreferences.setEnabled(dialog.isReportEnabled());
+ Boolean isEnabled = askUserForEnablement();
+ if (isEnabled != null) {
+ UsageReportPreferences.setEnabled(isEnabled);
UsageReportPreferences.setAskUser(false);
flushPreferences();
}
}
+ /**
+ * Checks reporting shall ask the user (which is the case if this was never
+ * done before. Asking user shall only be done once per eclipse
+ * installation)
+ *
+ * @return true, if is ask user
+ */
+ protected boolean isAskUser() {
+ return UsageReportPreferences.isAskUser();
+ }
+
+ /**
+ * Asks the user if he allows us to report.
+ *
+ * @return the boolean
+ */
+ protected Boolean askUserForEnablement() {
+ final Boolean[] userResponse = new Boolean[1];
+ Display.getDefault().syncExec(new Runnable() {
+
+ public void run() {
+ UsageReportEnablementDialog dialog =
+ new UsageReportEnablementDialog(true, PlatformUI.getWorkbench().getActiveWorkbenchWindow(),
+ JBossToolsUsageActivator.getDefault().getUsageBranding());
+ if (dialog.open() == Window.OK) {
+ userResponse[0] = dialog.isReportEnabled();
+ } else {
+ userResponse[0] = null;
+ }
+ }
+ });
+ return userResponse[0];
+ }
+
private void flushPreferences() {
try {
UsageReportPreferences.flush();
@@ -85,7 +153,7 @@
* Reports the usage of the current JBoss Tools / JBoss Developer Studio
* installation.
*/
- private void doReport() {
+ protected void doReport() {
if (UsageReportPreferences.isEnabled()) {
IURLBuildingStrategy urlBuildingStrategy = new GoogleAnalyticsUrlStrategy(eclipseEnvironment);
ITracker tracker = new Tracker(
@@ -97,6 +165,7 @@
}
private class ReportingJob extends Job {
+
private ReportingJob() {
super(ReportingMessages.UsageReport_Reporting_Usage);
}
@@ -107,71 +176,22 @@
return Status.CANCEL_STATUS;
}
monitor.beginTask(ReportingMessages.UsageReport_Querying_Enablement, 2);
- if (globalSettings.isReportingEnabled()) {
+ if (isReportingGloballyEnabled()) {
if (monitor.isCanceled()) {
return Status.CANCEL_STATUS;
}
monitor.worked(1);
- if (UsageReportPreferences.isAskUser()) {
+ if (isAskUser()) {
if (monitor.isCanceled()) {
return Status.CANCEL_STATUS;
}
- askUserAndReport();
- } else {
- if (monitor.isCanceled()) {
- return Status.CANCEL_STATUS;
- }
- doReport();
+ askUser();
}
+ doReport();
monitor.worked(2);
monitor.done();
}
return Status.OK_STATUS;
}
-
- private void askUserAndReport() {
- Job askUserJob = new AskUserJob();
- askUserJob.addJobChangeListener(new IJobChangeListener() {
-
- public void sleeping(IJobChangeEvent event) {
- // ignore
- }
-
- public void scheduled(IJobChangeEvent event) {
- // ignore
- }
-
- public void running(IJobChangeEvent event) {
- // ignore
- }
-
- public void done(IJobChangeEvent event) {
- doReport();
- }
-
- public void awake(IJobChangeEvent event) {
- // ignore
- }
-
- public void aboutToRun(IJobChangeEvent event) {
- // ignore
- }
- });
- askUserJob.setUser(true);
- askUserJob.setPriority(Job.SHORT);
- askUserJob.schedule();
- }
}
-
- private class AskUserJob extends UIJob {
- private AskUserJob() {
- super(ReportingMessages.UsageReport_Asking_User);
- }
-
- @Override
- public IStatus runInUIThread(IProgressMonitor monitor) {
- askUser();
- return Status.OK_STATUS;
- }
- }
}
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReportEnablementDialog.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReportEnablementDialog.java 2010-11-30 16:02:52 UTC (rev 27027)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReportEnablementDialog.java 2010-11-30 16:14:44 UTC (rev 27028)
@@ -35,10 +35,10 @@
private boolean reportEnabled;
private IUsageBranding branding;
- public UsageReportEnablementDialog(boolean reportEnabled, IShellProvider parentShell) {
+ public UsageReportEnablementDialog(boolean reportEnabled, IShellProvider parentShell, IUsageBranding branding) {
super(parentShell);
this.reportEnabled = reportEnabled;
- this.branding = JBossToolsUsageActivator.getDefault().getUsageBranding();
+ this.branding = branding;
}
protected void buttonPressed(int buttonId) {
Added: trunk/usage/tests/org.jboss.tools.usage.test/EclipseEnvironmentTest.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/EclipseEnvironmentTest.launch (rev 0)
+++ trunk/usage/tests/org.jboss.tools.usage.test/EclipseEnvironmentTest.launch 2010-11-30 16:14:44 UTC (rev 27028)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
+<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="true"/>
+<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/EclipseEnvironmentTest.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.run"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+</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.MAIN_TYPE" value="org.jboss.tools.usage.test.EclipseEnvironmentTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.usage.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="false"/>
+</launchConfiguration>
Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/EclipseEnvironmentTest.launch
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/usage/tests/org.jboss.tools.usage.test/JBoss Tools Usage Reporter.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/JBoss Tools Usage Reporter.launch 2010-11-30 16:02:52 UTC (rev 27027)
+++ trunk/usage/tests/org.jboss.tools.usage.test/JBoss Tools Usage Reporter.launch 2010-11-30 16:14:44 UTC (rev 27028)
@@ -7,13 +7,13 @@
<stringAttribute key="bootstrap" value=""/>
<stringAttribute key="checked" value="[NONE]"/>
<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearws" value="false"/>
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBoss Tools Usage Reporter"/>
<booleanAttribute key="default" value="false"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.mozilla.xulrunner.cocoa.macosx,org.mozilla.xulrunner.gtk.linux.x86_64,org.mozilla.xulrunner.win32.win32.x86,com.jboss.jbds.usage.branding,org.jboss.tools.usage.test,org.mozilla.xulrunner.gtk.linux.x86,org.mozilla.xulrunner.carbon.macosx,org.mozilla.xpcom,org.jboss.tools.tests"/>
+<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.tests,org.jboss.tools.usage.test,com.jboss.jbds.usage.branding"/>
<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../runtime-New_configuration(1)"/>
+<stringAttribute key="location" value="${workspace_loc}/../runtime-usage"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
@@ -23,8 +23,8 @@
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx1024m"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.ui@default:default,org.apache.lucene.analysis@default:default,org.eclipse.search@default:default,org.eclipse.ant.core@default:default,org.apache.xml.resolver@default:default,org.eclipse.jface.text@default:default,org.eclipse.help.ui@default:default,org.apache.ant@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.core.expressions@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.xml.core@default:default,com.ibm.icu@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.ec!
lipse.jdt.compiler.tool@default:false,org.eclipse.equinox.security@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.wst.validation@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.emf.ecore.change@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.compare@default:default,org.eclipse.wst.common.uriresolver@default:default,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.wst.sse.core@default:default,org.eclipse.equinox.common@2:true,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.team.core@default:defa!
ult,org.eclipse.osgi@-1:true,org.eclipse.wst.common.emf@defaul!
t:defaul
t,org.eclipse.core.databinding.property@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.mortbay.jetty.server@default:default,org.eclipse.update.configurator@3:true,org.apache.jasper@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.core.resources@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.team.ui@default:default,org.eclipse.ui.editors@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.rse.core@default:default,org.eclipse.jem.util@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.help.base@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.ecf@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.equinox.app@default:default,org.mortbay.jetty.util@default:default,org.apache.xerces@default:default,or!
g.eclipse.ui.console@default:default,org.eclipse.ui.ide@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.equinox.p2.repository@default:default,javax.servlet@default:default,org.hamcrest.core@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.junit4@default:default,org.apache.lucene@default:default,org.eclipse.ui.views@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.ds@default:true,org.eclipse.emf.ecore@default:default,org.eclipse.emf.ecore.xmi@default:default,org.projectusus.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.osgi.util@default:default,org.eclipse.!
help@default:default,org.eclipse.jface@default:default,org.ecl!
ipse.ecf
.ssl@default:false,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.osgi.services@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.jdt.compiler.apt@default:false,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.core.databinding@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.text@default:default,org.eclipse.equinox.util@default:default,org.eclipse.compare.core@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.equinox.preferences@default:default,org.eclipse.jdt.core@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.debug.core@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.core.variables@default:default,org.eclipse.jdt.launching@default:def!
ault,org.eclipse.rse.services@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.core.filesystem@default:default,javax.xml@default:default,org.eclipse.debug.ui@default:default,javax.servlet.jsp@default:default,org.eclipse.swt@default:default,org.eclipse.emf.common@default:default,org.eclipse.core.net@default:default,org.apache.commons.el@default:default,org.eclipse.equinox.http.jetty@default:default,org.apache.xml.serializer@default:default,org.eclipse.sdk@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false"/>
-<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.deltacloud.test@default:default,org.jruby.jruby@default:default,org.jboss.tools.usage@default:default,org.eclipse.epp.usagedata.ui@default:default,org.jboss.tools.deltacloud.core@default:default,org.eclipse.epp.usagedata.recording@default:default,org.jboss.tools.common@default:default,org.eclipse.epp.usagedata.gathering@default:default,org.jboss.tools.deltacloud.docs@default:default,org.jboss.tools.deltacloud.ui@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.core.databinding.beans@default:default,org.eclipse.ecf@default:default,org.mortbay.jetty.server@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.resources@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.wst.xml.core@default:default,javax.xml@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.ds@default:true,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.core.net.linux.x86_64@default:false,org.junit4@default:default,org.eclipse.swt@default:default,org.eclipse.help.ui@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.core.variables@default:default,org.eclipse.ui.workbench@default:default,org.apache.xerces@defaul!
t:default,org.eclipse.compare.core@default:default,org.eclipse.help.base@default:default,org.eclipse.osgi.util@default:default,org.eclipse.debug.core@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.equinox.common@2:true,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.apache.xml.resolver@default:default,org.eclipse.core.net@default:default,javax.servlet@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.compare@default:default,org.projectusus.core@default:default,org.eclipse.ui.intro@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.jface@default:default,org.eclipse.update.configurator@3:true,org.eclipse.emf.ecore.xmi@default:default,org.apache.ant@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ui.forms@!
default:default,org.eclipse.equinox.p2.metadata.repository@def!
ault:def
ault,org.eclipse.ui.views@default:default,org.eclipse.emf.common@default:default,com.ibm.icu@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jface.text@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.databinding@default:default,org.eclipse.emf.edit@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.rse.core@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.equinox.http.servlet@default:default,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.core.contenttype@default:default,org.apache.xml.serializer@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.equinox.app@default:default,org.apache.lucene@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.security@default:default,org.apache.jasper@default:default,org.eclipse.ui.views.properties.!
tabbed@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ant.core@default:default,org.eclipse.help@default:default,org.eclipse.sdk@default:default,org.eclipse.team.core@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.core.databinding.property@default:default,org.eclipse.wst.validation@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.jem.util@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.team.ui@default:default,org.eclipse.search@default:default,org.apache.commons.el@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.apache.lucene.analysis@default:default,org.eclipse.jdt.core@d!
efault:default,org.eclipse.debug.ui@default:default,org.eclips!
e.wst.co
mmon.environment@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.core.commands@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.util@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.rse.services@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.ui@default:default,org.eclipse.osgi@-1:true,org.eclipse.ui.ide.application@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.ui.console@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.debug@default:default,org.eclipse.core.jobs@default:default,javax.servlet.jsp@default:default,org.mortbay.jetty.util@default:default,org.eclipse.ws!
t.common.emfworkbench.integration@default:default,org.eclipse.text@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.runtime@default:true,org.hamcrest.core@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.jdt.core.manipulation@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.runtime.compatibility@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.deltacloud.ui@default:default,org.eclipse.epp.usagedata.gathering@default:default,org.jboss.tools.deltacloud.docs@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.common@default:default,org.jboss.tools.deltacloud.test@default:default,org.eclipse.epp.usagedata.recording@default:default,org.eclipse.epp.usagedata.ui@default:default,org.jboss.tools.usage@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
<booleanAttribute key="tracing" value="true"/>
Deleted: trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsEclipseEnvironmentTest.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsEclipseEnvironmentTest.launch 2010-11-30 16:02:52 UTC (rev 27027)
+++ trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsEclipseEnvironmentTest.launch 2010-11-30 16:14:44 UTC (rev 27028)
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<booleanAttribute key="append.args" value="true"/>
-<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
-<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="true"/>
-<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/JBossToolsEclipseEnvironmentTest.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.run"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-</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.MAIN_TYPE" value="org.jboss.tools.usage.test.JBossToolsEclipseEnvironmentTest"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.usage.test"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
-<booleanAttribute key="run_in_ui_thread" value="true"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="false"/>
-</launchConfiguration>
Deleted: trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageIntegrationTest.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageIntegrationTest.launch 2010-11-30 16:02:52 UTC (rev 27027)
+++ trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageIntegrationTest.launch 2010-11-30 16:14:44 UTC (rev 27028)
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<setAttribute key="additional_plugins"/>
-<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="false"/>
-<booleanAttribute key="clearws" value="false"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBossToolsUsageIntegrationTest"/>
-<booleanAttribute key="default" value="true"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.gwt.ui,org.jboss.tools.gwt.core,org.jboss.tools.common"/>
-<stringAttribute key="featureDefaultLocation" value="workspace"/>
-<stringAttribute key="featurePluginResolution" value="workspace"/>
-<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/JBossToolsUsageIntegrationTest.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.run"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-</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.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.usage.test.JBossToolsUsageIntegrationTest"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consolelog"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.usage.test"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="com.jboss.jbds.product.product"/>
-<booleanAttribute key="run_in_ui_thread" value="true"/>
-<setAttribute key="selected_features">
-<setEntry value="com.atlassian.connector.commons:default"/>
-<setEntry value="com.atlassian.connector.eclipse.commons:default"/>
-<setEntry value="com.atlassian.connector.eclipse.crucible:default"/>
-<setEntry value="com.atlassian.connector.eclipse.jira:default"/>
-<setEntry value="com.atlassian.connector.eclipse.monitor:default"/>
-<setEntry value="com.atlassian.connector.eclipse.subversive:default"/>
-<setEntry value="com.atlassian.connector.eclipse:default"/>
-<setEntry value="com.google.gdt.eclipse.suite.e36.feature:default"/>
-<setEntry value="com.google.gwt.eclipse.sdkbundle.e36.feature.2.0.4:default"/>
-<setEntry value="com.instantiations.css.feature:default"/>
-<setEntry value="com.instantiations.designer.core.feature:default"/>
-<setEntry value="com.instantiations.designer.core.xml.feature:default"/>
-<setEntry value="com.instantiations.designer.gwt.feature:default"/>
-<setEntry value="com.instantiations.designer.gwtcore.feature:default"/>
-<setEntry value="com.instantiations.eclipse.shared:default"/>
-<setEntry value="com.instantiations.eclipse.ui:default"/>
-<setEntry value="net.sf.jautodoc.feature:default"/>
-<setEntry value="org.eclipse.cvs.source:default"/>
-<setEntry value="org.eclipse.emf.cdo.epp:default"/>
-<setEntry value="org.eclipse.emf.cdo.server:default"/>
-<setEntry value="org.eclipse.emf.cdo:default"/>
-<setEntry value="org.eclipse.equinox.p2.user.ui.source:default"/>
-<setEntry value="org.eclipse.help.source:default"/>
-<setEntry value="org.eclipse.jdt.source:default"/>
-<setEntry value="org.eclipse.jsf.feature.source:default"/>
-<setEntry value="org.eclipse.jsf_sdk.feature:default"/>
-<setEntry value="org.eclipse.jst.enterprise_core.feature.source:default"/>
-<setEntry value="org.eclipse.jst.enterprise_sdk.feature:default"/>
-<setEntry value="org.eclipse.jst.enterprise_ui.feature.source:default"/>
-<setEntry value="org.eclipse.jst.web_core.feature:default"/>
-<setEntry value="org.eclipse.jst.web_ui.feature:default"/>
-<setEntry value="org.eclipse.jst.webpageeditor.feature.source:default"/>
-<setEntry value="org.eclipse.jst.webpageeditor_sdk.feature:default"/>
-<setEntry value="org.eclipse.jst.ws.jaxws.dom.feature.source:default"/>
-<setEntry value="org.eclipse.jst.ws.jaxws.dom_sdk.feature:default"/>
-<setEntry value="org.eclipse.jst.ws.jaxws.feature.source:default"/>
-<setEntry value="org.eclipse.jst.ws.jaxws_sdk.feature:default"/>
-<setEntry value="org.eclipse.mylyn.commons:default"/>
-<setEntry value="org.eclipse.mylyn.jira_feature:default"/>
-<setEntry value="org.eclipse.mylyn.pde_feature:default"/>
-<setEntry value="org.eclipse.mylyn.wikitext.sdk:default"/>
-<setEntry value="org.eclipse.net4j.db.derby:default"/>
-<setEntry value="org.eclipse.net4j.db.h2:default"/>
-<setEntry value="org.eclipse.net4j.db:default"/>
-<setEntry value="org.eclipse.net4j:default"/>
-<setEntry value="org.eclipse.pde.source:default"/>
-<setEntry value="org.eclipse.platform.source:default"/>
-<setEntry value="org.eclipse.rcp.source:default"/>
-<setEntry value="org.eclipse.sdk:default"/>
-<setEntry value="org.eclipse.swtbot.eclipse.gef:default"/>
-<setEntry value="org.eclipse.swtbot.eclipse.test.junit3:default"/>
-<setEntry value="org.eclipse.swtbot.eclipse.test.junit4:default"/>
-<setEntry value="org.eclipse.swtbot.eclipse:default"/>
-<setEntry value="org.eclipse.swtbot.ide:default"/>
-<setEntry value="org.eclipse.swtbot:default"/>
-<setEntry value="org.eclipse.team.svn.mylyn:default"/>
-<setEntry value="org.eclipse.wst.common.fproj.sdk:default"/>
-<setEntry value="org.eclipse.wst.common.fproj:default"/>
-<setEntry value="org.eclipse.wst.common_core.feature.source:default"/>
-<setEntry value="org.eclipse.wst.common_core.feature:default"/>
-<setEntry value="org.eclipse.wst.common_sdk.feature:default"/>
-<setEntry value="org.eclipse.wst.common_ui.feature.source:default"/>
-<setEntry value="org.eclipse.wst.common_ui.feature:default"/>
-<setEntry value="org.eclipse.wst.jsdt.feature.source:default"/>
-<setEntry value="org.eclipse.wst.jsdt.feature:default"/>
-<setEntry value="org.eclipse.wst.jsdt_sdk.feature:default"/>
-<setEntry value="org.eclipse.wst.server_adapters.feature.source:default"/>
-<setEntry value="org.eclipse.wst.server_adapters.sdk.feature:default"/>
-<setEntry value="org.eclipse.wst.server_core.feature.source:default"/>
-<setEntry value="org.eclipse.wst.server_core.feature:default"/>
-<setEntry value="org.eclipse.wst.server_sdk.feature:default"/>
-<setEntry value="org.eclipse.wst.server_ui.feature.source:default"/>
-<setEntry value="org.eclipse.wst.server_ui.feature:default"/>
-<setEntry value="org.eclipse.wst.web_core.feature.source:default"/>
-<setEntry value="org.eclipse.wst.web_core.feature:default"/>
-<setEntry value="org.eclipse.wst.web_sdk.feature:default"/>
-<setEntry value="org.eclipse.wst.web_ui.feature.source:default"/>
-<setEntry value="org.eclipse.wst.web_ui.feature:default"/>
-<setEntry value="org.eclipse.wst.ws_core.feature:default"/>
-<setEntry value="org.eclipse.wst.ws_ui.feature:default"/>
-<setEntry value="org.eclipse.wst.ws_userdoc.feature:default"/>
-<setEntry value="org.eclipse.wst.xml_core.feature.source:default"/>
-<setEntry value="org.eclipse.wst.xml_core.feature:default"/>
-<setEntry value="org.eclipse.wst.xml_sdk.feature:default"/>
-<setEntry value="org.eclipse.wst.xml_ui.feature.source:default"/>
-<setEntry value="org.eclipse.wst.xml_ui.feature:default"/>
-<setEntry value="org.eclipse.wst.xsl.feature.source:default"/>
-<setEntry value="org.eclipse.wst.xsl_sdk.feature:default"/>
-<setEntry value="org.hibernate.eclipse.feature:default"/>
-<setEntry value="org.jboss.ide.eclipse.as.feature:default"/>
-<setEntry value="org.jboss.tools.gwt.feature:default"/>
-<setEntry value="org.jboss.tools.seam.feature:default"/>
-<setEntry value="org.jboss.tools.usage.feature:default"/>
-</setAttribute>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.osgi.services@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.swt@default:default,org.eclipse.core.databinding.observable@default:default,org.junit4@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.databinding@default:default,com.ibm.icu@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.common@2:true,org.eclipse.ui@default:default,org.hamcrest.core@default:default,org.eclipse.help@default:default,org.eclipse.osgi@-1:true,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.expressions@default:default,javax.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.swt.cocoa.macosx.x86_64!
@default:false,org.eclipse.jface.databinding@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.jface@default:default,org.eclipse.equinox.app@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="com.jboss.jbds.usage@default:default,org.jboss.tools.usage.fragment@default:false,com.jboss.jbds.usage.fragment@default:false,org.jboss.tools.usage.test@default:default,org.jboss.tools.usage@default:default"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="false"/>
-</launchConfiguration>
Added: trunk/usage/tests/org.jboss.tools.usage.test/UsageIntegrationTest.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/UsageIntegrationTest.launch (rev 0)
+++ trunk/usage/tests/org.jboss.tools.usage.test/UsageIntegrationTest.launch 2010-11-30 16:14:44 UTC (rev 27028)
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<setAttribute key="additional_plugins"/>
+<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="false"/>
+<booleanAttribute key="clearws" value="false"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBossToolsUsageIntegrationTest"/>
+<booleanAttribute key="default" value="true"/>
+<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.gwt.ui,org.jboss.tools.gwt.core,org.jboss.tools.common"/>
+<stringAttribute key="featureDefaultLocation" value="workspace"/>
+<stringAttribute key="featurePluginResolution" value="workspace"/>
+<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/UsageIntegrationTest.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.run"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+</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.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.usage.test.UsageIntegrationTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consolelog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.usage.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="com.jboss.jbds.product.product"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<setAttribute key="selected_features">
+<setEntry value="com.atlassian.connector.commons:default"/>
+<setEntry value="com.atlassian.connector.eclipse.commons:default"/>
+<setEntry value="com.atlassian.connector.eclipse.crucible:default"/>
+<setEntry value="com.atlassian.connector.eclipse.jira:default"/>
+<setEntry value="com.atlassian.connector.eclipse.monitor:default"/>
+<setEntry value="com.atlassian.connector.eclipse.subversive:default"/>
+<setEntry value="com.atlassian.connector.eclipse:default"/>
+<setEntry value="com.google.gdt.eclipse.suite.e36.feature:default"/>
+<setEntry value="com.google.gwt.eclipse.sdkbundle.e36.feature.2.0.4:default"/>
+<setEntry value="com.instantiations.css.feature:default"/>
+<setEntry value="com.instantiations.designer.core.feature:default"/>
+<setEntry value="com.instantiations.designer.core.xml.feature:default"/>
+<setEntry value="com.instantiations.designer.gwt.feature:default"/>
+<setEntry value="com.instantiations.designer.gwtcore.feature:default"/>
+<setEntry value="com.instantiations.eclipse.shared:default"/>
+<setEntry value="com.instantiations.eclipse.ui:default"/>
+<setEntry value="net.sf.jautodoc.feature:default"/>
+<setEntry value="org.eclipse.cvs.source:default"/>
+<setEntry value="org.eclipse.emf.cdo.epp:default"/>
+<setEntry value="org.eclipse.emf.cdo.server:default"/>
+<setEntry value="org.eclipse.emf.cdo:default"/>
+<setEntry value="org.eclipse.equinox.p2.user.ui.source:default"/>
+<setEntry value="org.eclipse.help.source:default"/>
+<setEntry value="org.eclipse.jdt.source:default"/>
+<setEntry value="org.eclipse.jsf.feature.source:default"/>
+<setEntry value="org.eclipse.jsf_sdk.feature:default"/>
+<setEntry value="org.eclipse.jst.enterprise_core.feature.source:default"/>
+<setEntry value="org.eclipse.jst.enterprise_sdk.feature:default"/>
+<setEntry value="org.eclipse.jst.enterprise_ui.feature.source:default"/>
+<setEntry value="org.eclipse.jst.web_core.feature:default"/>
+<setEntry value="org.eclipse.jst.web_ui.feature:default"/>
+<setEntry value="org.eclipse.jst.webpageeditor.feature.source:default"/>
+<setEntry value="org.eclipse.jst.webpageeditor_sdk.feature:default"/>
+<setEntry value="org.eclipse.jst.ws.jaxws.dom.feature.source:default"/>
+<setEntry value="org.eclipse.jst.ws.jaxws.dom_sdk.feature:default"/>
+<setEntry value="org.eclipse.jst.ws.jaxws.feature.source:default"/>
+<setEntry value="org.eclipse.jst.ws.jaxws_sdk.feature:default"/>
+<setEntry value="org.eclipse.mylyn.commons:default"/>
+<setEntry value="org.eclipse.mylyn.jira_feature:default"/>
+<setEntry value="org.eclipse.mylyn.pde_feature:default"/>
+<setEntry value="org.eclipse.mylyn.wikitext.sdk:default"/>
+<setEntry value="org.eclipse.net4j.db.derby:default"/>
+<setEntry value="org.eclipse.net4j.db.h2:default"/>
+<setEntry value="org.eclipse.net4j.db:default"/>
+<setEntry value="org.eclipse.net4j:default"/>
+<setEntry value="org.eclipse.pde.source:default"/>
+<setEntry value="org.eclipse.platform.source:default"/>
+<setEntry value="org.eclipse.rcp.source:default"/>
+<setEntry value="org.eclipse.sdk:default"/>
+<setEntry value="org.eclipse.swtbot.eclipse.gef:default"/>
+<setEntry value="org.eclipse.swtbot.eclipse.test.junit3:default"/>
+<setEntry value="org.eclipse.swtbot.eclipse.test.junit4:default"/>
+<setEntry value="org.eclipse.swtbot.eclipse:default"/>
+<setEntry value="org.eclipse.swtbot.ide:default"/>
+<setEntry value="org.eclipse.swtbot:default"/>
+<setEntry value="org.eclipse.team.svn.mylyn:default"/>
+<setEntry value="org.eclipse.wst.common.fproj.sdk:default"/>
+<setEntry value="org.eclipse.wst.common.fproj:default"/>
+<setEntry value="org.eclipse.wst.common_core.feature.source:default"/>
+<setEntry value="org.eclipse.wst.common_core.feature:default"/>
+<setEntry value="org.eclipse.wst.common_sdk.feature:default"/>
+<setEntry value="org.eclipse.wst.common_ui.feature.source:default"/>
+<setEntry value="org.eclipse.wst.common_ui.feature:default"/>
+<setEntry value="org.eclipse.wst.jsdt.feature.source:default"/>
+<setEntry value="org.eclipse.wst.jsdt.feature:default"/>
+<setEntry value="org.eclipse.wst.jsdt_sdk.feature:default"/>
+<setEntry value="org.eclipse.wst.server_adapters.feature.source:default"/>
+<setEntry value="org.eclipse.wst.server_adapters.sdk.feature:default"/>
+<setEntry value="org.eclipse.wst.server_core.feature.source:default"/>
+<setEntry value="org.eclipse.wst.server_core.feature:default"/>
+<setEntry value="org.eclipse.wst.server_sdk.feature:default"/>
+<setEntry value="org.eclipse.wst.server_ui.feature.source:default"/>
+<setEntry value="org.eclipse.wst.server_ui.feature:default"/>
+<setEntry value="org.eclipse.wst.web_core.feature.source:default"/>
+<setEntry value="org.eclipse.wst.web_core.feature:default"/>
+<setEntry value="org.eclipse.wst.web_sdk.feature:default"/>
+<setEntry value="org.eclipse.wst.web_ui.feature.source:default"/>
+<setEntry value="org.eclipse.wst.web_ui.feature:default"/>
+<setEntry value="org.eclipse.wst.ws_core.feature:default"/>
+<setEntry value="org.eclipse.wst.ws_ui.feature:default"/>
+<setEntry value="org.eclipse.wst.ws_userdoc.feature:default"/>
+<setEntry value="org.eclipse.wst.xml_core.feature.source:default"/>
+<setEntry value="org.eclipse.wst.xml_core.feature:default"/>
+<setEntry value="org.eclipse.wst.xml_sdk.feature:default"/>
+<setEntry value="org.eclipse.wst.xml_ui.feature.source:default"/>
+<setEntry value="org.eclipse.wst.xml_ui.feature:default"/>
+<setEntry value="org.eclipse.wst.xsl.feature.source:default"/>
+<setEntry value="org.eclipse.wst.xsl_sdk.feature:default"/>
+<setEntry value="org.hibernate.eclipse.feature:default"/>
+<setEntry value="org.jboss.ide.eclipse.as.feature:default"/>
+<setEntry value="org.jboss.tools.gwt.feature:default"/>
+<setEntry value="org.jboss.tools.seam.feature:default"/>
+<setEntry value="org.jboss.tools.usage.feature:default"/>
+</setAttribute>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.osgi.services@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.swt@default:default,org.eclipse.core.databinding.observable@default:default,org.junit4@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.databinding@default:default,com.ibm.icu@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.common@2:true,org.eclipse.ui@default:default,org.hamcrest.core@default:default,org.eclipse.help@default:default,org.eclipse.osgi@-1:true,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.expressions@default:default,javax.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.swt.cocoa.macosx.x86_64!
@default:false,org.eclipse.jface.databinding@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.jface@default:default,org.eclipse.equinox.app@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="com.jboss.jbds.usage@default:default,org.jboss.tools.usage.fragment@default:false,com.jboss.jbds.usage.fragment@default:false,org.jboss.tools.usage.test@default:default,org.jboss.tools.usage@default:default"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="true"/>
+<booleanAttribute key="useProduct" value="false"/>
+</launchConfiguration>
Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/UsageIntegrationTest.launch
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/usage/tests/org.jboss.tools.usage.test/UsageReportIntegrationTest.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/UsageReportIntegrationTest.launch (rev 0)
+++ trunk/usage/tests/org.jboss.tools.usage.test/UsageReportIntegrationTest.launch 2010-11-30 16:14:44 UTC (rev 27028)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
+<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"/>
+<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.epp.usagedata.recording,org.jboss.tools.deltacloud.core,org.eclipse.epp.usagedata.ui,org.eclipse.epp.usagedata.gathering,org.jboss.tools.deltacloud.docs,org.jboss.tools.tests,org.jboss.tools.deltacloud.ui,org.jboss.tools.deltacloud.test,com.jboss.jbds.usage.branding"/>
+<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/UsageReportIntegrationTest.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.run"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+</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.MAIN_TYPE" value="org.jboss.tools.usage.test.UsageReportIntegrationTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.usage.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx1024m"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.ecf@default:default,org.mortbay.jetty.server@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.resources@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.wst.xml.core@default:default,javax.xml@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.osgi.services@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.core.net.linux.x86_64@default:false,org.junit4@default:default,org.eclipse.swt@default:default,org.eclipse.help.ui@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.core.variables@default:default,org.eclipse.ui.workbench@default:default,org.apache.xerces@default:default,org.eclipse.compare.core@default:default,org.eclipse.help.base@default:default,org.eclipse.osgi.util@default:default,org.ecl!
ipse.debug.core@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.equinox.common@2:true,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.apache.xml.resolver@default:default,org.eclipse.core.net@default:default,javax.servlet@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.compare@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.jface@default:default,org.eclipse.update.configurator@3:true,org.eclipse.emf.ecore.xmi@default:default,org.apache.ant@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ui.forms@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ui.views@default:default,org.eclipse.emf.common@default:default,com.ibm.icu@default:default,org.eclipse.jface.text@defaul!
t:default,org.eclipse.equinox.p2.metadata@default:default,org.!
eclipse.
core.databinding@default:default,org.eclipse.emf.edit@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.equinox.http.servlet@default:default,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.core.contenttype@default:default,org.apache.xml.serializer@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.equinox.app@default:default,org.apache.lucene@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.security@default:default,org.apache.jasper@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ant.core@default:default,org.eclipse.help@default:default,org.eclipse.sdk@default:default,org.eclipse.team.core@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.co!
re.databinding.property@default:default,org.eclipse.wst.validation@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.jem.util@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.team.ui@default:default,org.eclipse.search@default:default,org.apache.commons.el@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.apache.lucene.analysis@default:default,org.eclipse.jdt.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.core.commands@de!
fault:default,org.eclipse.emf.ecore@default:default,org.eclips!
e.equino
x.http.jetty@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.ui@default:default,org.eclipse.osgi@-1:true,org.eclipse.ui.ide.application@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.ui.console@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.debug@default:default,org.eclipse.core.jobs@default:default,javax.servlet.jsp@default:default,org.mortbay.jetty.util@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.text@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.runtime@default:true,org.hamcrest.core@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.jdt.core.manipulati!
on@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.runtime.compatibility@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test@default:default,org.jboss.tools.common@default:default,org.jboss.tools.usage@default:default"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="false"/>
+</launchConfiguration>
Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/UsageReportIntegrationTest.launch
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/usage/tests/org.jboss.tools.usage.test/UsageTestSuite.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/UsageTestSuite.launch 2010-11-30 16:02:52 UTC (rev 27027)
+++ trunk/usage/tests/org.jboss.tools.usage.test/UsageTestSuite.launch 2010-11-30 16:14:44 UTC (rev 27028)
@@ -12,7 +12,7 @@
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
<booleanAttribute key="default" value="false"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.epp.usagedata.recording,org.jboss.tools.deltacloud.core,org.eclipse.epp.usagedata.gathering,org.mozilla.xulrunner.cocoa.macosx,org.jboss.tools.deltacloud.docs,org.mozilla.xulrunner.gtk.linux.x86_64,org.jboss.tools.deltacloud.test,org.mozilla.xulrunner.win32.win32.x86,com.jboss.jbds.usage.branding,org.mozilla.xulrunner.gtk.linux.x86,org.eclipse.epp.usagedata.ui,org.mozilla.xulrunner.carbon.macosx,org.mozilla.xpcom,org.jboss.tools.deltacloud.ui,org.jboss.tools.tests,org.jruby.jruby"/>
+<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.epp.usagedata.recording,org.jboss.tools.deltacloud.core,org.eclipse.epp.usagedata.ui,org.eclipse.epp.usagedata.gathering,org.jboss.tools.deltacloud.docs,org.jboss.tools.tests,org.jboss.tools.deltacloud.ui,org.jboss.tools.deltacloud.test,com.jboss.jbds.usage.branding"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
@@ -38,8 +38,8 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="com.jboss.jbds.product.product"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.swt@default:default,org.eclipse.jface@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.core.net@default:default,org.eclipse.core.expressions@default:default,org.eclipse.osgi.util@default:default,org.eclipse.equinox.p2.metadata@default:default,org.hamcrest.core@default:default,org.eclipse.wst.common.emf@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.text@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.emf.common@default:default,org.eclipse.core.jobs@default:default,org.eclipse.help@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.compare@default:default,org.eclipse.ui.workbench.texteditor@default:def!
ault,org.eclipse.wst.validation@default:default,org.eclipse.jface.text@default:default,org.eclipse.jdt.compiler.apt@default:false,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.equinox.app@default:default,org.eclipse.core.resources@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.osgi.services@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,javax.servlet@default:default,org.eclipse.wst.xml.core@default:default,org.apache.xerces@default:default,org.eclipse.debug.core@default:default,org.eclipse.emf.edit@default:default,org.eclipse.ui@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.osgi,org.eclipse.compare.core@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.emf.ecore.change@default:default,com.instantia!
tions.designer.jdt.fragment@default:false,org.eclipse.wst.comm!
on.urire
solver@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.variables@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.ecf@default:default,org.eclipse.ant.core@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.team.ui@default:default,org.eclipse.ui.views@default:default,org.apache.xml.resolver@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.jdt.core@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,com.ibm.icu@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.ui.ide@default:default,org.eclipse.equinox.security@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.core.contenttype@default:default,javax.xml@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.ui.forms@default:def!
ault,org.eclipse.jface.databinding@default:default,org.eclipse.search@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ui.editors@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.common@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.core.commands@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.debug.ui@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.ui.console@default:default,org.eclipse.core.databinding.observable@default:default,org.junit4@default:default,org.eclipse.emf.ecore@default:defau!
lt,org.eclipse.jem.util@default:default,org.eclipse.wst.sse.co!
re@defau
lt:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.jdt.debug@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.team.core@default:default,org.apache.xml.serializer@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.wst.common.environment@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.common@default:default,org.jboss.tools.usage.test@default:default,org.jboss.tools.usage@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.ecf@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.resources@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.wst.xml.core@default:default,javax.xml@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.osgi.services@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.core.net.linux.x86_64@default:false,org.junit4@default:default,org.eclipse.swt@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.core.variables@default:default,org.eclipse.ui.workbench@default:default,org.apache.xerces@default:default,org.eclipse.compare.core@default:default,org.eclipse.osgi.util@default:default,org.eclipse.debug.core@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.equinox.common@2:true,org.apac!
he.commons.logging*1.0.4.v201005080501@default:default,org.apache.xml.resolver@default:default,org.eclipse.core.net@default:default,javax.servlet@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.compare@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.jface@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ui.forms@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ui.views@default:default,org.eclipse.emf.common@default:default,com.ibm.icu@default:default,org.eclipse.jface.text@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.databinding@default:default,org.eclipse.emf.edit@default:default,org.eclipse.jdt.ui@default:default,org.eclips!
e.ltk.ui.refactoring@default:default,com.instantiations.design!
er.jdt.f
ragment@default:false,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.core.contenttype@default:default,org.apache.xml.serializer@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.equinox.app@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.security@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ant.core@default:default,org.eclipse.help@default:default,org.eclipse.team.core@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.wst.validation@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.jem.util@default:default,org.jbos!
s.tools.xulrunner.initializer@default:false,org.eclipse.team.ui@default:default,org.eclipse.search@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.jdt.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.core.commands@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.ui@default:default,org.eclipse.osgi@-1:true,org.eclipse.ui.console@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.debug@default:default,org.eclipse.core.jobs@default:default,org.eclipse.wst.common.emfworkbench.integration@defaul!
t:default,org.eclipse.text@default:default,org.eclipse.equinox!
.registr
y@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.runtime@default:true,org.hamcrest.core@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.jdt.core.manipulation@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.p2.engine@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test@default:default,org.jboss.tools.common@default:default,org.jboss.tools.usage@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
Deleted: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsEclipseEnvironmentTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsEclipseEnvironmentTest.java 2010-11-30 16:02:52 UTC (rev 27027)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsEclipseEnvironmentTest.java 2010-11-30 16:14:44 UTC (rev 27028)
@@ -1,73 +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.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.runtime.IBundleGroupProvider;
-import org.jboss.tools.usage.googleanalytics.eclipse.AbstractEclipseEnvironment;
-import org.jboss.tools.usage.internal.reporting.JBossToolsComponents;
-import org.jboss.tools.usage.test.fakes.BundleGroupProviderFake;
-import org.jboss.tools.usage.test.fakes.ReportingEclipseEnvironmentFake;
-import org.junit.Test;
-
-/**
- * @author Andre Dietisheim
- */
-public class JBossToolsEclipseEnvironmentTest {
-
- @Test
- public void keywordReportsJbossComponents() {
- AbstractEclipseEnvironment eclipseEnvironment = new ReportingEclipseEnvironmentFake() {
-
- @Override
- protected IBundleGroupProvider[] getBundleGroupProviders() {
- return new IBundleGroupProvider[] {
- new BundleGroupProviderFake(
- "org.jboss.tools.gwt.feature",
- "org.jboss.tools.seam.feature",
- "org.jboss.tools.smooks.feature")
- };
- }
- };
-
- String keyword = eclipseEnvironment.getKeyword();
-
- Matcher matcher = Pattern.compile("(([A-Z]+)-){3}").matcher(keyword);
- assertTrue(matcher.matches());
- assertTrue(keyword.indexOf(JBossToolsComponents.JBossToolsFeatureIdentifiers.GWT.name()) >= 0);
- assertTrue(keyword.indexOf(JBossToolsComponents.JBossToolsFeatureIdentifiers.SEAM.name()) >= 0);
- assertTrue(keyword.indexOf(JBossToolsComponents.JBossToolsFeatureIdentifiers.SMOOKS.name()) >= 0);
- }
-
- @Test
- public void keywordIsEmptyIfNoJBossFeaturesFound() {
- AbstractEclipseEnvironment eclipseEnvironment = new ReportingEclipseEnvironmentFake() {
-
- @Override
- protected IBundleGroupProvider[] getBundleGroupProviders() {
- return new IBundleGroupProvider[] {
- new BundleGroupProviderFake(
- "org.jboss.tools.gwt",
- "org.eclipse.emf.cdo")
- };
- }
- };
-
- String keyword = eclipseEnvironment.getKeyword();
- assertTrue(keyword != null && keyword.length() == 0);
- }
-
-
-}
Deleted: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsFocusPointTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsFocusPointTest.java 2010-11-30 16:02:52 UTC (rev 27027)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsFocusPointTest.java 2010-11-30 16:14:44 UTC (rev 27028)
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.usage.test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import org.jboss.tools.usage.tracker.IFocusPoint;
-import org.jboss.tools.usage.tracker.internal.FocusPoint;
-import org.jboss.tools.usage.tracker.internal.SuffixFocusPoint;
-import org.jboss.tools.usage.util.HttpEncodingUtils;
-import org.junit.Test;
-
-/**
- * @author Andre Dietisheim
- */
-public class JBossToolsFocusPointTest {
-
- private static final String JBOSS_TOOLS_VERSION = "42.0.42";
-
- private static final String ROOT = "root";
-
- private static final String CHILD = "child";
-
- private static final String URI_SEPARATOR_ENCODED = HttpEncodingUtils.checkedEncodeUtf8(FocusPoint.URI_SEPARATOR);
-
- private static final String TITLE_SEPARATOR_ENCODED = HttpEncodingUtils
- .checkedEncodeUtf8(FocusPoint.TITLE_SEPARATOR);
-
- @Test
- public void appendsJBossToolsVersionToTheEnd() throws Exception {
- IFocusPoint focusPoint = new JBossToolsFocusPointFake(ROOT)
- .setChild(new FocusPoint(CHILD)
- .setChild(new FocusPoint(CHILD)));
- String contentURI = focusPoint.getURI();
-
- assertNotNull(contentURI);
- assertEquals( URI_SEPARATOR_ENCODED
- + ROOT
- + URI_SEPARATOR_ENCODED
- + CHILD + URI_SEPARATOR_ENCODED
- + CHILD + URI_SEPARATOR_ENCODED
- + JBOSS_TOOLS_VERSION, contentURI);
-
- String title = focusPoint.getTitle();
- assertNotNull(title);
- assertEquals(ROOT
- + TITLE_SEPARATOR_ENCODED
- + CHILD + TITLE_SEPARATOR_ENCODED
- + CHILD + TITLE_SEPARATOR_ENCODED
- + JBOSS_TOOLS_VERSION, title);
- }
-
- private static class JBossToolsFocusPointFake extends SuffixFocusPoint {
-
- public JBossToolsFocusPointFake(String name) {
- super(name, JBOSS_TOOLS_VERSION);
- }
- }
-}
Deleted: 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-11-30 16:02:52 UTC (rev 27027)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java 2010-11-30 16:14:44 UTC (rev 27028)
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.usage.test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.jboss.tools.common.log.ILoggingAdapter;
-import org.jboss.tools.usage.googleanalytics.GoogleAnalyticsUrlStrategy;
-import org.jboss.tools.usage.googleanalytics.IGoogleAnalyticsParameters;
-import org.jboss.tools.usage.http.HttpGetRequest;
-import org.jboss.tools.usage.http.IHttpGetRequest;
-import org.jboss.tools.usage.test.fakes.ReportingEclipseEnvironmentFake;
-import org.jboss.tools.usage.test.fakes.RepportingEclipseEnvironmentFakeSingleton;
-import org.jboss.tools.usage.tracker.IFocusPoint;
-import org.jboss.tools.usage.tracker.IURLBuildingStrategy;
-import org.jboss.tools.usage.tracker.internal.UsagePluginLogger;
-import org.junit.Test;
-
-/**
- * @author Andre Dietisheim
- */
-public class JBossToolsUsageIntegrationTest {
-
- @Test
- public void sameUserIdOnSametEclipseInstance() throws Exception {
- UrlRevealingTracker tracker = getTracker(RepportingEclipseEnvironmentFakeSingleton.INSTANCE);
- IFocusPoint focusPoint = createFocusPoint("testSameUserIdOnSametEclipseInstance" + System.currentTimeMillis());
- tracker.trackSynchronously(focusPoint);
- String userId = getUserId(tracker.getTrackingUrl());
- assertTrue(userId != null);
-
- tracker = getTracker(RepportingEclipseEnvironmentFakeSingleton.INSTANCE);
- tracker.trackSynchronously(focusPoint);
- String newUserId = getUserId(tracker.getTrackingUrl());
-
- assertTrue(newUserId != null);
- assertEquals(userId, newUserId);
- }
-
- @Test
- public void differentUserIdOnDifferentEclipseInstance() throws Exception {
- String focusPointName = "testDifferentUserIdOnDifferentEclipseInstance"
- + System.currentTimeMillis();
- UrlRevealingTracker tracker = getTracker(new ReportingEclipseEnvironmentFake());
- tracker.trackSynchronously(createFocusPoint(focusPointName));
- String userId = getUserId(tracker.getTrackingUrl());
- assertTrue(userId != null);
-
- tracker = getTracker(new ReportingEclipseEnvironmentFake());
- IFocusPoint focusPoint = createFocusPoint(focusPointName);
- tracker.trackSynchronously(focusPoint);
- String newUserId = getUserId(tracker.getTrackingUrl());
-
- assertTrue(newUserId != null);
- assertTrue(!userId.equals(newUserId));
- }
-
- @Test
- public void visitCountIncreases() throws Exception {
- IGoogleAnalyticsParameters eclipseEnvironment = new ReportingEclipseEnvironmentFake();
- assertEquals(1, eclipseEnvironment.getVisitCount());
- UrlRevealingTracker tracker = getTracker(eclipseEnvironment);
- tracker.trackSynchronously(createFocusPoint("testVisitCount"));
- assertEquals(2, eclipseEnvironment.getVisitCount());
- tracker.trackSynchronously(createFocusPoint("testVisitCount"));
- assertEquals(3, eclipseEnvironment.getVisitCount());
- }
-
- @Test
- public void urlEndsWithJBossToolsVersion() {
- IGoogleAnalyticsParameters eclipseEnvironment = new ReportingEclipseEnvironmentFake();
- UrlRevealingTracker tracker = getTracker(eclipseEnvironment);
- tracker.trackSynchronously(createFocusPoint("testJBossToolsVersion"));
- assertEquals(2, eclipseEnvironment.getVisitCount());
- tracker.trackSynchronously(createFocusPoint("testVisitCount"));
- assertEquals(3, eclipseEnvironment.getVisitCount());
- }
-
- private String getUserId(String trackingUrl) {
- Pattern pattern = Pattern.compile(".+" + IGoogleAnalyticsParameters.PARAM_COOKIES_UNIQUE_VISITOR_ID
- + "%3D([0-9]+\\.[0-9]+)\\..+");
- Matcher matcher = pattern.matcher(trackingUrl);
- if (matcher.matches()) {
- return matcher.group(1);
- } else {
- return null;
- }
- }
-
- private UrlRevealingTracker getTracker(IGoogleAnalyticsParameters environment) {
- UsagePluginLogger logger = new UsagePluginLogger(JBossToolsUsageTestActivator.getDefault());
- IURLBuildingStrategy urlStrategy = new GoogleAnalyticsUrlStrategy(environment);
- IHttpGetRequest httpGetRequest = new HttpGetRequest(environment.getUserAgent(), logger);
- return new UrlRevealingTracker(urlStrategy, httpGetRequest, logger);
- }
-
- private IFocusPoint createFocusPoint(String childFocusPoint) {
- return new JBossToolsTestsFocusPoint(childFocusPoint);
- }
-}
Added: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageReportIntegrationTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageReportIntegrationTest.java (rev 0)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageReportIntegrationTest.java 2010-11-30 16:14:44 UTC (rev 27028)
@@ -0,0 +1,83 @@
+/*******************************************************************************
+ * 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 static org.junit.Assert.assertFalse;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import org.jboss.tools.usage.internal.JBossToolsUsageActivator;
+import org.jboss.tools.usage.internal.preferences.GlobalUsageSettings;
+import org.jboss.tools.usage.internal.preferences.UsageReportPreferences;
+import org.jboss.tools.usage.internal.reporting.UsageReport;
+import org.junit.Test;
+
+public class UsageReportIntegrationTest {
+
+ private CountDownLatch latch;
+
+ private final class UsageReportFake extends UsageReport {
+
+ private boolean enabled;
+
+ public UsageReportFake(boolean enabled) {
+ super(new JBossToolsTestsFocusPoint("UsageReportIntegrationTest"),
+ JBossToolsUsageActivator.getDefault().getJBossToolsEclipseEnvironment(),
+ new GlobalUsageSettings(JBossToolsUsageActivator.getDefault()));
+ latch = new CountDownLatch(1);
+ this.enabled = enabled;
+ }
+
+ @Override
+ protected void doReport() {
+ try {
+ super.doReport();
+ } finally {
+ latch.countDown();
+ }
+ }
+
+ @Override
+ protected Boolean askUserForEnablement() {
+ return enabled;
+ }
+
+ @Override
+ protected boolean isAskUser() {
+ // has to be true, askUserForEnablement is not queried otherwise
+ return true;
+ }
+
+ @Override
+ protected boolean isReportingGloballyEnabled() {
+ // has to be true, askUserForEnablement is not queried otherwise
+ return true;
+ }
+ }
+
+ @Test
+ public void doesEnableInPreferences() throws InterruptedException {
+ UsageReportPreferences.setEnabled(false);
+ new UsageReportFake(true).report();
+ latch.await(10l, TimeUnit.SECONDS);
+ assertTrue(UsageReportPreferences.isEnabled());
+ }
+
+ @Test
+ public void doesDisableInPreferences() throws InterruptedException {
+ UsageReportPreferences.setEnabled(true);
+ new UsageReportFake(false).report();
+ latch.await(10l, TimeUnit.SECONDS);
+ assertFalse(UsageReportPreferences.isEnabled());
+ }
+}
Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageReportIntegrationTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
14 years
- 1
- 0
JBoss Tools SVN: r27027 - in trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram: src-custom/org/jboss/tools/bpmn2/gmf/notation and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2010-11-30 11:02:52 -0500 (Tue, 30 Nov 2010)
New Revision: 27027
Modified:
trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src-custom/org/jboss/tools/bpmn2/gmf/notation/BpmnBendpointsImpl.java
trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src-custom/org/jboss/tools/bpmn2/gmf/notation/BpmnEdgeImpl.java
trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/Bpmn2ViewProvider.java
Log:
serialize/deserialize waypoints
Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/Bpmn2ViewProvider.java
===================================================================
--- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/Bpmn2ViewProvider.java 2010-11-30 15:52:47 UTC (rev 27026)
+++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/Bpmn2ViewProvider.java 2010-11-30 16:02:52 UTC (rev 27027)
@@ -1913,8 +1913,6 @@
points.add(new RelativeBendpoint());
bendpoints.setPoints(points);
edge.setBendpoints(bendpoints);
- bendpoints.setPoints(points);
- edge.setBendpoints(bendpoints);
ViewUtil.insertChildView(containerView, edge, index, persisted);
edge.setType(Bpmn2VisualIDRegistry
.getType(SequenceFlowEditPart.VISUAL_ID));
Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src-custom/org/jboss/tools/bpmn2/gmf/notation/BpmnBendpointsImpl.java
===================================================================
--- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src-custom/org/jboss/tools/bpmn2/gmf/notation/BpmnBendpointsImpl.java 2010-11-30 15:52:47 UTC (rev 27026)
+++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src-custom/org/jboss/tools/bpmn2/gmf/notation/BpmnBendpointsImpl.java 2010-11-30 16:02:52 UTC (rev 27027)
@@ -10,6 +10,7 @@
import org.eclipse.dd.di.DiagramElement;
import org.eclipse.gmf.runtime.notation.Edge;
import org.eclipse.gmf.runtime.notation.RelativeBendpoints;
+import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint;
import org.eclipse.gmf.runtime.notation.impl.RelativeBendpointsImpl;
@@ -33,9 +34,8 @@
if (object instanceof RelativeBendpoint) {
RelativeBendpoint relativeBendPoint = (RelativeBendpoint)object;
Point absoluteBendpoint = DcFactory.eINSTANCE.createPoint();
- BPMNEdge bpmnEdge = ((BpmnEdgeImpl)edge).getBPMNEdge();
- DiagramElement source = bpmnEdge.getSourceElement();
- if (source != null && source instanceof BPMNShape) {
+ BPMNShape source = getEdgeSource();
+ if (source != null) {
Bounds sourceBounds = ((BPMNShape)source).getBounds();
absoluteBendpoint.setX(sourceBounds.getX() + relativeBendPoint.getSourceX());
absoluteBendpoint.setY(sourceBounds.getY() + relativeBendPoint.getSourceY());
@@ -48,4 +48,11 @@
super.setPoints(newPoints);
}
+ private BPMNShape getEdgeSource() {
+ if (edge == null) return null;
+ View source = edge.getSource();
+ if (!(source instanceof BpmnShapeImpl)) return null;
+ return ((BpmnShapeImpl)source).getBPMNShape();
+ }
+
}
Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src-custom/org/jboss/tools/bpmn2/gmf/notation/BpmnEdgeImpl.java
===================================================================
--- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src-custom/org/jboss/tools/bpmn2/gmf/notation/BpmnEdgeImpl.java 2010-11-30 15:52:47 UTC (rev 27026)
+++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src-custom/org/jboss/tools/bpmn2/gmf/notation/BpmnEdgeImpl.java 2010-11-30 16:02:52 UTC (rev 27027)
@@ -1,9 +1,12 @@
package org.jboss.tools.bpmn2.gmf.notation;
import java.util.ArrayList;
+import java.util.List;
import org.eclipse.bpmn2.BaseElement;
import org.eclipse.bpmn2.di.BPMNEdge;
+import org.eclipse.dd.dc.Bounds;
+import org.eclipse.dd.dc.Point;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.ecore.EObject;
@@ -50,14 +53,7 @@
}
super.setBendpoints(bendpoints);
}
-
- @Override
- public void setSource(View newSource) {
- super.setSource(newSource);
- // force refresh of the points list
- ((BpmnBendpointsImpl)getBendpoints()).setPoints(((BpmnBendpointsImpl)getBendpoints()).getPoints());
- }
-
+
public void initialize(Diagram parentView) {
initializeElement();
initializeBendpoints();
@@ -67,10 +63,25 @@
}
private void initializeBendpoints() {
- RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();
- ArrayList<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2);
- points.add(new RelativeBendpoint());
- points.add(new RelativeBendpoint());
+ RelativeBendpoints bendpoints = BpmnNotationFactory.INSTANCE.createRelativeBendpoints();
+ List<Point> waypoints = getBPMNEdge().getWaypoint();
+ ArrayList<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(waypoints.size());
+ for (Point waypoint : waypoints) {
+ float sourceX = 0, sourceY = 0, targetX = 0, targetY = 0;
+ View source = getSource();
+ if (source instanceof BpmnShapeImpl) {
+ Bounds bounds = ((BpmnShapeImpl)source).getBPMNShape().getBounds();
+ sourceX = waypoint.getX() - bounds.getX();
+ sourceY = waypoint.getY() - bounds.getY();
+ }
+ View target = getTarget();
+ if (target instanceof BpmnShapeImpl) {
+ Bounds bounds = ((BpmnShapeImpl)target).getBPMNShape().getBounds();
+ targetX = waypoint.getX() - bounds.getX();
+ targetY = waypoint.getY() - bounds.getY();
+ }
+ points.add(new RelativeBendpoint((int)sourceX, (int)sourceY, (int)targetX, (int)targetY));
+ }
bendpoints.setPoints(points);
setBendpoints(bendpoints);
14 years
- 1
- 0
JBoss Tools SVN: r27026 - in trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp: messages and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-11-30 10:52:47 -0500 (Tue, 30 Nov 2010)
New Revision: 27026
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizard.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/JstUIMessages.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/messages.properties
Log:
https://jira.jboss.org/browse/JBIDE-7758 , fixed.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizard.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizard.java 2010-11-30 15:49:17 UTC (rev 27025)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizard.java 2010-11-30 15:52:47 UTC (rev 27026)
@@ -30,6 +30,8 @@
import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
import org.eclipse.ui.texteditor.ITextEditor;
import org.eclipse.wst.sse.ui.StructuredTextEditor;
+import org.eclipse.wst.xml.core.internal.document.AttrImpl;
+import org.eclipse.wst.xml.core.internal.document.ElementImpl;
import org.jboss.tools.common.EclipseUtil;
import org.jboss.tools.common.meta.action.XActionInvoker;
import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
@@ -337,7 +339,24 @@
jsfCoreTaglibPrefix + Constants.COLON + "loadBundle"); //$NON-NLS-1$
loadBundle.setAttribute("var", var); //$NON-NLS-1$
loadBundle.setAttribute("basename", bundlePath); //$NON-NLS-1$
- node.getParentNode().insertBefore(loadBundle, node);
+ Node elementToInsertBefore = null;
+ Node refChild = null;
+ if (node.getParentNode() != null) {
+ refChild = node;
+ elementToInsertBefore = node.getParentNode();
+ } else if (node instanceof AttrImpl) {
+ AttrImpl attr = (AttrImpl) node;
+ if ((attr.getOwnerElement().getParentNode() != null)){
+ refChild = attr.getOwnerElement();
+ elementToInsertBefore = attr.getOwnerElement().getParentNode();
+ }
+ }
+ if ((elementToInsertBefore != null) && (refChild != null)){
+ elementToInsertBefore.insertBefore(loadBundle, refChild);
+ } else {
+ JspEditorPlugin.getDefault().logWarning(
+ JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_CANNOT_ADD_LOAD_BUNDLE_TAG);
+ }
}
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/JstUIMessages.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/JstUIMessages.java 2010-11-30 15:49:17 UTC (rev 27025)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/JstUIMessages.java 2010-11-30 15:52:47 UTC (rev 27026)
@@ -164,5 +164,6 @@
public static String EXTERNALIZE_STRINGS_DIALOG_USER_DEFINED;
public static String EXTERNALIZE_STRINGS_DIALOG_BUNDLE_NAME;
public static String EXTERNALIZE_STRINGS_DIALOG_WRONG_BUNDLE_PLACEMENT;
+ public static String EXTERNALIZE_STRINGS_DIALOG_CANNOT_ADD_LOAD_BUNDLE_TAG;
}
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/messages.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/messages.properties 2010-11-30 15:49:17 UTC (rev 27025)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/messages.properties 2010-11-30 15:52:47 UTC (rev 27026)
@@ -143,3 +143,4 @@
EXTERNALIZE_STRINGS_DIALOG_USER_DEFINED=manually by user
EXTERNALIZE_STRINGS_DIALOG_BUNDLE_NAME=Bundle name:
EXTERNALIZE_STRINGS_DIALOG_WRONG_BUNDLE_PLACEMENT=Resource Bundle file should be created in the source folder.\n Basename will be incorect.
+EXTERNALIZE_STRINGS_DIALOG_CANNOT_ADD_LOAD_BUNDLE_TAG=Cannot add loadBundle tag
14 years
- 1
- 0
JBoss Tools SVN: r27025 - in trunk: vpe/tests/org.jboss.tools.vpe.spring.test/META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2010-11-30 10:49:17 -0500 (Tue, 30 Nov 2010)
New Revision: 27025
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml
trunk/vpe/tests/org.jboss.tools.vpe.spring.test/META-INF/MANIFEST.MF
Log:
https://jira.jboss.org/browse/JBIDE-7760 : Fix failing JUnit: org.jboss.tools.vpe.spring.test.SpringComponentContentTest.testHasBindErrors()
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2010-11-30 15:42:27 UTC (rev 27024)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2010-11-30 15:49:17 UTC (rev 27025)
@@ -690,12 +690,6 @@
</vpe:tag>
<vpe:tag name="h:column" case-sensitive="yes">
- <vpe:if test="parentname()='h:dataTable'|parentname()='h:panelGrid'">
- <!-- Gavr --><!-- added x: 8.02.05 -->
- <vpe:template children="yes" modify="yes">
- <vpe:column title="{tagstring()}" />
- </vpe:template>
- </vpe:if>
<vpe:if
test="parentname()='rich:columnGroup'|parentname()='rich:dataTable'|parentname()='rich:orderingList'|parentname()='rich:listShuttle'|parentname()='rich:scrollableDataTable'">
<vpe:template children="yes" modify="yes"
@@ -703,6 +697,11 @@
class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesColumnTemplate">
</vpe:template>
</vpe:if>
+
+ <!-- parentname()='h:dataTable'|parentname()='h:panelGrid' or any other-->
+ <vpe:template children="yes" modify="yes">
+ <vpe:column title="{tagstring()}" />
+ </vpe:template>
</vpe:tag>
<vpe:tag name="f:facet" case-sensitive="yes">
Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/META-INF/MANIFEST.MF 2010-11-30 15:42:27 UTC (rev 27024)
+++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/META-INF/MANIFEST.MF 2010-11-30 15:49:17 UTC (rev 27025)
@@ -13,6 +13,7 @@
org.jboss.tools.vpe.spring;bundle-version="3.1.0",
org.jboss.tools.vpe.jsp;bundle-version="3.1.0",
org.jboss.tools.vpe.html;bundle-version="3.1.0",
+ org.jboss.tools.jsf.vpe.jstl;bundle-version="3.1.0",
org.jboss.tools.vpe.base.test;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.tools.vpe.spring.test
14 years
- 1
- 0
JBoss Tools SVN: r27024 - trunk/documentation/whatsnew/modeshape.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2010-11-30 10:42:27 -0500 (Tue, 30 Nov 2010)
New Revision: 27024
Added:
trunk/documentation/whatsnew/modeshape/modeshape-news-7.2.0.Beta2.html
Log:
fixed case
Added: trunk/documentation/whatsnew/modeshape/modeshape-news-7.2.0.Beta2.html
===================================================================
--- trunk/documentation/whatsnew/modeshape/modeshape-news-7.2.0.Beta2.html (rev 0)
+++ trunk/documentation/whatsnew/modeshape/modeshape-news-7.2.0.Beta2.html 2010-11-30 15:42:27 UTC (rev 27024)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!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">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css"/>
+<title>ModeShape What's New</title>
+</head>
+<body>
+<h1>ModeShape 7.1.0 Beta2 What's New</h1>
+<p align="right"><a href="../index.html">< Main Index</a></p>
+<p>Last revised November 24, 2010</p>
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+ <tr><td colspan="2"><hr /></td></tr>
+ <tr>
+ <td valign="top" align="left">
+ <p>
+ <b>Publishing Wizard</b>
+ </p>
+ </td>
+
+ <td valign="top">
+ <p>
+ The publishing wizard now allows you to optionally enter a repository workspace area. A workspace area is a known
+ repository location that is being monitored by the ModeShape service responsible for sequencing files. A file published
+ to a workspace area will get sequenced as long as there is a sequencer operating on their file type.
+ </p>
+ <p>The workspace area path is appended to the server URL to determine the root location the wizard uses to publish and
+ unpublish files. A file's project path is appended to the root path to determine its repository location.
+ </p>
+
+ <p>
+ Here is what the ModeShape publishing wizard looks like:
+ </p>
+
+ <p>
+ <img src="images/PublishDialog-7.1.0.beta2.png" alt="ModeShape Publishing Wizard"/>
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2"><hr /></td>
+ </tr>
+</table>
+
+</body>
+
+</html>
+
+
14 years
- 1
- 0
JBoss Tools SVN: r27023 - trunk/documentation/whatsnew/modeshape.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2010-11-30 10:40:26 -0500 (Tue, 30 Nov 2010)
New Revision: 27023
Removed:
trunk/documentation/whatsnew/modeshape/modeshape-news-3.2.0.beta2.html
Log:
remove bad cased file
Deleted: trunk/documentation/whatsnew/modeshape/modeshape-news-3.2.0.beta2.html
===================================================================
--- trunk/documentation/whatsnew/modeshape/modeshape-news-3.2.0.beta2.html 2010-11-30 10:49:23 UTC (rev 27022)
+++ trunk/documentation/whatsnew/modeshape/modeshape-news-3.2.0.beta2.html 2010-11-30 15:40:26 UTC (rev 27023)
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!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">
-<head>
-<meta http-equiv="Content-Language" content="en-us" />
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<link rel="stylesheet" href="../whatsnew.css"/>
-<title>ModeShape What's New</title>
-</head>
-<body>
-<h1>ModeShape 3.2.0 Beta2 What's New</h1>
-<p align="right"><a href="../index.html">< Main Index</a></p>
-<p>Last revised November 29, 2010</p>
-
-<table border="0" cellpadding="10" cellspacing="0" width="80%">
- <tr><td colspan="2"><hr /></td></tr>
- <tr>
- <td valign="top" align="left">
- <p>
- <b>Publishing Wizard</b>
- </p>
- </td>
-
- <td valign="top">
- <p>
- The publishing wizard now allows you to specify where in the JCR repository your files and folders will be published. When
- you publish to one of these "publish areas", the ModeShape repository will automatically sequence your files to extract
- useful information and make it available to other repository users. (The kind and structure of information extracted
- depends upon the type of file and the configuration of the ModeShape repository.)
- </p>
- <p>
- The actual location where the files will be published is constructed by appending the server URL, the names of the JCR
- repository and workspace, the path to the publish area, and the path of the files and folders within your Eclipse workspace.
- </p>
-
- <p>
- Here is what the ModeShape publishing wizard looks like:
- </p>
-
- <p>
- <img src="images/PublishDialog-3.2.0.beta2.png" alt="ModeShape Publishing Wizard"/>
- </p>
- </td>
- </tr>
- <tr>
- <td colspan="2"><hr /></td>
- </tr>
-</table>
-
-</body>
-
-</html>
-
-
14 years
- 1
- 0
JBoss Tools SVN: r27022 - trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-30 05:49:23 -0500 (Tue, 30 Nov 2010)
New Revision: 27022
Added:
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmentTest.java
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageIntegrationTest.java
Modified:
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/FocusPointTest.java
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsTestsFocusPoint.java
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java
Log:
renamed JBossToolsXXX classes (to see better what's beeing tested)
Copied: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmentTest.java (from rev 25861, trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsEclipseEnvironmentTest.java)
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmentTest.java (rev 0)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmentTest.java 2010-11-30 10:49:23 UTC (rev 27022)
@@ -0,0 +1,73 @@
+/*******************************************************************************
+ * 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.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.eclipse.core.runtime.IBundleGroupProvider;
+import org.jboss.tools.usage.googleanalytics.eclipse.AbstractEclipseEnvironment;
+import org.jboss.tools.usage.internal.reporting.JBossToolsComponents;
+import org.jboss.tools.usage.test.fakes.BundleGroupProviderFake;
+import org.jboss.tools.usage.test.fakes.ReportingEclipseEnvironmentFake;
+import org.junit.Test;
+
+/**
+ * @author Andre Dietisheim
+ */
+public class EclipseEnvironmentTest {
+
+ @Test
+ public void keywordReportsJbossComponents() {
+ AbstractEclipseEnvironment eclipseEnvironment = new ReportingEclipseEnvironmentFake() {
+
+ @Override
+ protected IBundleGroupProvider[] getBundleGroupProviders() {
+ return new IBundleGroupProvider[] {
+ new BundleGroupProviderFake(
+ "org.jboss.tools.gwt.feature",
+ "org.jboss.tools.seam.feature",
+ "org.jboss.tools.smooks.feature")
+ };
+ }
+ };
+
+ String keyword = eclipseEnvironment.getKeyword();
+
+ Matcher matcher = Pattern.compile("(([A-Z]+)-){3}").matcher(keyword);
+ assertTrue(matcher.matches());
+ assertTrue(keyword.indexOf(JBossToolsComponents.JBossToolsFeatureIdentifiers.GWT.name()) >= 0);
+ assertTrue(keyword.indexOf(JBossToolsComponents.JBossToolsFeatureIdentifiers.SEAM.name()) >= 0);
+ assertTrue(keyword.indexOf(JBossToolsComponents.JBossToolsFeatureIdentifiers.SMOOKS.name()) >= 0);
+ }
+
+ @Test
+ public void keywordIsEmptyIfNoJBossFeaturesFound() {
+ AbstractEclipseEnvironment eclipseEnvironment = new ReportingEclipseEnvironmentFake() {
+
+ @Override
+ protected IBundleGroupProvider[] getBundleGroupProviders() {
+ return new IBundleGroupProvider[] {
+ new BundleGroupProviderFake(
+ "org.jboss.tools.gwt",
+ "org.eclipse.emf.cdo")
+ };
+ }
+ };
+
+ String keyword = eclipseEnvironment.getKeyword();
+ assertTrue(keyword != null && keyword.length() == 0);
+ }
+
+
+}
Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmentTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/FocusPointTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/FocusPointTest.java 2010-11-30 10:30:54 UTC (rev 27021)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/FocusPointTest.java 2010-11-30 10:49:23 UTC (rev 27022)
@@ -15,6 +15,7 @@
import org.jboss.tools.usage.tracker.IFocusPoint;
import org.jboss.tools.usage.tracker.internal.FocusPoint;
+import org.jboss.tools.usage.tracker.internal.SuffixFocusPoint;
import org.jboss.tools.usage.util.HttpEncodingUtils;
import org.junit.Test;
@@ -30,6 +31,11 @@
private static final String URI_SEPARATOR_ENCODED = HttpEncodingUtils.checkedEncodeUtf8(FocusPoint.URI_SEPARATOR);
private static final String TITLE_SEPARATOR_ENCODED = HttpEncodingUtils.checkedEncodeUtf8(FocusPoint.TITLE_SEPARATOR);
+
+ private static final String JBOSS_TOOLS_VERSION = "42.0.42";
+
+ private static final String CHILD = "child";
+
@Test
public void testGetContentURI_Simple() throws Exception {
@@ -62,4 +68,35 @@
assertNotNull(contentTitle);
assertEquals(ROOT + TITLE_SEPARATOR_ENCODED + CHILD1, contentTitle);
}
+
+ @Test
+ public void appendsJBossToolsVersionToTheEnd() throws Exception {
+ IFocusPoint focusPoint = new FocusPointFake(ROOT)
+ .setChild(new FocusPoint(CHILD)
+ .setChild(new FocusPoint(CHILD)));
+ String contentURI = focusPoint.getURI();
+
+ assertNotNull(contentURI);
+ assertEquals( URI_SEPARATOR_ENCODED
+ + ROOT
+ + URI_SEPARATOR_ENCODED
+ + CHILD + URI_SEPARATOR_ENCODED
+ + CHILD + URI_SEPARATOR_ENCODED
+ + JBOSS_TOOLS_VERSION, contentURI);
+
+ String title = focusPoint.getTitle();
+ assertNotNull(title);
+ assertEquals(ROOT
+ + TITLE_SEPARATOR_ENCODED
+ + CHILD + TITLE_SEPARATOR_ENCODED
+ + CHILD + TITLE_SEPARATOR_ENCODED
+ + JBOSS_TOOLS_VERSION, title);
+ }
+
+ private static class FocusPointFake extends SuffixFocusPoint {
+
+ public FocusPointFake(String name) {
+ super(name, JBOSS_TOOLS_VERSION);
+ }
+ }
}
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsTestsFocusPoint.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsTestsFocusPoint.java 2010-11-30 10:30:54 UTC (rev 27021)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsTestsFocusPoint.java 2010-11-30 10:49:23 UTC (rev 27022)
@@ -29,6 +29,4 @@
public static String getJBossToolsVersion() {
return JBossToolsUsageActivator.getDefault().getBundle().getVersion().toString();
}
-
-
}
Copied: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageIntegrationTest.java (from rev 27018, 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/UsageIntegrationTest.java (rev 0)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageIntegrationTest.java 2010-11-30 10:49:23 UTC (rev 27022)
@@ -0,0 +1,111 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.usage.test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.jboss.tools.usage.googleanalytics.GoogleAnalyticsUrlStrategy;
+import org.jboss.tools.usage.googleanalytics.IGoogleAnalyticsParameters;
+import org.jboss.tools.usage.http.HttpGetRequest;
+import org.jboss.tools.usage.http.IHttpGetRequest;
+import org.jboss.tools.usage.test.fakes.ReportingEclipseEnvironmentFake;
+import org.jboss.tools.usage.test.fakes.RepportingEclipseEnvironmentFakeSingleton;
+import org.jboss.tools.usage.tracker.IFocusPoint;
+import org.jboss.tools.usage.tracker.IURLBuildingStrategy;
+import org.jboss.tools.usage.tracker.internal.UsagePluginLogger;
+import org.junit.Test;
+
+/**
+ * @author Andre Dietisheim
+ */
+public class UsageIntegrationTest {
+
+ @Test
+ public void sameUserIdOnSametEclipseInstance() throws Exception {
+ UrlRevealingTracker tracker = getTracker(RepportingEclipseEnvironmentFakeSingleton.INSTANCE);
+ IFocusPoint focusPoint = createFocusPoint("testSameUserIdOnSametEclipseInstance" + System.currentTimeMillis());
+ tracker.trackSynchronously(focusPoint);
+ String userId = getUserId(tracker.getTrackingUrl());
+ assertTrue(userId != null);
+
+ tracker = getTracker(RepportingEclipseEnvironmentFakeSingleton.INSTANCE);
+ tracker.trackSynchronously(focusPoint);
+ String newUserId = getUserId(tracker.getTrackingUrl());
+
+ assertTrue(newUserId != null);
+ assertEquals(userId, newUserId);
+ }
+
+ @Test
+ public void differentUserIdOnDifferentEclipseInstance() throws Exception {
+ String focusPointName = "testDifferentUserIdOnDifferentEclipseInstance"
+ + System.currentTimeMillis();
+ UrlRevealingTracker tracker = getTracker(new ReportingEclipseEnvironmentFake());
+ tracker.trackSynchronously(createFocusPoint(focusPointName));
+ String userId = getUserId(tracker.getTrackingUrl());
+ assertTrue(userId != null);
+
+ tracker = getTracker(new ReportingEclipseEnvironmentFake());
+ IFocusPoint focusPoint = createFocusPoint(focusPointName);
+ tracker.trackSynchronously(focusPoint);
+ String newUserId = getUserId(tracker.getTrackingUrl());
+
+ assertTrue(newUserId != null);
+ assertTrue(!userId.equals(newUserId));
+ }
+
+ @Test
+ public void visitCountIncreases() throws Exception {
+ IGoogleAnalyticsParameters eclipseEnvironment = new ReportingEclipseEnvironmentFake();
+ assertEquals(1, eclipseEnvironment.getVisitCount());
+ UrlRevealingTracker tracker = getTracker(eclipseEnvironment);
+ tracker.trackSynchronously(createFocusPoint("testVisitCount"));
+ assertEquals(2, eclipseEnvironment.getVisitCount());
+ tracker.trackSynchronously(createFocusPoint("testVisitCount"));
+ assertEquals(3, eclipseEnvironment.getVisitCount());
+ }
+
+ @Test
+ public void urlEndsWithJBossToolsVersion() {
+ IGoogleAnalyticsParameters eclipseEnvironment = new ReportingEclipseEnvironmentFake();
+ UrlRevealingTracker tracker = getTracker(eclipseEnvironment);
+ tracker.trackSynchronously(createFocusPoint("testJBossToolsVersion"));
+ assertEquals(2, eclipseEnvironment.getVisitCount());
+ tracker.trackSynchronously(createFocusPoint("testVisitCount"));
+ assertEquals(3, eclipseEnvironment.getVisitCount());
+ }
+
+ private String getUserId(String trackingUrl) {
+ Pattern pattern = Pattern.compile(".+" + IGoogleAnalyticsParameters.PARAM_COOKIES_UNIQUE_VISITOR_ID
+ + "%3D([0-9]+\\.[0-9]+)\\..+");
+ Matcher matcher = pattern.matcher(trackingUrl);
+ if (matcher.matches()) {
+ return matcher.group(1);
+ } else {
+ return null;
+ }
+ }
+
+ private UrlRevealingTracker getTracker(IGoogleAnalyticsParameters environment) {
+ UsagePluginLogger logger = new UsagePluginLogger(JBossToolsUsageTestActivator.getDefault());
+ IURLBuildingStrategy urlStrategy = new GoogleAnalyticsUrlStrategy(environment);
+ IHttpGetRequest httpGetRequest = new HttpGetRequest(environment.getUserAgent(), logger);
+ return new UrlRevealingTracker(urlStrategy, httpGetRequest, logger);
+ }
+
+ private IFocusPoint createFocusPoint(String childFocusPoint) {
+ return new JBossToolsTestsFocusPoint(childFocusPoint);
+ }
+}
Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageIntegrationTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
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-11-30 10:30:54 UTC (rev 27021)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java 2010-11-30 10:49:23 UTC (rev 27022)
@@ -19,15 +19,14 @@
@RunWith(Suite.class)
@Suite.SuiteClasses({
FocusPointTest.class,
- JBossToolsFocusPointTest.class,
GoogleAnalyticsUrlStrategyTest.class,
EclipseUserAgentTest.class,
LinuxSystemTest.class,
- JBossToolsEclipseEnvironmentTest.class,
+ EclipseEnvironmentTest.class,
JBossToolsComponentsTest.class,
HttpRemotePropertiesTest.class,
GlobalUsageSettingsTest.class,
UsageBrandingTest.class,
- JBossToolsUsageIntegrationTest.class })
+ UsageIntegrationTest.class })
public class UsageTestSuite {
}
\ No newline at end of file
14 years
- 1
- 0
JBoss Tools SVN: r27021 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-30 05:30:54 -0500 (Tue, 30 Nov 2010)
New Revision: 27021
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java
Log:
[JBIDE-7694]
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-11-30 10:30:34 UTC (rev 27020)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-11-30 10:30:54 UTC (rev 27021)
@@ -221,7 +221,7 @@
private DeltaCloud setCurrentCloud(int index) {
DeltaCloud[] clouds = getClouds();
- if (index >= clouds.length) {
+ if (index < 0 || index >= clouds.length) {
currCloud = null;
} else {
currCloud = getClouds()[index];
14 years
- 1
- 0
JBoss Tools SVN: r27020 - branches/jbosstools-3.2.0.Beta2/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-30 05:30:34 -0500 (Tue, 30 Nov 2010)
New Revision: 27020
Modified:
branches/jbosstools-3.2.0.Beta2/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java
Log:
[JBIDE-7694]
Modified: branches/jbosstools-3.2.0.Beta2/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java
===================================================================
--- branches/jbosstools-3.2.0.Beta2/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-11-30 10:01:15 UTC (rev 27019)
+++ branches/jbosstools-3.2.0.Beta2/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-11-30 10:30:34 UTC (rev 27020)
@@ -64,7 +64,6 @@
private Combo cloudSelector;
private Label filterLabel;
- private DeltaCloud[] clouds;
private DeltaCloud currCloud;
private InstanceViewLabelAndContentProvider contentProvider;
@@ -81,7 +80,7 @@
if (currCloud != null) {
currCloud.removeInstanceListListener(InstanceView.this);
}
- currCloud = clouds[index];
+ setCurrentCloud(index);
storeSelectedCloud();
Display.getCurrent().asyncExec(new Runnable() {
@@ -89,7 +88,6 @@
public void run() {
viewer.setInput(currCloud);
currCloud.addInstanceListListener(InstanceView.this);
- viewer.refresh();
}
});
@@ -133,7 +131,7 @@
@Override
public void dispose() {
- for (DeltaCloud cloud : clouds) {
+ for (DeltaCloud cloud : getClouds()) {
cloud.removeInstanceListListener(this);
}
DeltaCloudManager.getDefault().removeCloudManagerListener(this);
@@ -148,7 +146,7 @@
layout.marginWidth = 0;
container.setLayout(layout);
- clouds = getClouds();
+ DeltaCloud[] clouds = getClouds();
createCloudSelector();
initCloudSelector(getLastSelectedCloud(), cloudSelector, clouds);
@@ -163,6 +161,7 @@
currCloud = getCurrentCloud(cloudSelector.getSelectionIndex(), clouds);
addInstanceListener(currCloud, viewer);
+ setViewerInput(currCloud);
setFilterLabelVisible(currCloud, filterLabel);
Point p1 = cloudSelectorLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT);
@@ -195,12 +194,18 @@
PlatformUI.getWorkbench().getHelpSystem().setHelp(viewer.getControl(), "org.jboss.tools.deltacloud.ui.viewer");
hookContextMenu(viewer.getTable());
getSite().setSelectionProvider(viewer);
-
+
DeltaCloudManager.getDefault().addCloudManagerListener(this);
}
+ private void setViewerInput(DeltaCloud currentCloud) {
+ if (currentCloud != null) {
+ viewer.setInput(currentCloud);
+ }
+ }
+
private DeltaCloud[] getClouds() {
- DeltaCloud[] clouds = new DeltaCloud[]{};
+ DeltaCloud[] clouds = new DeltaCloud[] {};
try {
clouds = DeltaCloudManager.getDefault().getClouds();
} catch (DeltaCloudException e) {
@@ -213,6 +218,15 @@
return clouds;
}
+ private void setCurrentCloud(int index) {
+ DeltaCloud[] clouds = getClouds();
+ if (index < 0 || index >= clouds.length) {
+ currCloud = null;
+ } else {
+ currCloud = getClouds()[index];
+ }
+ }
+
private void setFilterLabelVisible(DeltaCloud currentCloud, Label filterLabel) {
if (currentCloud == null) {
filterLabel.setVisible(false);
@@ -227,7 +241,6 @@
if (currentCloud != null) {
currentCloud.removeInstanceListListener(this);
currentCloud.addInstanceListListener(this);
- viewer.setInput(currentCloud);
}
}
@@ -321,7 +334,7 @@
currName = currCloud.getName();
currIndex = cloudSelector.getSelectionIndex();
}
- clouds = getClouds();
+ DeltaCloud[] clouds = getClouds();
String[] cloudNames = new String[clouds.length];
int index = 0;
for (int i = 0; i < clouds.length; ++i) {
@@ -332,17 +345,22 @@
if (type == ICloudManagerListener.RENAME_EVENT) {
index = currIndex; // no change in cloud displayed
}
- cloudSelector.removeModifyListener(cloudModifyListener);
- cloudSelector.setItems(cloudNames);
+
+ setCloudSelectorItems(cloudNames);
+ setCurrentCloud(index);
+
if (cloudNames.length > 0) {
cloudSelector.setText(cloudNames[index]);
- currCloud = clouds[index];
viewer.setInput(currCloud);
} else {
- currCloud = null;
cloudSelector.setText("");
viewer.setInput(new DeltaCloudInstance[0]);
}
+ }
+
+ private void setCloudSelectorItems(String[] cloudNames) {
+ cloudSelector.removeModifyListener(cloudModifyListener);
+ cloudSelector.setItems(cloudNames);
cloudSelector.addModifyListener(cloudModifyListener);
}
@@ -355,11 +373,8 @@
Display.getDefault().syncExec(new Runnable() {
@Override
public void run() {
- currCloud.removeInstanceListListener(InstanceView.this);
-
+ currCloud.addInstanceListListener(InstanceView.this); // does not add identical instance twice
viewer.setInput(instances);
- currCloud.addInstanceListListener(InstanceView.this);
- viewer.refresh();
refreshToolbarCommandStates();
}
});
14 years
- 1
- 0
JBoss Tools SVN: r27019 - in branches/jbosstools-3.2.0.Beta2/usage: plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-30 05:01:15 -0500 (Tue, 30 Nov 2010)
New Revision: 27019
Removed:
branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/LoggingUtils.java
Modified:
branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF
branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpGetRequest.java
branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpRemotePropertiesProvider.java
branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/GlobalUsageSettings.java
branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferences.java
branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReport.java
branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReportDispatcher.java
branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/tracker/internal/Tracker.java
branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/tracker/internal/UsagePluginLogger.java
branches/jbosstools-3.2.0.Beta2/usage/tests/org.jboss.tools.usage.test/JBoss Developer Studio Usage Reporter.launch
branches/jbosstools-3.2.0.Beta2/usage/tests/org.jboss.tools.usage.test/JBoss Tools Usage Reporter.launch
branches/jbosstools-3.2.0.Beta2/usage/tests/org.jboss.tools.usage.test/UsageTestSuite.launch
branches/jbosstools-3.2.0.Beta2/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageSettingsTest.java
branches/jbosstools-3.2.0.Beta2/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/HttpRemotePropertiesTest.java
branches/jbosstools-3.2.0.Beta2/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java
branches/jbosstools-3.2.0.Beta2/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java
branches/jbosstools-3.2.0.Beta2/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UrlRevealingTracker.java
Log:
[JBIDe-7751] [JBIDe-7552] removed dependency to org.jboss.tools.commons, fixed NPE when logging (accessed a plugin instance variable that was never initialized), made getting/setting pref values does always access pref store (code gets more clear)
Modified: branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF 2010-11-30 09:58:35 UTC (rev 27018)
+++ branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF 2010-11-30 10:01:15 UTC (rev 27019)
@@ -23,6 +23,5 @@
Bundle-Activator: org.jboss.tools.usage.internal.JBossToolsUsageActivator
Bundle-Vendor: %bundle-vendor
Bundle-ActivationPolicy: lazy
-Import-Package: org.jboss.tools.common.log
Modified: branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpGetRequest.java
===================================================================
--- branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpGetRequest.java 2010-11-30 09:58:35 UTC (rev 27018)
+++ branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpGetRequest.java 2010-11-30 10:01:15 UTC (rev 27019)
@@ -15,7 +15,7 @@
import java.net.URL;
import java.text.MessageFormat;
-import org.jboss.tools.common.log.ILoggingAdapter;
+import org.jboss.tools.usage.tracker.internal.UsagePluginLogger;
/**
* Class that executes a HTTP Get request to the given url.
@@ -28,18 +28,13 @@
private static final String GET_METHOD_NAME = "GET"; //$NON-NLS-1$
- private ILoggingAdapter loggingAdapter = null;
+ private UsagePluginLogger logger = null;
-// private CookieHandler cookieHandler;
-
private String userAgent;
- public HttpGetRequest(String userAgent, ILoggingAdapter loggingAdapter) {
+ public HttpGetRequest(String userAgent, UsagePluginLogger logger) {
this.userAgent = userAgent;
- this.loggingAdapter = loggingAdapter;
-// this.cookieHandler = new CookieHandler();
-// this.cookieHandler = CookieHandler.getDefault();
-// cookieHandler.setCookiePolicy(CookiePolicy.ACCEPT_ALL);
+ this.logger = logger;
}
/* (non-Javadoc)
@@ -47,20 +42,17 @@
*/
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.debug(MessageFormat.format(HttpMessages.HttpGetMethod_Success, urlString, responseCode));
+ logger.debug(MessageFormat.format(HttpMessages.HttpGetMethod_Success, urlString, responseCode));
} else {
- loggingAdapter.error(MessageFormat.format(HttpMessages.HttpGetMethod_Error_Http, urlString, responseCode));
+ logger.error(MessageFormat.format(HttpMessages.HttpGetMethod_Error_Http, urlString, responseCode));
}
} catch (Exception e) {
- loggingAdapter.debug(MessageFormat.format(HttpMessages.HttpGetMethod_Error_Io, urlString, e.toString()));
- } finally {
-// setCookieHandler(currentCookieHandler);
+ logger.debug(MessageFormat.format(HttpMessages.HttpGetMethod_Error_Io, urlString, e.toString()));
}
}
@@ -76,12 +68,6 @@
return urlConnection.getResponseCode();
}
-// private CookieHandler setCookieHandler(CookieHandler cookieHandler) {
-// CookieHandler currentCookieHandler = CookieHandler.getDefault();
-// CookieHandler.setDefault(cookieHandler);
-// return currentCookieHandler;
-// }
-
/**
* Creates a new url connection.
*
Modified: branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpRemotePropertiesProvider.java
===================================================================
--- branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpRemotePropertiesProvider.java 2010-11-30 09:58:35 UTC (rev 27018)
+++ branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpRemotePropertiesProvider.java 2010-11-30 10:01:15 UTC (rev 27019)
@@ -21,12 +21,8 @@
import java.util.HashMap;
import java.util.Map;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.jboss.tools.common.log.ILoggingAdapter;
+import org.jboss.tools.usage.tracker.internal.UsagePluginLogger;
import org.jboss.tools.usage.util.HttpEncodingUtils;
-import org.jboss.tools.usage.util.LoggingUtils;
-import org.jboss.tools.usage.util.StatusUtils;
import org.jboss.tools.usage.util.reader.ReaderUtils;
@@ -45,14 +41,13 @@
private String[] keys;
private String url;
private char valueDelimiter;
- protected Plugin plugin;
- private ILoggingAdapter loggingAdapter;
+ private UsagePluginLogger logger;
- public HttpRemotePropertiesProvider(String url, char valueDelimiter, ILoggingAdapter loggingAdapter, String... keys) {
+ public HttpRemotePropertiesProvider(String url, char valueDelimiter, UsagePluginLogger loggingAdapter, String... keys) {
this.url = url;
this.keys = keys;
this.valueDelimiter = valueDelimiter;
- this.loggingAdapter = loggingAdapter;
+ this.logger = loggingAdapter;
}
@@ -86,18 +81,14 @@
urlConnection.connect();
int responseCode = getResponseCode(urlConnection);
if (responseCode == HttpURLConnection.HTTP_OK) {
- IStatus status = StatusUtils.getInfoStatus(
- plugin.getBundle().getSymbolicName()
- , HttpMessages.HttpResourceMap_Info_HttpQuery
- , url);
- LoggingUtils.log(status, plugin);
+ logger.debug(MessageFormat.format(HttpMessages.HttpResourceMap_Info_HttpQuery, url));
responseReader = getInputStreamReader(urlConnection.getInputStream(), urlConnection.getContentType());
} else {
- loggingAdapter.error(MessageFormat.format(HttpMessages.HttpGetMethod_Error_Http, url, responseCode));
+ logger.error(MessageFormat.format(HttpMessages.HttpGetMethod_Error_Http, url, responseCode));
}
return responseReader;
} catch (IOException e) {
- loggingAdapter.debug(MessageFormat.format(HttpMessages.HttpGetMethod_Error_Io, url, e.toString()));
+ logger.debug(MessageFormat.format(HttpMessages.HttpGetMethod_Error_Io, url, e.toString()));
throw e;
}
}
Modified: branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/GlobalUsageSettings.java
===================================================================
--- branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/GlobalUsageSettings.java 2010-11-30 09:58:35 UTC (rev 27018)
+++ branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/GlobalUsageSettings.java 2010-11-30 10:01:15 UTC (rev 27019)
@@ -32,8 +32,12 @@
* system property that enables/disables reporting for current eclipse
* instance
*/
- public static final String USAGE_REPORTING_ENABLED_KEY = "usage_reporting_enabled";
+ public static final String USAGE_REPORTING_ENABLED_KEY = "usage_reporting_enabled"; //$NON-NLS-1$
+ /**
+ * system property that enables/disables reporting for all eclipse
+ * instances
+ */
public static final String REMOTEPROPS_USAGE_REPORTING_ENABLED_KEY = USAGE_REPORTING_ENABLED_KEY + "="; //$NON-NLS-1$
/** the enablement default for the local instance */
@@ -96,7 +100,8 @@
*
* @return true, if this instance shall report usage
*
- * @see #SYSPROPS_INSTANCE_ENABLED_KEY
+ * @see #USAGE_REPORTING_ENABLED_KEY
+ * @see #INSTANCE_USAGE_REPORTING_ENABLED_DEFAULT
*/
private boolean isInstanceReportingEnabled() {
return Boolean.valueOf(
Modified: branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferences.java
===================================================================
--- branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferences.java 2010-11-30 09:58:35 UTC (rev 27018)
+++ branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferences.java 2010-11-30 10:01:15 UTC (rev 27019)
@@ -10,11 +10,12 @@
******************************************************************************/
package org.jboss.tools.usage.internal.preferences;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import java.io.IOException;
+
import org.eclipse.jface.preference.IPreferenceStore;
import org.jboss.tools.usage.internal.JBossToolsUsageActivator;
import org.jboss.tools.usage.internal.reporting.ReportingMessages;
-import org.jboss.tools.usage.util.StatusUtils;
+import org.jboss.tools.usage.tracker.internal.UsagePluginLogger;
import org.osgi.service.prefs.BackingStoreException;
/**
@@ -24,7 +25,8 @@
public static void setEnabled(boolean enabled) {
UsageReportPreferencesUtils.getStore().putValue(
- IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_ID, String.valueOf(enabled));
+ IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_ID, String.valueOf(enabled));
+ save();
}
public static boolean isEnabled() {
@@ -35,21 +37,24 @@
public static boolean isAskUser() {
return UsageReportPreferencesUtils.getPreferences().getBoolean(
- IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_ID,
+ IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_ID,
IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_DEFAULTVALUE);
}
public static void setAskUser(boolean askUser) {
+ UsageReportPreferencesUtils.getStore().putValue(IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_ID,
+ String.valueOf(askUser));
+ save();
+ }
+
+ private static void save() {
try {
- IEclipsePreferences preferences = UsageReportPreferencesUtils.getPreferences();
- preferences.putBoolean(IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_ID, askUser);
- preferences.flush();
- } catch (BackingStoreException e) {
- JBossToolsUsageActivator.getDefault().getLog().log(
- StatusUtils.getErrorStatus(JBossToolsUsageActivator.PLUGIN_ID,
- ReportingMessages.UsageReport_Error_SavePreferences, e,
- IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_ID));
+ UsageReportPreferencesUtils.getStore().save();
+ } catch (IOException e) {
+ new UsagePluginLogger(JBossToolsUsageActivator.getDefault()).error(
+ ReportingMessages.UsageReport_Error_SavePreferences);
}
+
}
public static void flush() throws BackingStoreException {
Modified: branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReport.java
===================================================================
--- branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReport.java 2010-11-30 09:58:35 UTC (rev 27018)
+++ branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReport.java 2010-11-30 10:01:15 UTC (rev 27019)
@@ -19,7 +19,6 @@
import org.eclipse.jface.window.Window;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.progress.UIJob;
-import org.jboss.tools.common.log.ILoggingAdapter;
import org.jboss.tools.usage.googleanalytics.GoogleAnalyticsUrlStrategy;
import org.jboss.tools.usage.googleanalytics.IJBossToolsEclipseEnvironment;
import org.jboss.tools.usage.http.HttpGetRequest;
@@ -33,7 +32,6 @@
import org.jboss.tools.usage.tracker.internal.SuffixFocusPoint;
import org.jboss.tools.usage.tracker.internal.Tracker;
import org.jboss.tools.usage.tracker.internal.UsagePluginLogger;
-import org.jboss.tools.usage.util.StatusUtils;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.service.prefs.BackingStoreException;
@@ -48,13 +46,14 @@
private IJBossToolsEclipseEnvironment eclipseEnvironment;
+ UsagePluginLogger logger = new UsagePluginLogger(JBossToolsUsageActivator.getDefault());
+
public UsageReport() throws InvalidSyntaxException {
eclipseEnvironment = JBossToolsUsageActivator.getDefault().getJBossToolsEclipseEnvironment();
focusPoint = new SuffixFocusPoint("tools", eclipseEnvironment.getJBossToolsVersion()) //$NON-NLS-1$
.setChild(new FocusPoint("usage") //$NON-NLS-1$
.setChild(new FocusPoint("action") //$NON-NLS-1$
.setChild(new FocusPoint("wsstartup")))); //$NON-NLS-1$
-
globalSettings = new GlobalUsageSettings(JBossToolsUsageActivator
.getDefault());
}
@@ -78,9 +77,7 @@
try {
UsageReportPreferences.flush();
} catch (BackingStoreException e) {
- IStatus status = StatusUtils.getErrorStatus(JBossToolsUsageActivator.PLUGIN_ID,
- ReportingMessages.UsageReport_Error_SavePreferences, e);
- JBossToolsUsageActivator.getDefault().getLog().log(status);
+ logger.error(ReportingMessages.UsageReport_Error_SavePreferences);
}
}
@@ -91,11 +88,10 @@
private void doReport() {
if (UsageReportPreferences.isEnabled()) {
IURLBuildingStrategy urlBuildingStrategy = new GoogleAnalyticsUrlStrategy(eclipseEnvironment);
- ILoggingAdapter loggingAdapter = new UsagePluginLogger(JBossToolsUsageActivator.getDefault());
ITracker tracker = new Tracker(
urlBuildingStrategy
- , new HttpGetRequest(eclipseEnvironment.getUserAgent(), loggingAdapter)
- , loggingAdapter);
+ , new HttpGetRequest(eclipseEnvironment.getUserAgent(), logger)
+ , logger);
tracker.trackAsynchronously(focusPoint);
}
}
Modified: branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReportDispatcher.java
===================================================================
--- branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReportDispatcher.java 2010-11-30 09:58:35 UTC (rev 27018)
+++ branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReportDispatcher.java 2010-11-30 10:01:15 UTC (rev 27019)
@@ -10,12 +10,10 @@
******************************************************************************/
package org.jboss.tools.usage.internal.reporting;
-import org.eclipse.core.runtime.IStatus;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IStartup;
import org.jboss.tools.usage.internal.JBossToolsUsageActivator;
-import org.jboss.tools.usage.util.LoggingUtils;
-import org.jboss.tools.usage.util.StatusUtils;
+import org.jboss.tools.usage.tracker.internal.UsagePluginLogger;
/**
* @author Andre Dieitsheim
@@ -29,8 +27,7 @@
try {
new UsageReport().report();
} catch (Exception e) {
- IStatus status = StatusUtils.getErrorStatus(JBossToolsUsageActivator.PLUGIN_ID, "could not start usage reporting", e);
- LoggingUtils.log(status, JBossToolsUsageActivator.getDefault());
+ new UsagePluginLogger(JBossToolsUsageActivator.getDefault()).error("could not start usage reporting");
}
}
});
Modified: branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/tracker/internal/Tracker.java
===================================================================
--- branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/tracker/internal/Tracker.java 2010-11-30 09:58:35 UTC (rev 27018)
+++ branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/tracker/internal/Tracker.java 2010-11-30 10:01:15 UTC (rev 27019)
@@ -20,7 +20,6 @@
import java.io.UnsupportedEncodingException;
import java.text.MessageFormat;
-import org.jboss.tools.common.log.ILoggingAdapter;
import org.jboss.tools.usage.http.IHttpGetRequest;
import org.jboss.tools.usage.tracker.IFocusPoint;
import org.jboss.tools.usage.tracker.ITracker;
@@ -37,21 +36,21 @@
private IURLBuildingStrategy urlBuildingStrategy = null;
private IHttpGetRequest httpRequest;
- private ILoggingAdapter loggingAdapter;
+ private UsagePluginLogger logger;
- public Tracker(IURLBuildingStrategy urlBuildingStrategy, IHttpGetRequest httpGetRequest, ILoggingAdapter loggingAdapter) {
+ public Tracker(IURLBuildingStrategy urlBuildingStrategy, IHttpGetRequest httpGetRequest, UsagePluginLogger loggingAdapter) {
this.httpRequest = httpGetRequest;
- this.loggingAdapter = loggingAdapter;
+ this.logger = loggingAdapter;
this.urlBuildingStrategy = urlBuildingStrategy;
}
public void trackSynchronously(IFocusPoint focusPoint) {
- loggingAdapter
+ logger
.debug(MessageFormat.format(TrackerMessages.Tracker_Synchronous, focusPoint.getTitle()));
try {
httpRequest.request(getTrackingUrl(focusPoint));
} catch (Exception e) {
- loggingAdapter.error(MessageFormat.format(TrackerMessages.Tracker_Error, e.getMessage()));
+ logger.error(MessageFormat.format(TrackerMessages.Tracker_Error, e.getMessage()));
}
}
@@ -60,7 +59,7 @@
}
public void trackAsynchronously(IFocusPoint focusPoint) {
- loggingAdapter.debug(MessageFormat
+ logger.debug(MessageFormat
.format(TrackerMessages.Tracker_Asynchronous, focusPoint.getTitle()));
new Thread(new TrackingRunnable(focusPoint)).start();
}
@@ -76,7 +75,7 @@
try {
httpRequest.request(getTrackingUrl(focusPoint));
} catch (Exception e) {
- loggingAdapter.error(MessageFormat.format(TrackerMessages.Tracker_Error, e.getMessage()));
+ logger.error(MessageFormat.format(TrackerMessages.Tracker_Error, e.getMessage()));
}
}
}
Modified: branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/tracker/internal/UsagePluginLogger.java
===================================================================
--- branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/tracker/internal/UsagePluginLogger.java 2010-11-30 09:58:35 UTC (rev 27018)
+++ branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/tracker/internal/UsagePluginLogger.java 2010-11-30 10:01:15 UTC (rev 27019)
@@ -10,21 +10,48 @@
******************************************************************************/
package org.jboss.tools.usage.tracker.internal;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Plugin;
-import org.jboss.tools.common.log.PluginLogger;
-import org.jboss.tools.usage.util.LoggingUtils;
+import org.eclipse.core.runtime.Status;
/**
* @author Andre Dietisheim
- *
*/
-public class UsagePluginLogger extends PluginLogger {
+public class UsagePluginLogger {
+ private Plugin plugin;
+
public UsagePluginLogger(Plugin plugin) {
- super(plugin);
+ this.plugin = plugin;
}
+ public void error(String message) {
+ log(IStatus.ERROR, message);
+ }
+
+ public void debug(String message) {
+ log(IStatus.INFO, message);
+ }
+
+ private void log(int severity, String message) {
+ if (!isTracingEnabled()) {
+ return;
+ }
+
+ if (plugin != null) {
+ IStatus status = new Status(severity, plugin.getBundle().getSymbolicName(), message);
+ plugin.getLog().log(status);
+ }
+ }
+
+
protected boolean isTracingEnabled() {
- return LoggingUtils.isPluginTracingEnabled(getPlugin());
+ Plugin plugin = getPlugin();
+ return plugin != null && plugin.isDebugging();
}
+
+ protected Plugin getPlugin() {
+ return plugin;
+ }
+
}
Deleted: branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/LoggingUtils.java
===================================================================
--- branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/LoggingUtils.java 2010-11-30 09:58:35 UTC (rev 27018)
+++ branches/jbosstools-3.2.0.Beta2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/LoggingUtils.java 2010-11-30 10:01:15 UTC (rev 27019)
@@ -1,31 +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.util;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * @author Andre Dietisheim
- */
-public class LoggingUtils {
-
- public static boolean isPluginTracingEnabled(Plugin plugin) {
- return plugin != null && plugin.isDebugging();
- }
-
- public static void log(IStatus status, Plugin plugin) {
- if (status.getSeverity() == IStatus.INFO && !isPluginTracingEnabled(plugin)) {
- return;
- }
- plugin.getLog().log(status);
- }
-}
Modified: branches/jbosstools-3.2.0.Beta2/usage/tests/org.jboss.tools.usage.test/JBoss Developer Studio Usage Reporter.launch
===================================================================
--- branches/jbosstools-3.2.0.Beta2/usage/tests/org.jboss.tools.usage.test/JBoss Developer Studio Usage Reporter.launch 2010-11-30 09:58:35 UTC (rev 27018)
+++ branches/jbosstools-3.2.0.Beta2/usage/tests/org.jboss.tools.usage.test/JBoss Developer Studio Usage Reporter.launch 2010-11-30 10:01:15 UTC (rev 27019)
@@ -11,7 +11,7 @@
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBoss Developer Studio Usage Reporter"/>
<booleanAttribute key="default" value="false"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.common.text.xml,org.jboss.tools.common.meta.ui,org.jboss.tools.common,org.jboss.tools.common.verification.ui.test,org.jboss.tools.common.projecttemplates,org.jboss.tools.common.el.core,org.jboss.tools.common.verification.ui,org.mozilla.xulrunner.gtk.linux.x86,org.jboss.tools.common.gef,org.mozilla.xulrunner.carbon.macosx,org.jboss.tools.common.test,org.jboss.tools.common.verification.test,org.jboss.tools.common.verification,org.jboss.tools.common.model,org.jboss.tools.gwt.ui,org.jboss.tools.common.model.ui.capabilities,org.jboss.tools.common.resref.core,org.mozilla.xulrunner.cocoa.macosx,org.jboss.tools.common.ui,org.mozilla.xulrunner.gtk.linux.x86_64,org.jboss.tools.common.el.ui,org.mozilla.xulrunner.win32.win32.x86,org.jboss.tools.usage.test,org.jboss.tools.common.text.ext,org.jboss.tools.gwt.core,org.jboss.tools.common.resref.ui,org.jboss.tools.common.el.core.test,org.jboss.tools.common.model.ui.t!
est,org.mozilla.xpcom,org.jboss.tools.tests,org.jboss.tools.common.model.ui,org.jboss.tools.common.model.test"/>
+<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.common,org.jboss.tools.usage.test"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../runtime-New_configuration(1)"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
@@ -23,8 +23,8 @@
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx1024m"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="com.jboss.jbds.product.product"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.ds@default:true,org.eclipse.core.runtime@default:true,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.ui.intro@default:default,org.eclipse.osgi@-1:true,org.eclipse.core.jobs@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.osgi.services@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.apache.lucene.analysis@default:default,javax.servlet.jsp@default:default,org.eclipse.core.net@default:default,org.eclipse.core.variables@default:default,org.eclipse.jface.text@default:default,org.eclipse.ecf@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.core.contenttype@default:default,org.apache.commons.el@default:default,org.eclipse.equinox.registry@default:default,org.apache.lucene@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf.filetransfer@default:default,jav!
ax.mail@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.util@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.help@default:default,javax.activation@default:default,org.eclipse.text@default:default,org.mortbay.jetty.util@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.equinox.app@default:default,org.eclipse.jface@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.help.base@default:default,org.eclipse.core.resources@default:default,org.apache.jasper@default:default,org.eclipse.core.expressions@default:default,com.ibm.icu@default:default,org.apache.!
ant@default:default,org.eclipse.swt@default:default,org.eclips!
e.core.r
untime.compatibility.registry@default:false,org.eclipse.core.filesystem@default:default,org.mortbay.jetty.server@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.security@default:default,org.eclipse.help.ui@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ant.core@default:default,org.eclipse.ui.views@default:default,javax.servlet@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.commands@default:default,org.eclipse.ui.forms@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ui@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.epp.usagedata.recording@default:default,org.eclipse.epp.usagedata.gathering@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.usage@default:default,com.jboss.jbds.usage.branding@default:default,org.eclipse.epp.usagedata.ui@default:default,org.jboss.tools.deltacloud.ui@default:default,org.jboss.tools.deltacloud.docs@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.core.jobs@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.osgi.services@default:default,org.apache.commons.el@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.views@default:default,org.apache.lucene@default:default,org.apache.lucene.analysis@default:default,org.apache.ant@default:default,org.apache.jasper@default:default,org.eclipse.equinox.app@default:default,org.eclipse.core.databinding@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.security@default:default,javax.activation@default:default,org.eclipse.ui@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclip!
se.core.net@default:default,javax.servlet@default:default,org.eclipse.core.expressions@default:default,com.ibm.icu@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,javax.mail@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.ds@default:true,org.eclipse.jface@default:default,org.eclipse.swt@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.runtime@default:true,org.eclipse.help.base@default:default,javax.servlet.jsp@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.mortbay.jetty.util@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.p2.metadata@default:de!
fault,org.eclipse.ui.ide.application@default:default,org.eclip!
se.help.
ui@default:default,org.eclipse.equinox.common@2:true,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ecf@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.core.contenttype@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.jface.text@default:default,org.eclipse.text@default:default,org.eclipse.equinox.preferences@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.equinox.util@default:default,org.mortbay.jetty.server@default:default,org.eclipse.ant.core@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.help@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default,org.jboss.tools.deltacloud.ui@default:default,org.jboss.tools.deltacloud.test@default:default,org.jboss.tools.deltacloud.core@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
<booleanAttribute key="tracing" value="false"/>
Modified: branches/jbosstools-3.2.0.Beta2/usage/tests/org.jboss.tools.usage.test/JBoss Tools Usage Reporter.launch
===================================================================
--- branches/jbosstools-3.2.0.Beta2/usage/tests/org.jboss.tools.usage.test/JBoss Tools Usage Reporter.launch 2010-11-30 09:58:35 UTC (rev 27018)
+++ branches/jbosstools-3.2.0.Beta2/usage/tests/org.jboss.tools.usage.test/JBoss Tools Usage Reporter.launch 2010-11-30 10:01:15 UTC (rev 27019)
@@ -6,14 +6,14 @@
<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="clearConfig" value="false"/>
+<booleanAttribute key="clearws" value="false"/>
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBoss Tools Usage Reporter"/>
<booleanAttribute key="default" value="false"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.common.text.xml,org.jboss.tools.common.meta.ui,org.jboss.tools.common,org.jboss.tools.common.verification.ui.test,org.jboss.tools.common.projecttemplates,org.jboss.tools.common.el.core,com.jboss.jbds.usage.branding,org.jboss.tools.common.verification.ui,org.mozilla.xulrunner.gtk.linux.x86,org.jboss.tools.common.gef,org.mozilla.xulrunner.carbon.macosx,org.jboss.tools.common.test,org.jboss.tools.common.verification.test,org.jboss.tools.common.verification,org.jboss.tools.common.model,org.jboss.tools.gwt.ui,org.jboss.tools.common.model.ui.capabilities,org.jboss.tools.common.resref.core,org.mozilla.xulrunner.cocoa.macosx,org.jboss.tools.common.ui,org.mozilla.xulrunner.gtk.linux.x86_64,org.jboss.tools.common.el.ui,org.mozilla.xulrunner.win32.win32.x86,org.jboss.tools.usage.test,org.jboss.tools.common.text.ext,org.jboss.tools.gwt.core,org.jboss.tools.common.resref.ui,org.jboss.tools.common.el.core.test,org!
.jboss.tools.common.model.ui.test,org.mozilla.xpcom,org.jboss.tools.tests,org.jboss.tools.common.model.ui,org.jboss.tools.common.model.test"/>
+<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.usage.test"/>
<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../runtime-New_configuration(1)"/>
+<stringAttribute key="location" value="${workspace_loc}/../runtime-usage"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
@@ -23,8 +23,8 @@
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx1024m"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.ds@default:true,org.eclipse.core.runtime@default:true,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.osgi@-1:true,org.eclipse.core.jobs@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.osgi.services@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.apache.lucene.analysis@default:default,javax.servlet.jsp@default:default,org.eclipse.core.net@default:default,org.eclipse.core.variables@default:default,org.eclipse.jface.text@default:default,org.eclipse.ecf@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.hamcrest.core@default:default,org.eclipse.core.contenttype@default:default,org.apache.commons.el@default:default,org.eclipse.equinox.registry@default:default,org.apache.lucene@default:default,org.eclipse.ecf.ssl@default:false,org.apache.commons.logging*1.0.4.v201005080501@defa!
ult:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.util@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.sdk@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.help@default:default,org.eclipse.text@default:default,org.mortbay.jetty.util@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.equinox.app@default:default,org.eclipse.jface@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.help.base@default:default,org.eclipse.core.reso!
urces@default:default,org.apache.jasper@default:default,org.ec!
lipse.co
re.expressions@default:default,com.ibm.icu@default:default,org.apache.ant@default:default,org.eclipse.swt@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.filesystem@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.mortbay.jetty.server@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.security@default:default,org.eclipse.help.ui@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.update.configurator@3:true,org.eclipse.ant.core@default:default,org.eclipse.ui.views@default:default,javax.servlet@default:default,org.e!
clipse.core.databinding.property@default:default,org.junit4@default:default,org.eclipse.core.commands@default:default,org.eclipse.ui.forms@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ui@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.epp.usagedata.recording@default:default,org.eclipse.epp.usagedata.gathering@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.usage@default:default,org.eclipse.epp.usagedata.ui@default:default,org.jboss.tools.deltacloud.ui@default:default,org.jboss.tools.deltacloud.docs@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.debug.core@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.osgi.util@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.osgi.services@default:default,org.eclipse.wst.validation@default:default,org.apache.commons.el@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.ui.forms@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.sdk@default:default,org.eclipse.ui.views@default:default,org.apache.lucene@default:default,org.eclipse.ui.navigator.resources@default:default,org.apache.lucene.analysis@default:default,org.apache.ant@default:default,com.instantiations.d!
esigner.jdt.fragment@default:false,org.eclipse.jdt.core@default:default,org.hamcrest.core@default:default,org.apache.jasper@default:default,org.eclipse.equinox.app@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.emf.ecore@default:default,org.eclipse.search@default:default,org.eclipse.jdt.core.manipulation@default:default,org.apache.xerces@default:default,org.eclipse.core.databinding@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.wst.xml.core@default:default,org.eclipse.ui.console@default:default,org.apache.xml.serializer@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.emf.edit@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.equinox.security@default:default,org.eclipse.ui@default:default,org.eclipse.equinox.registry@default:default,org.junit4@default:default,org.eclipse.emf.ecore.xmi@default:default,o!
rg.eclipse.ui.ide@default:default,org.eclipse.core.resources@d!
efault:d
efault,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.net@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,javax.servlet@default:default,org.eclipse.core.expressions@default:default,com.ibm.icu@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.team.core@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.debug.ui@default:default,org.eclipse.osgi@-1:true,org.eclipse.rse.services@default:default,org.eclipse.equinox.ds@default:true,org.eclipse.jface@default:default,org.eclipse.swt@default:default,org.eclipse.ui.editors@default:default,org.eclipse.rse.core@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.runtime@default:true,org.eclipse.team.ui@default:default,org.eclipse.jdt.ui@default:d!
efault,org.eclipse.help.base@default:default,javax.servlet.jsp@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.mortbay.jetty.util@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.update.configurator@3:true,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.help.ui@default:default,org.eclipse.equinox.common@2:t!
rue,org.eclipse.ecf.filetransfer@default:default,org.eclipse.e!
quinox.p
2.metadata.repository@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ecf@default:default,org.eclipse.emf.common@default:default,org.apache.xml.resolver@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.core.contenttype@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.jface.text@default:default,org.eclipse.text@default:default,javax.xml@default:default,org.eclipse.compare@default:default,org.eclipse.equinox.preferences@default:default,org!
.jboss.tools.xulrunner.initializer@default:false,org.eclipse.wst.sse.core@default:default,org.eclipse.equinox.util@default:default,org.mortbay.jetty.server@default:default,org.eclipse.jem.util@default:default,org.eclipse.ant.core@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.help@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.common@default:default,org.jboss.tools.usage@default:default,org.jboss.tools.deltacloud.ui@default:default,org.jboss.tools.deltacloud.test@default:default,org.jboss.tools.deltacloud.core@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
<booleanAttribute key="tracing" value="true"/>
Modified: branches/jbosstools-3.2.0.Beta2/usage/tests/org.jboss.tools.usage.test/UsageTestSuite.launch
===================================================================
--- branches/jbosstools-3.2.0.Beta2/usage/tests/org.jboss.tools.usage.test/UsageTestSuite.launch 2010-11-30 09:58:35 UTC (rev 27018)
+++ branches/jbosstools-3.2.0.Beta2/usage/tests/org.jboss.tools.usage.test/UsageTestSuite.launch 2010-11-30 10:01:15 UTC (rev 27019)
@@ -12,7 +12,7 @@
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
<booleanAttribute key="default" value="false"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.epp.usagedata.recording,org.jboss.tools.deltacloud.core,org.eclipse.epp.usagedata.gathering,org.mozilla.xulrunner.cocoa.macosx,org.jboss.tools.deltacloud.docs,org.mozilla.xulrunner.gtk.linux.x86_64,org.jboss.tools.deltacloud.test,org.mozilla.xulrunner.win32.win32.x86,com.jboss.jbds.usage.branding,org.mozilla.xulrunner.gtk.linux.x86,org.eclipse.epp.usagedata.ui,org.mozilla.xulrunner.carbon.macosx,org.mozilla.xpcom,org.jboss.tools.deltacloud.ui,org.jboss.tools.tests,org.jruby.jruby"/>
+<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.deltacloud.core,org.jboss.tools.deltacloud.ui,org.jboss.tools.deltacloud.test"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
@@ -37,7 +37,7 @@
<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.junit4@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.equinox.app@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ant.core@default:default,org.eclipse.ui.editors@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.ui@default:default,org.eclipse.wst.xml.core@default:default,org.apache.xml.resolver@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.wst.validation@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.jdt.ui@defaul!
t:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.net@default:default,org.eclipse.jem.util@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ecf@default:default,org.eclipse.swt@default:default,org.eclipse.equinox.common@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.jface.text@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.core.expressions@default:default,org.eclipse.emf.common@default:default,javax.servlet@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.osgi.util@default:default,org.eclipse.wst.common.frameworks@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.equinox.p2.core@default:default,org.eclipse.ecf.provider.fi!
letransfer.ssl@default:false,javax.xml@default:default,org.ecl!
ipse.jfa
ce@default:default,org.eclipse.emf.edit@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.jdt.compiler.apt@default:false,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.ui.views@default:default,org.eclipse.compare.core@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.ui.forms@default:default,org.apache.xerces@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.team.ui@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.p2.engine@default:defaul!
t,org.eclipse.jdt.launching@default:default,org.eclipse.search@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.console@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.core.commands@default:default,org.eclipse.core.jobs@default:default,org.eclipse.compare@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.debug.ui@default:default,org.eclipse.core.resources@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.osgi.services@default:default,org.eclipse.wst.common.uriresolver@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.help@default:default,org.eclipse.team.core@default:default,org.eclipse.text@default:default,org.eclipse.osgi,org.eclipse.core.filesystem@default:default,org.eclipse.debug.core@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox!
.security@default:default,org.apache.xml.serializer@default:de!
fault,co
m.ibm.icu@default:default,org.hamcrest.core@default:default,org.eclipse.jdt.core@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.variables@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.concurrent@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.debug.core@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.osgi.util@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.osgi.services@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.ui.forms@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.navigator.resources@default:default,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.jdt.core@default:default,org.hamcrest.core@default:default,org.eclipse.equinox.app@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.emf.ecore@default:default,org.ec!
lipse.search@default:default,org.eclipse.jdt.core.manipulation@default:default,org.apache.xerces@default:default,org.eclipse.core.databinding@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.wst.xml.core@default:default,org.eclipse.ui.console@default:default,org.apache.xml.serializer@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.emf.edit@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.equinox.security@default:default,org.eclipse.ui@default:default,org.eclipse.equinox.registry@default:default,org.junit4@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.resources@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.net@default:default,org.apache.commons.httpclient*3.1.0.v201005080502!
@default:default,javax.servlet@default:default,org.eclipse.cor!
e.expres
sions@default:default,com.ibm.icu@default:default,org.eclipse.team.core@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.debug.ui@default:default,org.eclipse.osgi@-1:true,org.eclipse.jface@default:default,org.eclipse.swt@default:default,org.eclipse.ui.editors@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.runtime@default:true,org.eclipse.team.ui@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.ltk.ui.refactoring@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.core.variables@default:defaul!
t,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.equinox.common@2:true,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ecf@default:default,org.eclipse.emf.common@default:default,org.apache.xml.resolver@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.core.contenttype@default:default,org.eclipse.ui.workbench@default:d!
efault,org.eclipse.jface.text@default:default,org.eclipse.text!
@default
:default,javax.xml@default:default,org.eclipse.compare@default:default,org.eclipse.equinox.preferences@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.wst.sse.core@default:default,org.eclipse.jem.util@default:default,org.eclipse.ant.core@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.help@default:default"/>
<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test@default:default,org.jboss.tools.common@default:default,org.jboss.tools.usage@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
Modified: branches/jbosstools-3.2.0.Beta2/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageSettingsTest.java
===================================================================
--- branches/jbosstools-3.2.0.Beta2/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageSettingsTest.java 2010-11-30 09:58:35 UTC (rev 27018)
+++ branches/jbosstools-3.2.0.Beta2/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageSettingsTest.java 2010-11-30 10:01:15 UTC (rev 27019)
@@ -22,6 +22,7 @@
import org.jboss.tools.usage.http.HttpRemotePropertiesProvider;
import org.jboss.tools.usage.http.IPropertiesProvider;
import org.jboss.tools.usage.internal.preferences.GlobalUsageSettings;
+import org.jboss.tools.usage.tracker.internal.UsagePluginLogger;
import org.junit.Test;
/**
@@ -110,7 +111,7 @@
@Override
protected IPropertiesProvider createRemoteMap(String url, char valueDelimiter, Plugin plugin,
String... keys) {
- return new HttpRemotePropertiesProvider(url, valueDelimiter, new SystemOutLogger(), keys) {
+ return new HttpRemotePropertiesProvider(url, valueDelimiter, new UsagePluginLogger(plugin), keys) {
@Override
protected InputStreamReader request(HttpURLConnection urlConnection)
throws UnsupportedEncodingException {
Modified: branches/jbosstools-3.2.0.Beta2/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/HttpRemotePropertiesTest.java
===================================================================
--- branches/jbosstools-3.2.0.Beta2/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/HttpRemotePropertiesTest.java 2010-11-30 09:58:35 UTC (rev 27018)
+++ branches/jbosstools-3.2.0.Beta2/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/HttpRemotePropertiesTest.java 2010-11-30 10:01:15 UTC (rev 27019)
@@ -20,6 +20,7 @@
import org.jboss.tools.usage.http.HttpRemotePropertiesProvider;
import org.jboss.tools.usage.http.IPropertiesProvider;
+import org.jboss.tools.usage.tracker.internal.UsagePluginLogger;
import org.junit.Test;
/**
@@ -55,7 +56,7 @@
final String stringValue, final String anotherValue, char valueDelimiter, String... keys) {
return new HttpRemotePropertiesProvider("http://dummy", valueDelimiter,
- new SystemOutLogger(), keys) {
+ new UsagePluginLogger(JBossToolsUsageTestActivator.getDefault()), keys) {
@Override
protected InputStreamReader request(HttpURLConnection urlConnection)
throws UnsupportedEncodingException {
Modified: branches/jbosstools-3.2.0.Beta2/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java
===================================================================
--- branches/jbosstools-3.2.0.Beta2/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java 2010-11-30 09:58:35 UTC (rev 27018)
+++ branches/jbosstools-3.2.0.Beta2/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java 2010-11-30 10:01:15 UTC (rev 27019)
@@ -100,10 +100,10 @@
}
private UrlRevealingTracker getTracker(IGoogleAnalyticsParameters environment) {
- ILoggingAdapter loggingAdapter = new UsagePluginLogger(JBossToolsUsageTestActivator.getDefault());
+ UsagePluginLogger logger = new UsagePluginLogger(JBossToolsUsageTestActivator.getDefault());
IURLBuildingStrategy urlStrategy = new GoogleAnalyticsUrlStrategy(environment);
- IHttpGetRequest httpGetRequest = new HttpGetRequest(environment.getUserAgent(), loggingAdapter);
- return new UrlRevealingTracker(urlStrategy, httpGetRequest, loggingAdapter);
+ IHttpGetRequest httpGetRequest = new HttpGetRequest(environment.getUserAgent(), logger);
+ return new UrlRevealingTracker(urlStrategy, httpGetRequest, logger);
}
private IFocusPoint createFocusPoint(String childFocusPoint) {
Modified: branches/jbosstools-3.2.0.Beta2/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java
===================================================================
--- branches/jbosstools-3.2.0.Beta2/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-11-30 09:58:35 UTC (rev 27018)
+++ branches/jbosstools-3.2.0.Beta2/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-11-30 10:01:15 UTC (rev 27019)
@@ -14,8 +14,8 @@
import java.io.IOException;
import java.net.HttpURLConnection;
-import org.jboss.tools.common.log.ILoggingAdapter;
import org.jboss.tools.usage.http.HttpGetRequest;
+import org.jboss.tools.usage.tracker.internal.UsagePluginLogger;
import org.junit.Test;
/**
@@ -23,6 +23,8 @@
*/
public class JBossToolsUsageRequestsTest {
+ UsagePluginLogger logger = new UsagePluginLogger(JBossToolsUsageTestActivator.getDefault());
+
// @Ignore
// @Test
// public void testUrl0() throws IOException {
@@ -1780,19 +1782,19 @@
private HttpURLConnection urlConnection;
public TestHttpGetMethod(String userAgentString) {
- this(userAgentString, new SystemOutLogger());
+ this(userAgentString, logger);
}
public TestHttpGetMethod(UserAgentString userAgentString) {
- this(userAgentString.toString(), new SystemOutLogger());
+ this(userAgentString.toString(), logger);
}
public TestHttpGetMethod() {
- super(UserAgentString.DEFAULT.toString(), new SystemOutLogger());
+ super(UserAgentString.DEFAULT.toString(), logger);
}
- public TestHttpGetMethod(String userAgent, ILoggingAdapter loggingAdapter) {
- super(userAgent, loggingAdapter);
+ public TestHttpGetMethod(String userAgent, UsagePluginLogger logger) {
+ super(userAgent, logger);
}
@Override
Modified: branches/jbosstools-3.2.0.Beta2/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UrlRevealingTracker.java
===================================================================
--- branches/jbosstools-3.2.0.Beta2/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UrlRevealingTracker.java 2010-11-30 09:58:35 UTC (rev 27018)
+++ branches/jbosstools-3.2.0.Beta2/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UrlRevealingTracker.java 2010-11-30 10:01:15 UTC (rev 27019)
@@ -14,11 +14,11 @@
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
-import org.jboss.tools.common.log.ILoggingAdapter;
import org.jboss.tools.usage.http.IHttpGetRequest;
import org.jboss.tools.usage.tracker.IFocusPoint;
import org.jboss.tools.usage.tracker.IURLBuildingStrategy;
import org.jboss.tools.usage.tracker.internal.Tracker;
+import org.jboss.tools.usage.tracker.internal.UsagePluginLogger;
/**
* @author Andre Dietisheim
@@ -29,8 +29,8 @@
private Lock lock;
public UrlRevealingTracker(IURLBuildingStrategy urlBuildingStrategy, IHttpGetRequest httpGetRequest,
- ILoggingAdapter loggingAdapter) {
- super(urlBuildingStrategy, httpGetRequest, loggingAdapter);
+ UsagePluginLogger logger) {
+ super(urlBuildingStrategy, httpGetRequest, logger);
lock = new ReentrantLock();
}
14 years
- 1
- 0