JBoss Tools SVN: r25391 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2010-10-01 09:19:53 -0400 (Fri, 01 Oct 2010)
New Revision: 25391
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/plugin.xml
Log:
https://jira.jboss.org/browse/JBIDE-7238 - fixed
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/plugin.xml
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/plugin.xml 2010-10-01 12:53:06 UTC (rev 25390)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/plugin.xml 2010-10-01 13:19:53 UTC (rev 25391)
@@ -638,7 +638,7 @@
description="Query"
name="query_string"
type="string"
- value=""/>
+ value="from $fullClassName"/>
</exporter>
</extension>
<extension
13 years, 7 months
JBoss Tools SVN: r25390 - trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-10-01 08:53:06 -0400 (Fri, 01 Oct 2010)
New Revision: 25390
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/CyclicDependingProjectsTest.java
Log:
JBIDE-6535
https://jira.jboss.org/browse/JBIDE-6535
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/CyclicDependingProjectsTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/CyclicDependingProjectsTest.java 2010-10-01 11:03:33 UTC (rev 25389)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/CyclicDependingProjectsTest.java 2010-10-01 12:53:06 UTC (rev 25390)
@@ -39,7 +39,7 @@
provider1 = new TestProjectProvider(BUNDLE,"/projects/CycleTest1" , "CycleTest1", true);
project1 = provider1.getProject();
provider2 = new TestProjectProvider(BUNDLE,"/projects/CycleTest2" , "CycleTest2", true);
- project2 = provider1.getProject();
+ project2 = provider2.getProject();
boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
JobUtils.waitForIdle();
13 years, 7 months
JBoss Tools SVN: r25389 - trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-10-01 07:03:33 -0400 (Fri, 01 Oct 2010)
New Revision: 25389
Modified:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/PreferencesMessages.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferencePage.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/messages.properties
Log:
[JBDS-1338] removed unneeded JBDS error message
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/PreferencesMessages.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/PreferencesMessages.java 2010-10-01 10:49:44 UTC (rev 25388)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/PreferencesMessages.java 2010-10-01 11:03:33 UTC (rev 25389)
@@ -31,17 +31,16 @@
public static String UsageReportPreferencePage_ProductVersion;
public static String UsageReportPreferencePage_ScreenColors;
public static String UsageReportPreferencePage_ScreenResolution;
+ public static String UsageReportPreferencePage_Error_Saving;
public static String UsageReportPreferencePage_Description;
public static String UsageReportPreferencePage_AllowReporting;
- public static String UsageReportPreferencePage_Error_Saving;
public static String GlobalUsageSettings_RemoteProps_URL;
public static String UsageReportPreferencePage_Description_JBDS;
public static String UsageReportPreferencePage_AllowReporting_JBDS;
- public static String UsageReportPreferencePage_Error_Saving_JBDS;
-
+
public static String GlobalUsageSettings_RemoteProps_URL_JBDS;
static {
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferencePage.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferencePage.java 2010-10-01 10:49:44 UTC (rev 25388)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferencePage.java 2010-10-01 11:03:33 UTC (rev 25389)
@@ -183,20 +183,12 @@
UsageReportPreferences.flush();
} catch (BackingStoreException e) {
IStatus status = StatusUtils.getErrorStatus(JBossToolsUsageActivator.PLUGIN_ID,
- getPrefsSaveErrorMessage(), e);
+ PreferencesMessages.UsageReportPreferencePage_Error_Saving, e);
JBossToolsUsageActivator.getDefault().getLog().log(status);
}
return super.performOk();
}
- private String getPrefsSaveErrorMessage() {
- if (JBDSUtils.isJBDS()) {
- return PreferencesMessages.UsageReportPreferencePage_Error_Saving_JBDS;
- } else {
- return PreferencesMessages.UsageReportPreferencePage_Error_Saving;
- }
- }
-
private String getFormattedDate(String timeStamp) {
try {
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/messages.properties
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/messages.properties 2010-10-01 10:49:44 UTC (rev 25388)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/messages.properties 2010-10-01 11:03:33 UTC (rev 25389)
@@ -24,6 +24,5 @@
# this is a hack to get into the code freeze deadline. this stuff will be removed with a proper implementatino
UsageReportPreferencePage_Description_JBDS=Preference page with options for anonymous usage data reporting.\nUsage data is used for statistical matters only.
UsageReportPreferencePage_AllowReporting_JBDS=&Please allow Red Hat Inc. to receive anonymous usage\n statistics for this JBoss Developer Studio installation.
-UsageReportPreferencePage_Error_Saving_JBDS=Could not save the preferences.
GlobalUsageSettings_RemoteProps_URL_JBDS=http://devstudio.jboss.com/usage...
13 years, 7 months
JBoss Tools SVN: r25388 - in trunk/usage/tests/org.jboss.tools.usage.test: src/org/jboss/tools/usage/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-10-01 06:49:44 -0400 (Fri, 01 Oct 2010)
New Revision: 25388
Added:
trunk/usage/tests/org.jboss.tools.usage.test/LinuxSystemTest.launch
Removed:
trunk/usage/tests/org.jboss.tools.usage.test/LinuxDistroTest.launch
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/LinuxDistroTest.java
Log:
[JBIDE-7208] Test-class renamed
Deleted: trunk/usage/tests/org.jboss.tools.usage.test/LinuxDistroTest.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/LinuxDistroTest.launch 2010-10-01 10:47:14 UTC (rev 25387)
+++ trunk/usage/tests/org.jboss.tools.usage.test/LinuxDistroTest.launch 2010-10-01 10:49:44 UTC (rev 25388)
@@ -1,48 +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="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.common.text.ext,org.jboss.tools.gwt.core,org.jboss.tools.common.resref.ui,org.jboss.tools.common.model.ui.test,org.jboss.tools.common.el.core.test,org.mozilla.xpcom,org.j!
boss.tools.common.model.ui,org.jboss.tools.tests,org.jboss.tools.common.model.test"/>
-<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/LinuxDistroTest.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.LinuxDistroTest"/>
-<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.equinox.common@2:true,org.eclipse.core.commands@default:default,org.eclipse.core.databinding@default:default,org.eclipse.help@default:default,org.eclipse.core.jobs@default:default,org.eclipse.ui@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.core.databinding.property@default:default,org.hamcrest.core@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.app@default:default,org.eclipse.jface@default:default,org.eclipse.swt@default:default,org.eclipse.osgi@-1:true,com.ibm.icu@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.core.databinding.observable@default:default,javax.servlet@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.osgi.services@default:default,org.eclipse.jface.databinding!
@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.registry@default:default,org.junit4@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.preferences@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test@default:default,org.jboss.tools.usage@default:default"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="false"/>
-</launchConfiguration>
Added: trunk/usage/tests/org.jboss.tools.usage.test/LinuxSystemTest.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/LinuxSystemTest.launch (rev 0)
+++ trunk/usage/tests/org.jboss.tools.usage.test/LinuxSystemTest.launch 2010-10-01 10:49:44 UTC (rev 25388)
@@ -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.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.common.text.ext,org.jboss.tools.gwt.core,org.jboss.tools.common.resref.ui,org.jboss.tools.common.model.ui.test,org.jboss.tools.common.el.core.test,org.mozilla.xpcom,org.j!
boss.tools.common.model.ui,org.jboss.tools.tests,org.jboss.tools.common.model.test"/>
+<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/LinuxSystemTest.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.LinuxSystemTest"/>
+<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.equinox.common@2:true,org.eclipse.core.commands@default:default,org.eclipse.core.databinding@default:default,org.eclipse.help@default:default,org.eclipse.core.jobs@default:default,org.eclipse.ui@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.core.databinding.property@default:default,org.hamcrest.core@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.app@default:default,org.eclipse.jface@default:default,org.eclipse.swt@default:default,org.eclipse.osgi@-1:true,com.ibm.icu@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.core.databinding.observable@default:default,javax.servlet@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.osgi.services@default:default,org.eclipse.jface.databinding!
@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.registry@default:default,org.junit4@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.preferences@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test@default:default,org.jboss.tools.usage@default:default"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<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/LinuxSystemTest.launch
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/LinuxDistroTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/LinuxDistroTest.java 2010-10-01 10:47:14 UTC (rev 25387)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/LinuxDistroTest.java 2010-10-01 10:49:44 UTC (rev 25388)
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * 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 org.jboss.tools.usage.googleanalytics.eclipse.LinuxSystem;
-import org.jboss.tools.usage.test.fakes.LinuxSystemFake;
-import org.junit.Test;
-
-public class LinuxDistroTest {
-
- @Test
- public void canExtractFedoraVersion() {
- LinuxSystem linuxSystem = new LinuxSystemFake(LinuxSystem.INSTANCE.FEDORA.getReleaseFilePath(), "Fedora release 13 (Goddard)");
- assertEquals("Fedora 13", linuxSystem.getDistroNameAndVersion());
- }
-
- @Test
- public void canExtractUbuntuVersion() {
- LinuxSystem linuxSystem = new LinuxSystemFake(LinuxSystem.INSTANCE.UBUNTU.getReleaseFilePath(),
- "DISTRIB_ID=Ubuntu\nDISTRIB_RELEASE=9.04\nDISTRIB_CODENAME=jaunty\nDISTRIB_DESCRIPTION=\"Ubuntu 9.04\"");
- assertEquals("Ubuntu 9.04", linuxSystem.getDistroNameAndVersion());
- }
-
- @Test
- public void canExtractRedHatVersion() {
- LinuxSystem linuxSystem = new LinuxSystemFake(LinuxSystem.INSTANCE.REDHAT.getReleaseFilePath(),
- "Red Hat Enterprise Linux Workstation release 6.0 (Santiago)");
- assertEquals("RedHat 6.0", linuxSystem.getDistroNameAndVersion());
- }
-
- @Test
- public void canExtractGentooVersion() {
- LinuxSystem linuxSystem = new LinuxSystemFake(LinuxSystem.INSTANCE.GENTOO.getReleaseFilePath(),
- "Gentoo Base System release 2.0.1");
- assertEquals("Gentoo 2.0.1", linuxSystem.getDistroNameAndVersion());
- }
-
- @Test
- public void canExtractCentOSVersion() {
- LinuxSystem linuxSystem = new LinuxSystemFake(LinuxSystem.INSTANCE.CENTOS.getReleaseFilePath(),
- "CentOS release 5.3 (Final)");
- assertEquals("CentOS 5.3", linuxSystem.getDistroNameAndVersion());
- }
-}
13 years, 7 months
JBoss Tools SVN: r25387 - trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-10-01 06:47:14 -0400 (Fri, 01 Oct 2010)
New Revision: 25387
Modified:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java
Log:
[JBIDE-7231] added delimiter to cookie
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java 2010-10-01 10:09:56 UTC (rev 25386)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java 2010-10-01 10:47:14 UTC (rev 25387)
@@ -145,7 +145,8 @@
.appendTo(builder);
new GoogleAnalyticsCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_KEYWORD,
- googleParameters.getKeyword())
+ googleParameters.getKeyword(),
+ IGoogleAnalyticsParameters.PIPE)
.appendTo(builder);
/**
@@ -158,10 +159,11 @@
new GoogleAnalyticsCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_USERDEFINED,
getRandomNumber()
+ IGoogleAnalyticsParameters.DOT
- + googleParameters.getUserDefined())
+ + googleParameters.getUserDefined(),
+ ' ')
.appendTo(builder);
-// builder.append(IGoogleAnalyticsParameters.SEMICOLON);
+ builder.append(IGoogleAnalyticsParameters.SEMICOLON);
return HttpEncodingUtils.checkedEncodeUtf8(builder.toString());
}
13 years, 7 months
JBoss Tools SVN: r25386 - trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-10-01 06:09:56 -0400 (Fri, 01 Oct 2010)
New Revision: 25386
Added:
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/LinuxSystemTest.java
Modified:
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java
Log:
[JBIDE-7208] Test-class renamed
Copied: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/LinuxSystemTest.java (from rev 25384, trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/LinuxDistroTest.java)
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/LinuxSystemTest.java (rev 0)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/LinuxSystemTest.java 2010-10-01 10:09:56 UTC (rev 25386)
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * 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 org.jboss.tools.usage.googleanalytics.eclipse.LinuxSystem;
+import org.jboss.tools.usage.test.fakes.LinuxSystemFake;
+import org.junit.Test;
+
+public class LinuxSystemTest {
+
+ @Test
+ public void canExtractFedoraVersion() {
+ LinuxSystem linuxSystem = new LinuxSystemFake(LinuxSystem.INSTANCE.FEDORA.getReleaseFilePath(), "Fedora release 13 (Goddard)");
+ assertEquals("Fedora 13", linuxSystem.getDistroNameAndVersion());
+ }
+
+ @Test
+ public void canExtractUbuntuVersion() {
+ LinuxSystem linuxSystem = new LinuxSystemFake(LinuxSystem.INSTANCE.UBUNTU.getReleaseFilePath(),
+ "DISTRIB_ID=Ubuntu\nDISTRIB_RELEASE=9.04\nDISTRIB_CODENAME=jaunty\nDISTRIB_DESCRIPTION=\"Ubuntu 9.04\"");
+ assertEquals("Ubuntu 9.04", linuxSystem.getDistroNameAndVersion());
+ }
+
+ @Test
+ public void canExtractRedHatVersion() {
+ LinuxSystem linuxSystem = new LinuxSystemFake(LinuxSystem.INSTANCE.REDHAT.getReleaseFilePath(),
+ "Red Hat Enterprise Linux Workstation release 6.0 (Santiago)");
+ assertEquals("RedHat 6.0", linuxSystem.getDistroNameAndVersion());
+ }
+
+ @Test
+ public void canExtractGentooVersion() {
+ LinuxSystem linuxSystem = new LinuxSystemFake(LinuxSystem.INSTANCE.GENTOO.getReleaseFilePath(),
+ "Gentoo Base System release 2.0.1");
+ assertEquals("Gentoo 2.0.1", linuxSystem.getDistroNameAndVersion());
+ }
+
+ @Test
+ public void canExtractCentOSVersion() {
+ LinuxSystem linuxSystem = new LinuxSystemFake(LinuxSystem.INSTANCE.CENTOS.getReleaseFilePath(),
+ "CentOS release 5.3 (Final)");
+ assertEquals("CentOS 5.3", linuxSystem.getDistroNameAndVersion());
+ }
+}
Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/LinuxSystemTest.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-10-01 09:43:11 UTC (rev 25385)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java 2010-10-01 10:09:56 UTC (rev 25386)
@@ -22,7 +22,7 @@
JBossToolsFocusPointTest.class,
GoogleAnalyticsUrlStrategyTest.class,
EclipseUserAgentTest.class,
- LinuxDistroTest.class,
+ LinuxSystemTest.class,
JBossToolsEclipseEnvironmentTest.class,
JBossToolsComponentsTest.class,
HttpRemotePropertiesTest.class,
13 years, 7 months
JBoss Tools SVN: r25385 - trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-10-01 05:43:11 -0400 (Fri, 01 Oct 2010)
New Revision: 25385
Removed:
trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ESBValidatorTestSuite.java
Modified:
trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ESBValidatorAllTests.java
Log:
JBIDE-6085
https://jira.jboss.org/browse/JBIDE-6085
Modified: trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ESBValidatorAllTests.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ESBValidatorAllTests.java 2010-10-01 09:05:37 UTC (rev 25384)
+++ trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ESBValidatorAllTests.java 2010-10-01 09:43:11 UTC (rev 25385)
@@ -24,7 +24,9 @@
public static Test suite() {
TestSuite suite = new TestSuite("ESB Validator Tests");
- suite.addTest(new ESBValidatorTestSetup(ESBValidatorTestSuite.suite()));
+ TestSuite suite2 = new TestSuite("ESB Validator Tests");
+ suite2.addTestSuite(ValidationTest.class);
+ suite.addTest(new ESBValidatorTestSetup(suite2));
return new DisableJavaIndexingSetup(suite);
}
Deleted: trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ESBValidatorTestSuite.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ESBValidatorTestSuite.java 2010-10-01 09:05:37 UTC (rev 25384)
+++ trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ESBValidatorTestSuite.java 2010-10-01 09:43:11 UTC (rev 25385)
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.esb.validator.test;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Viacheslav Kabanovich
- */
-public class ESBValidatorTestSuite extends TestSuite {
-
- public static Test suite() {
- TestSuite suite = new TestSuite("ESB Validator Tests");
- suite.addTestSuite(ValidationTest.class);
- return suite;
- }
-}
\ No newline at end of file
13 years, 7 months
JBoss Tools SVN: r25384 - in trunk/usage/tests/org.jboss.tools.usage.test: src/org/jboss/tools/usage/test and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-10-01 05:05:37 -0400 (Fri, 01 Oct 2010)
New Revision: 25384
Added:
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/LinuxSystemFake.java
Removed:
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/LinuxDistroFake.java
Modified:
trunk/usage/tests/org.jboss.tools.usage.test/JBoss Developer Studio Usage Reporter.launch
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/LinuxDistroTest.java
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/ReportingEclipseEnvironmentFake.java
Log:
[JBIDE-7208] centos detection fixed
Modified: trunk/usage/tests/org.jboss.tools.usage.test/JBoss Developer Studio Usage Reporter.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/JBoss Developer Studio Usage Reporter.launch 2010-10-01 08:59:37 UTC (rev 25383)
+++ trunk/usage/tests/org.jboss.tools.usage.test/JBoss Developer Studio Usage Reporter.launch 2010-10-01 09:05:37 UTC (rev 25384)
@@ -6,7 +6,7 @@
<booleanAttribute key="automaticValidate" value="false"/>
<stringAttribute key="bootstrap" value=""/>
<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="false"/>
+<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/JBoss Developer Studio Usage Reporter"/>
@@ -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="javax.activation@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.net.linux.x86_64@default:false,com.springsource.javax.servlet.jsp@default:default,org.mortbay.jetty.server@default:default,org.eclipse.equinox.p2.repository@default:default,javax.mail@default:default,org.eclipse.ui.views@default:default,org.eclipse.equinox.common@default:default,org.eclipse.core.contenttype@default:default,org.apache.lucene@default:default,org.eclipse.core.net@default:default,org.eclipse.core.variables@default:default,com.springsource.javax.jms@default:default,org.eclipse.core.jobs@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.core.resources@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.expressions@default:default,org.eclipse.help.base@default:default,org.apache.jasper@default:default,org.eclipse.ui@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:fa!
lse,ch.qos.logback.slf4j@default:false,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.jface@default:default,org.slf4j.api@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.runtime@default:true,org.eclipse.help.ui@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.osgi,org.eclipse.help@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.text@default:default,org.eclipse.core.commands@default:default,org.eclipse.osgi.services@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.databinding.observable@default:default,javax.transaction@default:false,org.eclipse.ui.forms@default:default,org.eclipse.equinox.p2.metadata.r!
epository@default:default,com.springsource.javax.el@default:de!
fault,ch
.qos.logback.core@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.preferences@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.apache.lucene.analysis@default:default,org.apache.commons.el@default:default,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.ui.workbench@default:default,com.jboss.jbds.product@default:default,org.eclipse.jface.text@default:default,org.eclipse.swt@default:default,javax.servlet.jsp@default:default,org.eclipse.ecf@default:default,ch.qos.logback.classic@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.p2.metadata@defa!
ult:default,com.springsource.javax.servlet@default:default,org.eclipse.equinox.transforms.hook@default:false,org.apache.ant@default:default,com.ibm.icu@default:default,org.eclipse.equinox.http.jetty@default:default,org.mortbay.jetty.util@default:default,org.eclipse.equinox.app@default:default,org.eclipse.ui.intro@default:default,org.eclipse.jface.databinding@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.http.servlet@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.engine@default:default,com.jboss.jbds.product@default:default,org.eclipse.ant.core@default:default,org.eclipse.equinox.http.jetty@default:default,ch.qos.logback.classic@default:default,org.apache.ant@default:default,com.springsource.javax.servlet.jsp@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.resources@default:default,org.apache.lucene@default:default,org.eclipse.equinox.security@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.jface.text@default:default,com.ibm.icu@default:default,org.eclipse.equinox.app@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ui@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.p2.repository@default:def!
ault,org.mortbay.jetty.util@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.transforms.hook@default:false,com.springsource.javax.el@default:default,org.eclipse.ui.intro@default:default,org.eclipse.core.commands@default:default,javax.activation@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,javax.servlet.jsp@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.help.base@default:default,org.eclipse.core.filesystem@default:default,org.apache.commons.el@default:default,org.apache.jasper@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.text@default:default,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org!
.eclipse.equinox.common@2:true,org.eclipse.ecf.identity@defaul!
t:defaul
t,org.eclipse.help@default:default,org.eclipse.ui.views@default:default,com.springsource.javax.servlet@default:default,org.apache.lucene.analysis@default:default,org.eclipse.core.net.linux.x86_64@default:false,com.springsource.javax.jms@default:default,org.eclipse.osgi.services@default:default,org.jboss.tools.xulrunner.initializer@default:false,javax.transaction@default:false,ch.qos.logback.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.core.expressions@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.swt@default:default,ch.qos.logback.slf4j@default:false,org.eclipse.core.databinding@default:default,javax.mail@default:default,org.mortbay.jetty.server@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.help.ui@default:default!
,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.osgi@-1:true,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.jface@default:default,org.slf4j.api@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.mozilla.xpcom@default:default,org.mozilla.xulrunner.gtk.linux.x86_64@default:default,org.mozilla.xulrunner.cocoa.macosx@default:default,org.mozilla.xulrunner.win32.win32.x86@default:default,org.mozilla.xulrunner.gtk.linux.x86@default:default,org.mozilla.xulrunner.carbon.macosx@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="false"/>
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/LinuxDistroTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/LinuxDistroTest.java 2010-10-01 08:59:37 UTC (rev 25383)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/LinuxDistroTest.java 2010-10-01 09:05:37 UTC (rev 25384)
@@ -12,44 +12,42 @@
import static org.junit.Assert.assertEquals;
import org.jboss.tools.usage.googleanalytics.eclipse.LinuxSystem;
-import org.jboss.tools.usage.googleanalytics.eclipse.LinuxSystem.LinuxDistro;
-import org.jboss.tools.usage.test.fakes.LinuxDistroFake;
+import org.jboss.tools.usage.test.fakes.LinuxSystemFake;
import org.junit.Test;
public class LinuxDistroTest {
@Test
public void canExtractFedoraVersion() {
- LinuxDistro distro = new LinuxDistroFake(LinuxSystem.FEDORA.getName(), "Fedora release 13 (Goddard)");
- assertEquals("13", distro.getVersion());
+ LinuxSystem linuxSystem = new LinuxSystemFake(LinuxSystem.INSTANCE.FEDORA.getReleaseFilePath(), "Fedora release 13 (Goddard)");
+ assertEquals("Fedora 13", linuxSystem.getDistroNameAndVersion());
}
@Test
public void canExtractUbuntuVersion() {
- LinuxDistro distro = new LinuxDistroFake(LinuxSystem.UBUNTU.getName(),
+ LinuxSystem linuxSystem = new LinuxSystemFake(LinuxSystem.INSTANCE.UBUNTU.getReleaseFilePath(),
"DISTRIB_ID=Ubuntu\nDISTRIB_RELEASE=9.04\nDISTRIB_CODENAME=jaunty\nDISTRIB_DESCRIPTION=\"Ubuntu 9.04\"");
- assertEquals("Ubuntu9.04", distro.getNameAndVersion());
+ assertEquals("Ubuntu 9.04", linuxSystem.getDistroNameAndVersion());
}
@Test
public void canExtractRedHatVersion() {
- LinuxDistro distro = new LinuxDistroFake(LinuxSystem.REDHAT.getName(),
+ LinuxSystem linuxSystem = new LinuxSystemFake(LinuxSystem.INSTANCE.REDHAT.getReleaseFilePath(),
"Red Hat Enterprise Linux Workstation release 6.0 (Santiago)");
- assertEquals("RedHat6.0", distro.getNameAndVersion());
+ assertEquals("RedHat 6.0", linuxSystem.getDistroNameAndVersion());
}
@Test
public void canExtractGentooVersion() {
- LinuxDistro distro = new LinuxDistroFake(LinuxSystem.GENTOO.getName(),
+ LinuxSystem linuxSystem = new LinuxSystemFake(LinuxSystem.INSTANCE.GENTOO.getReleaseFilePath(),
"Gentoo Base System release 2.0.1");
- assertEquals("Gentoo2.0.1", distro.getNameAndVersion());
+ assertEquals("Gentoo 2.0.1", linuxSystem.getDistroNameAndVersion());
}
@Test
public void canExtractCentOSVersion() {
- LinuxDistro distro = new LinuxDistroFake(LinuxSystem.CENTOS.getName(),
+ LinuxSystem linuxSystem = new LinuxSystemFake(LinuxSystem.INSTANCE.CENTOS.getReleaseFilePath(),
"CentOS release 5.3 (Final)");
- assertEquals("CentOS5.3", distro.getNameAndVersion());
+ assertEquals("CentOS 5.3", linuxSystem.getDistroNameAndVersion());
}
}
-
Deleted: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/LinuxDistroFake.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/LinuxDistroFake.java 2010-10-01 08:59:37 UTC (rev 25383)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/LinuxDistroFake.java 2010-10-01 09:05:37 UTC (rev 25384)
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.usage.test.fakes;
-
-import java.io.IOException;
-
-import org.jboss.tools.usage.googleanalytics.eclipse.LinuxSystem.LinuxDistro;
-
-public class LinuxDistroFake extends LinuxDistro {
-
- private String releaseFileContent;
-
- public LinuxDistroFake(String name, String releaseFileContent) {
- super(name, "dummy");
- this.releaseFileContent = releaseFileContent;
- }
-
- @Override
- protected String getDistroFileContent(String filePath) throws IOException {
- return releaseFileContent;
- }
-}
\ No newline at end of file
Added: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/LinuxSystemFake.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/LinuxSystemFake.java (rev 0)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/LinuxSystemFake.java 2010-10-01 09:05:37 UTC (rev 25384)
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.usage.test.fakes;
+
+/*******************************************************************************
+ * 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
+ ******************************************************************************/
+import java.io.IOException;
+
+import org.jboss.tools.usage.googleanalytics.eclipse.LinuxSystem;
+
+/**
+ * @author Andre Dietisheim
+ */
+public class LinuxSystemFake extends LinuxSystem {
+
+ private String releaseFilePath;
+
+ private String releaseFileContent;
+
+ public LinuxSystemFake(String releaseFilePath, String releaseFileContent) {
+ super();
+ this.releaseFilePath = releaseFilePath;
+ this.releaseFileContent = releaseFileContent;
+ }
+
+ @Override
+ protected boolean exists(String releaseFilePath) {
+ return this.releaseFilePath.equals(releaseFilePath);
+ }
+
+ @Override
+ protected String getDistroFileContent(String filePath) throws IOException {
+ return releaseFileContent;
+ }
+}
\ No newline at end of file
Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/LinuxSystemFake.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/ReportingEclipseEnvironmentFake.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/ReportingEclipseEnvironmentFake.java 2010-10-01 08:59:37 UTC (rev 25383)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/ReportingEclipseEnvironmentFake.java 2010-10-01 09:05:37 UTC (rev 25384)
@@ -70,6 +70,6 @@
@Override
protected String getLinuxDistroNameAndVersion() {
- return new LinuxDistroFake(LinuxSystem.FEDORA.getName(), "Fedora release 13 (Goddard)").getNameAndVersion();
+ return new LinuxSystemFake(LinuxSystem.INSTANCE.FEDORA.getName(), "Fedora release 13 (Goddard)").getDistroNameAndVersion();
}
}
13 years, 7 months
JBoss Tools SVN: r25383 - in trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics: eclipse and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-10-01 04:59:37 -0400 (Fri, 01 Oct 2010)
New Revision: 25383
Modified:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/AbstractEclipseEnvironment.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/LinuxSystem.java
Log:
[JBIDE-7208] centos detection fixed
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java 2010-10-01 07:11:25 UTC (rev 25382)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java 2010-10-01 08:59:37 UTC (rev 25383)
@@ -35,9 +35,6 @@
public class GoogleAnalyticsUrlStrategy implements IURLBuildingStrategy {
private static final String TRACKING_URL = "http://www.google-analytics.com/__utm.gif";
-
- // private static final int VISITS = -1;
-
private IGoogleAnalyticsParameters googleParameters;
public GoogleAnalyticsUrlStrategy(IGoogleAnalyticsParameters googleAnalyticsParameters) {
@@ -45,56 +42,7 @@
}
public String build(IFocusPoint focusPoint) throws UnsupportedEncodingException {
- /*
- * Google Analytics for Android:
- *
- String str = "";
- if (paramEvent.action != null)
- str = paramEvent.action;
- if (!(str.startsWith("/")))
- str = "/" + str;
- str = encode(str);
- Locale localLocale = Locale.getDefault();
- StringBuilder localStringBuilder = new StringBuilder();
- localStringBuilder.append("/__utm.gif");
- localStringBuilder.append("?utmwv=4.3");
- localStringBuilder.append("&utmn=").append(paramEvent.randomVal);
- localStringBuilder.append("&utmcs=UTF-8");
- localStringBuilder.append(String.format("&utmsr=%dx%d", new Object[] {
- Integer.valueOf(paramEvent.screenWidth)
- , Integer.valueOf(paramEvent.screenHeight) }));
- localStringBuilder.append(String.format("&utmul=%s-%s", new Object[] {
- localLocale.getLanguage()
- , localLocale.getCountry() }));
- localStringBuilder.append("&utmp=").append(str);
- localStringBuilder.append("&utmac=").append(paramEvent.accountId);
- localStringBuilder.append("&utmcc=").append(
- getEscapedCookieString(paramEvent, paramString));
- return localStringBuilder.toString();
-
- *
- * getEscapedCookieString:
- *
- StringBuilder localStringBuilder = new StringBuilder();
- localStringBuilder.append("__utma=");
- localStringBuilder.append("999").append(".");
- localStringBuilder.append(paramEvent.userId).append(".");
- localStringBuilder.append(paramEvent.timestampFirst).append(".");
- localStringBuilder.append(paramEvent.timestampPrevious).append(".");
- localStringBuilder.append(paramEvent.timestampCurrent).append(".");
- localStringBuilder.append(paramEvent.visits);
- if (paramString != null)
- {
- localStringBuilder.append("+__utmz=");
- localStringBuilder.append("999").append(".");
- localStringBuilder.append(paramEvent.timestampFirst).append(".");
- localStringBuilder.append("1.1.");
- localStringBuilder.append(paramString);
- }
- return encode(localStringBuilder.toString());
- */
-
StringBuilder builder = new StringBuilder(TRACKING_URL)
.append(IGoogleAnalyticsParameters.URL_PARAM_DELIMITER);
appendParameter(IGoogleAnalyticsParameters.PARAM_TRACKING_CODE_VERSION,
@@ -213,7 +161,7 @@
+ googleParameters.getUserDefined())
.appendTo(builder);
- builder.append(IGoogleAnalyticsParameters.SEMICOLON);
+// builder.append(IGoogleAnalyticsParameters.SEMICOLON);
return HttpEncodingUtils.checkedEncodeUtf8(builder.toString());
}
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/AbstractEclipseEnvironment.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/AbstractEclipseEnvironment.java 2010-10-01 07:11:25 UTC (rev 25382)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/AbstractEclipseEnvironment.java 2010-10-01 08:59:37 UTC (rev 25383)
@@ -180,7 +180,7 @@
}
protected String getLinuxDistroNameAndVersion() {
- return LinuxSystem.getDistroNameAndVersion();
+ return LinuxSystem.INSTANCE.getDistroNameAndVersion();
}
}
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/LinuxSystem.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/LinuxSystem.java 2010-10-01 07:11:25 UTC (rev 25382)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/LinuxSystem.java 2010-10-01 08:59:37 UTC (rev 25383)
@@ -18,29 +18,31 @@
public class LinuxSystem {
+ public static final LinuxSystem INSTANCE = new LinuxSystem();
+
/**
- * @see <a href="http://linuxmafia.com/faq/Admin/release-files.html">
- * an extensive list of release file locations</a>
- *
+ * @see <a href="http://linuxmafia.com/faq/Admin/release-files.html"> an
+ * extensive list of release file locations</a>
+ *
* @see <a
* href="http://superuser.com/questions/11008/how-do-i-find-out-what-version-of-li...">
* release-file strings</a>
*/
- public static final LinuxDistro CENTOS = new LinuxDistro("CentOS", "/etc/redhat-release");
- public static final LinuxDistro DEBIAN = new LinuxDistro("Debian", "/etc/debian_version");
- public static final LinuxDistro FEDORA = new LinuxDistro("Fedora", "/etc/fedora-release");
- public static final LinuxDistro GENTOO = new LinuxDistro("Gentoo", "/etc/gentoo-release");
- public static final LinuxDistro YELLOWDOG = new LinuxDistro("YellowDog", "/etc/yellowdog-release");
- public static final LinuxDistro KNOPPIX = new LinuxDistro("Knoppix", "knoppix_version");
- public static final LinuxDistro MANDRAKE = new LinuxDistro("Mandrake", "/etc/mandrake-release");
- public static final LinuxDistro MANDRIVA = new LinuxDistro("Mandriva", "/etc/mandriva-release");
- public static final LinuxDistro PLD = new LinuxDistro("PLD", "/etc/pld-release");
- public static final LinuxDistro REDHAT = new LinuxDistro("RedHat", "/etc/redhat-release");
- public static final LinuxDistro SLACKWARE = new LinuxDistro("Slackware", "/etc/slackware-version");
- public static final LinuxDistro SUSE = new LinuxDistro("SUSE", "/etc/SuSE-release");
- public static final LinuxDistro UBUNTU = new LinuxDistro("Ubuntu", "/etc/lsb-release");
+ public final LinuxDistro CENTOS = new CentOSDistro("CentOS", "/etc/redhat-release");
+ public final LinuxDistro DEBIAN = new LinuxDistro("Debian", "/etc/debian_version");
+ public final LinuxDistro FEDORA = new LinuxDistro("Fedora", "/etc/fedora-release");
+ public final LinuxDistro GENTOO = new LinuxDistro("Gentoo", "/etc/gentoo-release");
+ public final LinuxDistro YELLOWDOG = new LinuxDistro("YellowDog", "/etc/yellowdog-release");
+ public final LinuxDistro KNOPPIX = new LinuxDistro("Knoppix", "knoppix_version");
+ public final LinuxDistro MANDRAKE = new LinuxDistro("Mandrake", "/etc/mandrake-release");
+ public final LinuxDistro MANDRIVA = new LinuxDistro("Mandriva", "/etc/mandriva-release");
+ public final LinuxDistro PLD = new LinuxDistro("PLD", "/etc/pld-release");
+ public final LinuxDistro REDHAT = new LinuxDistro("RedHat", "/etc/redhat-release");
+ public final LinuxDistro SLACKWARE = new LinuxDistro("Slackware", "/etc/slackware-version");
+ public final LinuxDistro SUSE = new LinuxDistro("SUSE", "/etc/SuSE-release");
+ public final LinuxDistro UBUNTU = new LinuxDistro("Ubuntu", "/etc/lsb-release");
- private static final LinuxDistro[] ALL = new LinuxDistro[] {
+ private final LinuxDistro[] ALL = new LinuxDistro[] {
CENTOS,
DEBIAN,
FEDORA,
@@ -56,9 +58,9 @@
YELLOWDOG
};
- public static LinuxDistro getDistro() {
+ public LinuxDistro getDistro() {
for (LinuxDistro distro : ALL) {
- if (distro.currentSysIsDistro()) {
+ if (distro.isDistro()) {
return distro;
}
}
@@ -66,7 +68,7 @@
}
- public static String getDistroNameAndVersion() {
+ public String getDistroNameAndVersion() {
LinuxDistro distro = getDistro();
if (distro != null) {
return distro.getNameAndVersion();
@@ -74,9 +76,30 @@
return "";
}
}
+
+ protected class CentOSDistro extends LinuxDistro {
+ private static final String CENTOS_NAME = "CentOS";
- public static class LinuxDistro {
+ protected CentOSDistro(String name, String releaseFilePath) {
+ super(name, releaseFilePath);
+ }
+ @Override
+ protected boolean isDistro() {
+ try {
+ boolean fileExists = super.isDistro();
+ if (fileExists) {
+ String content = getDistroFileContent(releaseFilePath);
+ return content != null && content.indexOf(CENTOS_NAME) >= 0;
+ }
+ } catch (IOException e) {
+ }
+ return false;
+ }
+ }
+
+ public class LinuxDistro {
+
/**
* The pattern to match the contents of the release-file -
* /etc/fedora-release etc. Attention: Ubuntu has multi-line release
@@ -84,7 +107,7 @@
*/
private final Pattern VERSION_REGEX = Pattern.compile("([0-9.]+)");
- private final String releaseFilePath;
+ protected final String releaseFilePath;
private String name;
protected LinuxDistro(String name, String releaseFilePath) {
@@ -92,8 +115,8 @@
this.releaseFilePath = releaseFilePath;
}
- private boolean currentSysIsDistro() {
- return new File(releaseFilePath).exists();
+ protected boolean isDistro() {
+ return exists(releaseFilePath);
}
public String getName() {
@@ -113,21 +136,29 @@
}
public String getNameAndVersion() {
- return new StringBuilder().append(getName()).append(getVersion()).toString();
+ return new StringBuilder().append(getName()).append(" ").append(getVersion()).toString();
}
-
- protected String getDistroFileContent(String filePath) throws IOException {
- int charachtersToRead = 1024;
- StringBuilder builder = new StringBuilder(charachtersToRead);
- BufferedReader reader = new BufferedReader(new FileReader(filePath));
- char[] buf = new char[charachtersToRead];
- int charRead = 0;
- while ((charRead = reader.read(buf)) != -1 && builder.length() < charachtersToRead) {
- String readData = String.valueOf(buf, 0, charRead);
- builder.append(readData);
- }
- reader.close();
- return builder.toString();
+
+ public String getReleaseFilePath() {
+ return releaseFilePath;
}
}
+
+ protected boolean exists(String releaseFilePath) {
+ return new File(releaseFilePath).exists();
+ }
+
+ protected String getDistroFileContent(String filePath) throws IOException {
+ int charachtersToRead = 1024;
+ StringBuilder builder = new StringBuilder(charachtersToRead);
+ BufferedReader reader = new BufferedReader(new FileReader(filePath));
+ char[] buf = new char[charachtersToRead];
+ int charRead = 0;
+ while ((charRead = reader.read(buf)) != -1 && builder.length() < charachtersToRead) {
+ String readData = String.valueOf(buf, 0, charRead);
+ builder.append(readData);
+ }
+ reader.close();
+ return builder.toString();
+ }
}
13 years, 7 months
JBoss Tools SVN: r25382 - trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2010-10-01 03:11:25 -0400 (Fri, 01 Oct 2010)
New Revision: 25382
Modified:
trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/META-INF/MANIFEST.MF
Log:
changed bpmn diagram plugin name
Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/META-INF/MANIFEST.MF
===================================================================
--- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/META-INF/MANIFEST.MF 2010-10-01 03:31:58 UTC (rev 25381)
+++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/META-INF/MANIFEST.MF 2010-10-01 07:11:25 UTC (rev 25382)
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.bpmn2.diagram; singleton:=true
+Bundle-SymbolicName: org.jboss.tools.bpmn2.process.diagram; singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.jboss.tools.bpmn2.process.diagram.part.Bpmn2DiagramEditorPlugin
13 years, 7 months
