JBoss Tools SVN: r36939 - in branches/jbosstools-3.3.0.M5/as/plugins: org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-12-05 04:30:53 -0500 (Mon, 05 Dec 2011)
New Revision: 36939
Modified:
branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/jboss-management-service.xml
branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java
Log:
JBIDE-10340 / JBIDE-10325 / JBIDE-10030 to branch
Modified: branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/jboss-management-service.xml
===================================================================
--- branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/jboss-management-service.xml 2011-12-05 08:18:40 UTC (rev 36938)
+++ branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/jboss-management-service.xml 2011-12-05 09:30:53 UTC (rev 36939)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.jboss.ide.eclipse.as.management.as7.service">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.jboss.ide.eclipse.as.management.as71.service">
<implementation class="org.jboss.ide.eclipse.as.internal.management.as71.JBoss71ManagerService"/>
<service>
<provide interface="org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7ManagerService"/>
Modified: branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java
===================================================================
--- branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java 2011-12-05 08:18:40 UTC (rev 36938)
+++ branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java 2011-12-05 09:30:53 UTC (rev 36939)
@@ -31,6 +31,8 @@
import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.IServerListener;
+import org.eclipse.wst.server.core.ServerEvent;
import org.eclipse.wst.server.core.model.ClientDelegate;
import org.jboss.ide.eclipse.as.core.ExtensionManager;
import org.jboss.ide.eclipse.as.core.ExtensionManager.IServerJMXRunnable;
@@ -53,7 +55,6 @@
public class JBTWebLaunchableClient extends ClientDelegate {
public JBTWebLaunchableClient() {
- // TODO Auto-generated constructor stub
}
public boolean supports(IServer server, Object launchable, String launchMode) {
@@ -62,11 +63,13 @@
protected boolean isJMXServer(IServer server) {
JBossServer jbs = ServerConverter.getJBossServer(server);
- return jbs != null && server.getServerState() == IServer.STATE_STARTED
- && jbs.hasJMXProvider() && ExtensionManager.getDefault().getJMXRunner() != null;
+ return jbs != null && jbs.hasJMXProvider() && ExtensionManager.getDefault().getJMXRunner() != null;
}
public IStatus launch(final IServer server, final Object launchable, final String launchMode, final ILaunch launch) {
+ if( server.getServerState() == IServer.STATE_STOPPED || server.getServerState() == IServer.STATE_STOPPING)
+ return Status.CANCEL_STATUS;
+
new Thread() {
public void run() {
launch2(server, launchable, launchMode, launch);
@@ -100,6 +103,7 @@
}
protected void wait(final IServer server, final IModule module) {
+ waitServerStarted(server);
if( isJMXServer(server)) {
waitJMX(server, module);
} else if( ServerUtil.isJBoss7(server)) {
@@ -107,6 +111,30 @@
}
}
+ private void waitServerStarted(final IServer server) {
+ final Object lock = new Object();
+ IServerListener listener = new IServerListener() {
+ public void serverChanged(ServerEvent event) {
+ synchronized(lock) {
+ if( server.getServerState() != IServer.STATE_STARTING ) {
+ lock.notifyAll();
+ }
+ }
+ }
+ };
+ synchronized(lock) {
+ server.addServerListener(listener);
+ if( server.getServerState() == IServer.STATE_STARTING) {
+ try {
+ lock.wait();
+ } catch(InterruptedException ie) {
+ // ignore
+ }
+ }
+ }
+ server.removeServerListener(listener);
+ }
+
//TODO: the waiting/timeout logic in here should be done for waitJMX too.
//TODO: should return true for succss or false if timeout so upper layer can report it.
protected void waitJBoss7(final IServer server, final IModule module) {
13 years, 1 month
JBoss Tools SVN: r36938 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-12-05 03:18:40 -0500 (Mon, 05 Dec 2011)
New Revision: 36938
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java
Log:
fred says i'm dumb. it's true.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java 2011-12-05 08:11:04 UTC (rev 36937)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java 2011-12-05 08:18:40 UTC (rev 36938)
@@ -67,7 +67,7 @@
}
public IStatus launch(final IServer server, final Object launchable, final String launchMode, final ILaunch launch) {
- if( server.getServerState() == IServer.STATE_STOPPED || server.getServerState() == IServer.STATE_STOPPED)
+ if( server.getServerState() == IServer.STATE_STOPPED || server.getServerState() == IServer.STATE_STOPPING)
return Status.CANCEL_STATUS;
new Thread() {
13 years, 1 month
JBoss Tools SVN: r36937 - trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2011-12-05 03:11:04 -0500 (Mon, 05 Dec 2011)
New Revision: 36937
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/QuickFixDialogWizard.java
Log:
QuickFixDialogWizard edited to work with getFixed and getResources
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/QuickFixDialogWizard.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/QuickFixDialogWizard.java 2011-12-05 08:06:07 UTC (rev 36936)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/QuickFixDialogWizard.java 2011-12-05 08:11:04 UTC (rev 36937)
@@ -11,43 +11,46 @@
package org.jboss.tools.cdi.bot.test.uiutils.wizards;
+import java.util.ArrayList;
+import java.util.List;
+
import org.eclipse.swtbot.swt.finder.SWTBot;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotTableItem;
public class QuickFixDialogWizard extends Wizard {
private static final String QUICK_FIX_TITLE = "Quick Fix";
+ private List<String> availableFixes = null;
+ private List<String> resources = null;
public QuickFixDialogWizard() {
super(new SWTBot().activeShell().widget);
- assert (QUICK_FIX_TITLE).equals(getText());
+ assert (QUICK_FIX_TITLE).equals(getText());
+ availableFixes = new ArrayList<String>();
+ resources = new ArrayList<String>();
}
- public QuickFixDialogWizard setFix(SWTBotTableItem fix) {
- fix.select();
+ public QuickFixDialogWizard setFix(String fix) {
+ bot().table(0).select(fix);
return this;
}
- public SWTBotTableItem[] getFixes() {
- SWTBotTable fixTable = bot().table(0);
- SWTBotTableItem[] fixes = new SWTBotTableItem[fixTable.rowCount()];
- for (int i = 0; i < fixTable.rowCount(); i++) {
- fixes[i] = fixTable.getTableItem(i);
+ public List<String> getAvailableFixes() {
+ int tableItemsCount = bot().table(0).rowCount();
+ for (int i = 0; i < tableItemsCount; i++) {
+ availableFixes.add(bot().table(0).getTableItem(i).getText());
}
- return fixes;
+ return availableFixes;
}
- public QuickFixDialogWizard setResource(SWTBotTableItem resource) {
- resource.check();
+ public QuickFixDialogWizard setResource(String resource) {
+ bot().table(1).select(resource);
return this;
}
- public SWTBotTableItem[] getResources() {
- SWTBotTable resourceTable = bot().table(1);
- SWTBotTableItem[] resources = new SWTBotTableItem[resourceTable.rowCount()];
- for (int i = 0; i < resourceTable.rowCount(); i++) {
- resources[i] = resourceTable.getTableItem(i);
+ public List<String> getResources() {
+ int tableItemsCount = bot().table(1).rowCount();
+ for (int i = 0; i < tableItemsCount; i++) {
+ resources.add(bot().table(1).getTableItem(i).getText());
}
return resources;
}
13 years, 1 month
JBoss Tools SVN: r36936 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-12-05 03:06:07 -0500 (Mon, 05 Dec 2011)
New Revision: 36936
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/build.properties
Log:
JBIDE-10309 - obvious solution still doesn't work... what next?
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/build.properties
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/build.properties 2011-12-05 07:02:04 UTC (rev 36935)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/build.properties 2011-12-05 08:06:07 UTC (rev 36936)
@@ -5,4 +5,11 @@
pom.xml,\
META-INF/,\
bin/,\
- plugin.xml
+ plugin.xml,\
+ plugin.properties
+src.includes = plugin.properties,\
+ META-INF/,\
+ bin/,\
+ icons/,\
+ plugin.xml,\
+ pom.xml
13 years, 1 month
JBoss Tools SVN: r36935 - trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-12-05 02:02:04 -0500 (Mon, 05 Dec 2011)
New Revision: 36935
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/jboss-management-service.xml
Log:
JBIDE-10340 - duplicate service name
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/jboss-management-service.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/jboss-management-service.xml 2011-12-05 06:53:21 UTC (rev 36934)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/jboss-management-service.xml 2011-12-05 07:02:04 UTC (rev 36935)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.jboss.ide.eclipse.as.management.as7.service">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.jboss.ide.eclipse.as.management.as71.service">
<implementation class="org.jboss.ide.eclipse.as.internal.management.as71.JBoss71ManagerService"/>
<service>
<provide interface="org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7ManagerService"/>
13 years, 1 month
JBoss Tools SVN: r36934 - in trunk/as/plugins: org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-12-05 01:53:21 -0500 (Mon, 05 Dec 2011)
New Revision: 36934
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Manager.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java
Log:
JBIDE-10325 JBIDE-10030 a more synchronized approach ;)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Manager.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Manager.java 2011-12-04 20:48:32 UTC (rev 36933)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Manager.java 2011-12-05 06:53:21 UTC (rev 36934)
@@ -24,9 +24,6 @@
import static org.jboss.ide.eclipse.as.internal.management.as7.ModelDescriptionConstants.RESULT;
import static org.jboss.ide.eclipse.as.internal.management.as7.ModelDescriptionConstants.SERVER_STATE;
import static org.jboss.ide.eclipse.as.internal.management.as7.ModelDescriptionConstants.SHUTDOWN;
-import static org.jboss.ide.eclipse.as.internal.management.as71.ModelDescriptionConstants.CHILD_TYPE;
-import static org.jboss.ide.eclipse.as.internal.management.as71.ModelDescriptionConstants.DEPLOYMENT;
-import static org.jboss.ide.eclipse.as.internal.management.as71.ModelDescriptionConstants.READ_CHILDREN_NAMES_OPERATION;
import java.io.File;
import java.io.IOException;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java 2011-12-04 20:48:32 UTC (rev 36933)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java 2011-12-05 06:53:21 UTC (rev 36934)
@@ -31,6 +31,8 @@
import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.IServerListener;
+import org.eclipse.wst.server.core.ServerEvent;
import org.eclipse.wst.server.core.model.ClientDelegate;
import org.jboss.ide.eclipse.as.core.ExtensionManager;
import org.jboss.ide.eclipse.as.core.ExtensionManager.IServerJMXRunnable;
@@ -53,7 +55,6 @@
public class JBTWebLaunchableClient extends ClientDelegate {
public JBTWebLaunchableClient() {
- // TODO Auto-generated constructor stub
}
public boolean supports(IServer server, Object launchable, String launchMode) {
@@ -62,11 +63,13 @@
protected boolean isJMXServer(IServer server) {
JBossServer jbs = ServerConverter.getJBossServer(server);
- return jbs != null && server.getServerState() == IServer.STATE_STARTED
- && jbs.hasJMXProvider() && ExtensionManager.getDefault().getJMXRunner() != null;
+ return jbs != null && jbs.hasJMXProvider() && ExtensionManager.getDefault().getJMXRunner() != null;
}
public IStatus launch(final IServer server, final Object launchable, final String launchMode, final ILaunch launch) {
+ if( server.getServerState() == IServer.STATE_STOPPED || server.getServerState() == IServer.STATE_STOPPED)
+ return Status.CANCEL_STATUS;
+
new Thread() {
public void run() {
launch2(server, launchable, launchMode, launch);
@@ -100,6 +103,7 @@
}
protected void wait(final IServer server, final IModule module) {
+ waitServerStarted(server);
if( isJMXServer(server)) {
waitJMX(server, module);
} else if( ServerUtil.isJBoss7(server)) {
@@ -107,6 +111,30 @@
}
}
+ private void waitServerStarted(final IServer server) {
+ final Object lock = new Object();
+ IServerListener listener = new IServerListener() {
+ public void serverChanged(ServerEvent event) {
+ synchronized(lock) {
+ if( server.getServerState() != IServer.STATE_STARTING ) {
+ lock.notifyAll();
+ }
+ }
+ }
+ };
+ synchronized(lock) {
+ server.addServerListener(listener);
+ if( server.getServerState() == IServer.STATE_STARTING) {
+ try {
+ lock.wait();
+ } catch(InterruptedException ie) {
+ // ignore
+ }
+ }
+ }
+ server.removeServerListener(listener);
+ }
+
//TODO: the waiting/timeout logic in here should be done for waitJMX too.
//TODO: should return true for succss or false if timeout so upper layer can report it.
protected void waitJBoss7(final IServer server, final IModule module) {
13 years, 1 month
JBoss Tools SVN: r36933 - in branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central: jobs and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-12-04 15:48:32 -0500 (Sun, 04 Dec 2011)
New Revision: 36933
Modified:
branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/JBossCentralActivator.java
branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshTutorialsJob.java
Log:
JBIDE-10321 Central reports "Invalid Project example" 11 times even when org.jboss.tools.project.examples and org.jboss.tools.community.project.examples are installed
Modified: branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/JBossCentralActivator.java
===================================================================
--- branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/JBossCentralActivator.java 2011-12-04 20:47:09 UTC (rev 36932)
+++ branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/JBossCentralActivator.java 2011-12-04 20:48:32 UTC (rev 36933)
@@ -212,6 +212,11 @@
IStatus status = new Status(IStatus.ERROR, PLUGIN_ID, message);
plugin.getLog().log(status);
}
+
+ public static void logWarning(String message) {
+ IStatus status = new Status(IStatus.WARNING, PLUGIN_ID, message);
+ plugin.getLog().log(status);
+ }
public boolean showJBossCentralOnStartup() {
IEclipsePreferences prefs = JBossCentralActivator.getDefault().getPreferences();
Modified: branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshTutorialsJob.java
===================================================================
--- branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshTutorialsJob.java 2011-12-04 20:47:09 UTC (rev 36932)
+++ branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshTutorialsJob.java 2011-12-04 20:48:32 UTC (rev 36933)
@@ -91,7 +91,7 @@
if (projectTutorial != null) {
tutorial.setProjectExamples(projectTutorial);
} else {
- JBossCentralActivator.log("Invalid Project example:" + tutorial.getId());
+ JBossCentralActivator.logWarning("The " + tutorial.getId() + " project example not found");
}
} else {
// FIXME
13 years, 1 month
JBoss Tools SVN: r36932 - trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-12-04 15:47:09 -0500 (Sun, 04 Dec 2011)
New Revision: 36932
Modified:
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshTutorialsJob.java
Log:
JBIDE-10321 Central reports "Invalid Project example" 11 times even when org.jboss.tools.project.examples and org.jboss.tools.community.project.examples are installed
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshTutorialsJob.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshTutorialsJob.java 2011-12-04 20:44:24 UTC (rev 36931)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshTutorialsJob.java 2011-12-04 20:47:09 UTC (rev 36932)
@@ -91,7 +91,7 @@
if (projectTutorial != null) {
tutorial.setProjectExamples(projectTutorial);
} else {
- JBossCentralActivator.log("The " + tutorial.getId() + " project example not found");
+ JBossCentralActivator.logWarning("The " + tutorial.getId() + " project example not found");
}
} else {
// FIXME
13 years, 1 month
JBoss Tools SVN: r36931 - in trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central: jobs and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-12-04 15:44:24 -0500 (Sun, 04 Dec 2011)
New Revision: 36931
Modified:
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/JBossCentralActivator.java
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshTutorialsJob.java
Log:
JBIDE-10321 Central reports "Invalid Project example" 11 times even when org.jboss.tools.project.examples and org.jboss.tools.community.project.examples are installed
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/JBossCentralActivator.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/JBossCentralActivator.java 2011-12-04 19:31:11 UTC (rev 36930)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/JBossCentralActivator.java 2011-12-04 20:44:24 UTC (rev 36931)
@@ -212,6 +212,11 @@
IStatus status = new Status(IStatus.ERROR, PLUGIN_ID, message);
plugin.getLog().log(status);
}
+
+ public static void logWarning(String message) {
+ IStatus status = new Status(IStatus.WARNING, PLUGIN_ID, message);
+ plugin.getLog().log(status);
+ }
public boolean showJBossCentralOnStartup() {
IEclipsePreferences prefs = JBossCentralActivator.getDefault().getPreferences();
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshTutorialsJob.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshTutorialsJob.java 2011-12-04 19:31:11 UTC (rev 36930)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshTutorialsJob.java 2011-12-04 20:44:24 UTC (rev 36931)
@@ -91,7 +91,7 @@
if (projectTutorial != null) {
tutorial.setProjectExamples(projectTutorial);
} else {
- JBossCentralActivator.log("Invalid Project example:" + tutorial.getId());
+ JBossCentralActivator.log("The " + tutorial.getId() + " project example not found");
}
} else {
// FIXME
13 years, 1 month
JBoss Tools SVN: r36930 - in trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central: configurators and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-12-04 14:31:11 -0500 (Sun, 04 Dec 2011)
New Revision: 36930
Modified:
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/JBossCentralActivator.java
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/configurators/DefaultJBossCentralConfigurator.java
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/dialogs/ProjectExamplesDialog.java
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/SoftwarePage.java
Log:
JBIDE-10334 system property option for configuring central discovery has dissappeared
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/JBossCentralActivator.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/JBossCentralActivator.java 2011-12-04 00:31:45 UTC (rev 36929)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/JBossCentralActivator.java 2011-12-04 19:31:11 UTC (rev 36930)
@@ -67,7 +67,7 @@
*/
public class JBossCentralActivator extends AbstractUIPlugin {
- private static final String JBOSS_DISCOVERY_DIRECTORY = "jboss.discovery.directory.url";
+ public static final String JBOSS_DISCOVERY_DIRECTORY = "jboss.discovery.directory.url";
//public static final String JBOSS_DISCOVERY_DIRECTORY_3_3_0_XML = "http://download.jboss.org/jbosstools/updates/development/indigo/jbosstool...";
@@ -467,14 +467,6 @@
public BundleContext getBundleContext() {
return bundleContext;
}
-
- public String getJBossDiscoveryDirectory() {
- String directory = System.getProperty(JBOSS_DISCOVERY_DIRECTORY, null);
- if (directory == null) {
- return getConfigurator().getJBossDiscoveryDirectory();
- }
- return directory;
- }
public static boolean isInternalWebBrowserAvailable() {
if (isInternalWebBrowserAvailable != null) {
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/configurators/DefaultJBossCentralConfigurator.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/configurators/DefaultJBossCentralConfigurator.java 2011-12-04 00:31:45 UTC (rev 36929)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/configurators/DefaultJBossCentralConfigurator.java 2011-12-04 19:31:11 UTC (rev 36930)
@@ -44,7 +44,11 @@
@Override
public String getJBossDiscoveryDirectory() {
- return JBOSS_DISCOVERY_DIRECTORY_3_3_0_XML;
+ String directory = System.getProperty(JBossCentralActivator.JBOSS_DISCOVERY_DIRECTORY, null);
+ if (directory == null) {
+ return JBOSS_DISCOVERY_DIRECTORY_3_3_0_XML;
+ }
+ return directory;
}
@Override
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/dialogs/ProjectExamplesDialog.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/dialogs/ProjectExamplesDialog.java 2011-12-04 00:31:45 UTC (rev 36929)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/dialogs/ProjectExamplesDialog.java 2011-12-04 19:31:11 UTC (rev 36930)
@@ -337,7 +337,7 @@
connectorDiscoveries[0].getDiscoveryStrategies().add(new BundleDiscoveryStrategy());
RemoteBundleDiscoveryStrategy remoteDiscoveryStrategy = new RemoteBundleDiscoveryStrategy();
- remoteDiscoveryStrategy.setDirectoryUrl(JBossCentralActivator.getDefault().getJBossDiscoveryDirectory());
+ remoteDiscoveryStrategy.setDirectoryUrl(JBossCentralActivator.getDefault().getConfigurator().getJBossDiscoveryDirectory());
connectorDiscoveries[0].getDiscoveryStrategies().add(remoteDiscoveryStrategy);
connectorDiscoveries[0].setEnvironment(JBossCentralActivator.getEnvironment());
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/SoftwarePage.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/SoftwarePage.java 2011-12-04 00:31:45 UTC (rev 36929)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/SoftwarePage.java 2011-12-04 19:31:11 UTC (rev 36930)
@@ -128,7 +128,7 @@
discoveryViewer = new DiscoveryViewer(getSite(), this);
discoveryViewer.setShowConnectorDescriptorKindFilter(false);
discoveryViewer.setShowInstalledFilterEnabled(true);
- discoveryViewer.setDirectoryUrl(JBossCentralActivator.getDefault().getJBossDiscoveryDirectory());
+ discoveryViewer.setDirectoryUrl(JBossCentralActivator.getDefault().getConfigurator().getJBossDiscoveryDirectory());
discoveryViewer.createControl(pageBook);
discoveryViewer.setEnvironment(getEnvironment());
discoveryViewer.addFilter(new ViewerFilter() {
13 years, 1 month