JBoss Tools SVN: r40271 - in trunk/documentation/movies: scripts and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2012-04-18 04:09:48 -0400 (Wed, 18 Apr 2012)
New Revision: 40271
Modified:
trunk/documentation/movies/index.html
trunk/documentation/movies/scripts/application.js
Log:
more specific ids
Modified: trunk/documentation/movies/index.html
===================================================================
--- trunk/documentation/movies/index.html 2012-04-18 08:06:49 UTC (rev 40270)
+++ trunk/documentation/movies/index.html 2012-04-18 08:09:48 UTC (rev 40271)
@@ -1,4 +1,3 @@
-
<!DOCTYPE html>
<html lang="en">
<head>
Modified: trunk/documentation/movies/scripts/application.js
===================================================================
--- trunk/documentation/movies/scripts/application.js 2012-04-18 08:06:49 UTC (rev 40270)
+++ trunk/documentation/movies/scripts/application.js 2012-04-18 08:09:48 UTC (rev 40271)
@@ -23,8 +23,8 @@
{"id": "39607711", "ref": "richfacesintro"},
{"id": "39608223", "ref": "forgeintro"},
{"id": "39743919", "ref": "gwtintro"},
- {"id": "39608294", "ref": "hibrevengintro"},
- {"id": "39608326", "ref": "forgerevengintro"}
+ {"id": "39608294", "ref": "hibreveng"},
+ {"id": "39608326", "ref": "forgereveng"}
]};
function play(videoRef) {
13 years, 11 months
JBoss Tools SVN: r40270 - trunk/documentation/movies/scripts.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2012-04-18 04:06:49 -0400 (Wed, 18 Apr 2012)
New Revision: 40270
Modified:
trunk/documentation/movies/scripts/application.js
Log:
more specific ids
Modified: trunk/documentation/movies/scripts/application.js
===================================================================
--- trunk/documentation/movies/scripts/application.js 2012-04-18 07:55:24 UTC (rev 40269)
+++ trunk/documentation/movies/scripts/application.js 2012-04-18 08:06:49 UTC (rev 40270)
@@ -17,14 +17,14 @@
})
var videosJSON = {"videos":[
- {"id": "39743315", "ref": "marketplace"},
- {"id": "39606090", "ref": "installation"},
- {"id": "39607154", "ref": "jee6arquillian"},
- {"id": "39607711", "ref": "richfaces"},
- {"id": "39608223", "ref": "forge"},
- {"id": "39743919", "ref": "gwt"},
- {"id": "39608294", "ref": "hibreveng"},
- {"id": "39608326", "ref": "forgereveng"}
+ {"id": "39743315", "ref": "marketplaceinstallation"},
+ {"id": "39606090", "ref": "jbdsinstallation"},
+ {"id": "39607154", "ref": "jee6arquillianintro"},
+ {"id": "39607711", "ref": "richfacesintro"},
+ {"id": "39608223", "ref": "forgeintro"},
+ {"id": "39743919", "ref": "gwtintro"},
+ {"id": "39608294", "ref": "hibrevengintro"},
+ {"id": "39608326", "ref": "forgerevengintro"}
]};
function play(videoRef) {
13 years, 11 months
JBoss Tools SVN: r40269 - in trunk/requirements: jbossas-7.1.1.Final and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rhopp
Date: 2012-04-18 03:55:24 -0400 (Wed, 18 Apr 2012)
New Revision: 40269
Added:
trunk/requirements/jbossas-7.1.1.Final/
trunk/requirements/jbossas-7.1.1.Final/build.properties
Log:
Addded JBoss AS 7.1.1.Final requirement
Added: trunk/requirements/jbossas-7.1.1.Final/build.properties
===================================================================
--- trunk/requirements/jbossas-7.1.1.Final/build.properties (rev 0)
+++ trunk/requirements/jbossas-7.1.1.Final/build.properties 2012-04-18 07:55:24 UTC (rev 40269)
@@ -0,0 +1,9 @@
+jbossas711.build.uri=http://download.jboss.org/jbossas/7.1/jboss-as-7.1.1.Final
+jbossas711.build.name=jboss-as-7.1.1.Final
+jbossas711.build.archive=${jbossas711.build.name}.zip
+jbossas711.build.archive.md5=175c92545454f4e7270821f4b8326c4e
+
+build.uri=${jbossas711.build.uri}
+build.archive=${jbossas711.build.archive}
+md5=${jbossas711.build.archive.md5}
+
13 years, 11 months
JBoss Tools SVN: r40268 - trunk/documentation/movies.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2012-04-18 03:52:41 -0400 (Wed, 18 Apr 2012)
New Revision: 40268
Modified:
trunk/documentation/movies/index.html
Log:
more specific ids
Modified: trunk/documentation/movies/index.html
===================================================================
--- trunk/documentation/movies/index.html 2012-04-18 07:42:43 UTC (rev 40267)
+++ trunk/documentation/movies/index.html 2012-04-18 07:52:41 UTC (rev 40268)
@@ -57,22 +57,22 @@
<div class="thumbnails span4">
<h2>Installation</h2>
<ul class="items">
- <li><a class="videocontrol" href="marketplace">Eclipse
+ <li><a class="videocontrol" href="marketplaceinstallation">Eclipse
Marketplace</a></li>
- <li><a class="videocontrol" href="installation">JBDS 5
+ <li><a class="videocontrol" href="jbdsinstallation">JBDS 5
Installation, HTML5, Mobile & OpenShift</a></li>
</ul>
</div>
<div class="thumbnails span4">
<h2>Technology Introductions</h2>
<ul class="items">
- <li><a class="videocontrol" href="jee6arquillian">Java EE 6 +
+ <li><a class="videocontrol" href="jee6arquillianintro">Java EE 6 +
Arquillian</a></li>
- <li><a class="videocontrol" href="richfaces">Richfaces 4
+ <li><a class="videocontrol" href="richfacesintro">Richfaces 4
Desktop & Mobile</a></li>
- <li><a class="videocontrol" href="forge">Forge in JBoss
+ <li><a class="videocontrol" href="forgeintro">Forge in JBoss
Developer Studio 5</a></li>
- <li><a class="videocontrol" href="gwt">Google Web
+ <li><a class="videocontrol" href="gwtintro">Google Web
Toolkit</a></li>
</ul>
</div>
13 years, 11 months
JBoss Tools SVN: r40266 - in trunk/documentation/movies: css and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-04-18 03:42:34 -0400 (Wed, 18 Apr 2012)
New Revision: 40266
Modified:
trunk/documentation/movies/css/movies.css
trunk/documentation/movies/index.html
Log:
Adapting video and links size for smaller screens
Modified: trunk/documentation/movies/css/movies.css
===================================================================
--- trunk/documentation/movies/css/movies.css 2012-04-18 07:06:04 UTC (rev 40265)
+++ trunk/documentation/movies/css/movies.css 2012-04-18 07:42:34 UTC (rev 40266)
@@ -16,11 +16,17 @@
background-image: url("../images/community/jbosstools_horiz_450.png");
background-repeat: no-repeat;
background-position: center;
- padding-top: 150px;
+ padding-top: 100px;
padding-bottom: 20px;
text-align: center;
}
+.container-reduced {
+ width:75%;
+ margin-left: auto;
+ margin-right: auto;
+}
+
#player iframe {
width: 100%;
height: 100%;
@@ -42,7 +48,7 @@
.box #player {
width: 100%;
- height: 648px;
+ height: 400px;
background: black;
border: 1px solid black;
margin-left: auto;
Modified: trunk/documentation/movies/index.html
===================================================================
--- trunk/documentation/movies/index.html 2012-04-18 07:06:04 UTC (rev 40265)
+++ trunk/documentation/movies/index.html 2012-04-18 07:42:34 UTC (rev 40266)
@@ -43,6 +43,7 @@
<div class="jbosstools-header">
<h1>Video Tutorials</h1>
</div>
+ <div class="container-reduced">
<div class="box">
<div id="player">
<iframe src="http://player.vimeo.com/video/39743315?portrait=0"
@@ -76,7 +77,7 @@
</ul>
</div>
<div class="thumbnails span4">
- <h2>Reverse Engineering/CRUD Generation</h2>
+ <h2>Reverse Engineering / CRUD Generation</h2>
<ul class="items">
<li><a class="videocontrol" href="hibreveng">Hibernate
Tools Reverse Engineering</a></li>
@@ -92,6 +93,7 @@
href="../archive/movies">archive</a>
</p>
</div>
+ </div>
</div>
13 years, 11 months
JBoss Tools SVN: r40265 - in trunk: jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/projects and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2012-04-18 03:06:04 -0400 (Wed, 18 Apr 2012)
New Revision: 40265
Added:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/projects/
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/projects/jsf12importtest.zip
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/compatibility/
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/compatibility/ImportJSF12ProjectFromJBDS4x.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java
Log:
Added test of importing JSF1.2 project created with JBDS 4.1.x
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/projects/jsf12importtest.zip
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/projects/jsf12importtest.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java 2012-04-18 03:25:49 UTC (rev 40264)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java 2012-04-18 07:06:04 UTC (rev 40265)
@@ -1,5 +1,6 @@
package org.jboss.tools.jsf.ui.bot.test;
+import org.jboss.tools.jsf.ui.bot.test.compatibility.ImportJSF12ProjectFromJBDS4x;
import org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide.CSSSelectorJBIDE3288;
import org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide.JBIDE3148and4441Test;
import org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide.JBIDE3577Test;
@@ -56,7 +57,8 @@
WebXmlEditorTest.class,
CreateNewTemplateFromJSFProject.class,
PropertiesEditorTest.class,
- CreateJSF2CompositeComponentMenuTest.class
+ CreateJSF2CompositeComponentMenuTest.class,
+ ImportJSF12ProjectFromJBDS4x.class
})
public class JSFAllBotTests{
}
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/compatibility/ImportJSF12ProjectFromJBDS4x.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/compatibility/ImportJSF12ProjectFromJBDS4x.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/compatibility/ImportJSF12ProjectFromJBDS4x.java 2012-04-18 07:06:04 UTC (rev 40265)
@@ -0,0 +1,118 @@
+ /*******************************************************************************
+ * Copyright (c) 2007-2012 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.jsf.ui.bot.test.compatibility;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase;
+import org.jboss.tools.ui.bot.ext.SWTBotExt;
+import org.jboss.tools.ui.bot.ext.SWTEclipseExt;
+import org.jboss.tools.ui.bot.ext.Timing;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem.Import.OtherJSFProject;
+import org.jboss.tools.ui.bot.ext.helper.FileHelper;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
+import org.jboss.tools.ui.bot.ext.view.ProblemsView;
+import org.jboss.tools.ui.bot.ext.wizards.SWTBotImportWizard;
+/**
+ * Test importing JSF 1.2 project created using JBDS 4.1.x
+ * @author Vladimir Pakan
+ *
+ */
+public class ImportJSF12ProjectFromJBDS4x extends JSFAutoTestCase{
+
+ private SWTBotExt botExt;
+ private static final String PROJECT_TO_IMPORT_NAME = "jsf12importtest";
+
+ public void setUp() throws Exception {
+ super.setUp();
+ this.botExt = new SWTBotExt();
+ }
+
+ public void testImportJSFProject() {
+ // copy and unzip JSF 1.2 project to tmp directory
+ try{
+ final String projectToImportZipName = ImportJSF12ProjectFromJBDS4x.PROJECT_TO_IMPORT_NAME + ".zip";
+ final String resourceProjectToImportLocation = getPathToResources("projects" + File.separator + projectToImportZipName);
+ final String tmpDir = System.getProperty("java.io.tmpdir",".");
+ FileHelper.copyFilesBinary(new File(resourceProjectToImportLocation),
+ new File(tmpDir));
+ FileHelper.unzipArchive(new File(tmpDir,projectToImportZipName),
+ new File(tmpDir));
+ final String projectToImportLocation = tmpDir + File.separator + ImportJSF12ProjectFromJBDS4x.PROJECT_TO_IMPORT_NAME;
+ new SWTBotImportWizard().open(OtherJSFProject.LABEL);
+ bot.textWithLabel(OtherJSFProject.TEXT_WEBXML_LOCATION)
+ .setText(projectToImportLocation
+ + File.separator + "WebContent"
+ + File.separator + "WEB-INF"
+ + File.separator + "web.xml");
+ bot.button(IDELabel.Button.NEXT).click();
+ SWTBotCheckBox chbServerRuntime = bot.checkBox(1);
+ if (chbServerRuntime.isChecked()){
+ chbServerRuntime.deselect();
+ }
+ bot.button(IDELabel.Button.FINISH).click();
+ util.waitForAll(Timing.time10S());
+ // wait till Building workspace job is started
+ util.waitForNonIgnoredJobs(Timing.time60S());
+ // check if project is present within package explorer
+ assertTrue("Imported project " + ImportJSF12ProjectFromJBDS4x.PROJECT_TO_IMPORT_NAME + " is not present in Packag Explorer",
+ eclipse.isProjectInPackageExplorer(PROJECT_TO_IMPORT_NAME));
+ SWTBotTreeItem[] errors = ProblemsView.getFilteredErrorsTreeItems(botExt,
+ null,
+ File.separator + ImportJSF12ProjectFromJBDS4x.PROJECT_TO_IMPORT_NAME,
+ null,
+ null);
+ // check if imported project has no errors and no warnings
+ assertTrue("There were these errors when importing "
+ + ImportJSF12ProjectFromJBDS4x.PROJECT_TO_IMPORT_NAME
+ + " project"
+ + SWTEclipseExt.getFormattedTreeNodesText(errors),
+ errors == null || errors.length == 0);
+ SWTBotTreeItem[] warnings = ProblemsView.getFilteredErrorsTreeItems(botExt,
+ null,
+ File.separator + ImportJSF12ProjectFromJBDS4x.PROJECT_TO_IMPORT_NAME,
+ null,
+ null);
+ assertTrue("There were these warnings when importing "
+ + ImportJSF12ProjectFromJBDS4x.PROJECT_TO_IMPORT_NAME
+ + " project"
+ + SWTEclipseExt.getFormattedTreeNodesText(warnings),
+ errors == null || errors.length == 0);
+ }catch (IOException ioe){
+ throw new RuntimeException("Unable to copy and unzip necessary files from plugin's resources directory",ioe);
+ }catch (Exception e){
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Override
+ public void tearDown() throws Exception {
+ if (eclipse.isProjectInPackageExplorer(PROJECT_TO_IMPORT_NAME)){
+ packageExplorer.deleteProject(ImportJSF12ProjectFromJBDS4x.PROJECT_TO_IMPORT_NAME, true);
+ }
+ super.tearDown();
+ }
+
+ @Override
+ protected void closeUnuseDialogs() {
+ // not used
+ }
+
+ @Override
+ protected boolean isUnuseDialogOpened() {
+ return false;
+ }
+
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/compatibility/ImportJSF12ProjectFromJBDS4x.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java 2012-04-18 03:25:49 UTC (rev 40264)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java 2012-04-18 07:06:04 UTC (rev 40265)
@@ -6618,7 +6618,7 @@
/**
* text field labeled 'web.xml Location*'
*/
- public static final String TEXT_WEBXML_LOCATION = "web.xml Location*";
+ public static final String TEXT_WEBXML_LOCATION = "web.xml Location:*";
/**
* text field labeled 'Project Name*'
*/
13 years, 11 months
JBoss Tools SVN: r40264 - in trunk/as/plugins: org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-04-17 23:25:49 -0400 (Tue, 17 Apr 2012)
New Revision: 40264
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBoss71ServerConnection.java
trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/JBoss7ManagerServiceProxy.java
Log:
JBIDE-11064 for as7.1.0 remote, adds cleanup of threads where possible
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBoss71ServerConnection.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBoss71ServerConnection.java 2012-04-18 01:32:40 UTC (rev 40263)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBoss71ServerConnection.java 2012-04-18 03:25:49 UTC (rev 40264)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.jmx.integration;
+import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
@@ -31,14 +32,17 @@
super(server);
}
- protected void initializeEnvironment(IServer s, String user, String pass) throws CredentialException {
- // Do nothing
- }
-
public IConnectionProvider getProvider() {
return ExtensionManager.getProvider(JBoss71ConnectionProvider.PROVIDER_ID);
}
+ private String user;
+ private String pass;
+ protected void initializeEnvironment(IServer s, String user, String pass) throws CredentialException {
+ this.user = user;
+ this.pass = pass;
+ }
+
protected MBeanServerConnection createConnection(IServer s) throws Exception {
ServerDelegate sd = (ServerDelegate)s.loadAdapter(ServerDelegate.class, null);
int port = -1;
@@ -50,9 +54,20 @@
String url = "service:jmx:remoting-jmx://" + s.getHost() + ":" + port;
Map<String, String[]> environment = new HashMap<String, String[]>();
- JMXConnector connector = JMXConnectorFactory.connect(new JMXServiceURL(url), environment);
- MBeanServerConnection connection = connector.getMBeanServerConnection();
- return connection;
+ environment.put(JMXConnector.CREDENTIALS, new String[]{user,pass});
+
+ JMXConnector connector = null;
+ try {
+ connector = JMXConnectorFactory.connect(new JMXServiceURL(url), environment);
+ MBeanServerConnection connection = connector.getMBeanServerConnection();
+ return connection;
+ } catch(IOException ioe) {
+ if( connector != null ) {
+ try {
+ connector.close();
+ } catch(Exception e) { /* Ignore */ }
+ }
+ return null;
+ }
}
-
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection.java 2012-04-18 01:32:40 UTC (rev 40263)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection.java 2012-04-18 03:25:49 UTC (rev 40264)
@@ -191,26 +191,7 @@
protected void checkState() {
IDeployableServer jbs = ServerConverter.getDeployableServer(server);
if( server.getServerState() == IServer.STATE_STARTED && jbs != null && jbs.hasJMXProvider()) {
- try {
- run(new IJMXRunnable() {
- public void run(MBeanServerConnection connection)
- throws Exception {
- // Do nothing, just see if the connection worked
- }
- }, true);
- if( !isConnected ) {
- isConnected = true;
- ((AbstractJBossJMXConnectionProvider)getProvider()).fireChanged(JBossServerConnection.this);
- }
- } catch( Exception jmxe ) {
- IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Error connecting to jmx for server "+server.getName(), jmxe);
- ServerLogger.getDefault().log(server, status);
- // I thought i was connected but I'm not.
- if( isConnected ) {
- isConnected = false;
- ((AbstractJBossJMXConnectionProvider)getProvider()).fireChanged(JBossServerConnection.this);
- }
- }
+ connectToStartedServer();
} else {
root = null;
if( isConnected ) {
@@ -221,6 +202,28 @@
}
}
+ protected void connectToStartedServer() {
+ try {
+ run(new IJMXRunnable() {
+ public void run(MBeanServerConnection connection)
+ throws Exception {
+ // Do nothing, just see if the connection worked
+ }
+ }, true);
+ if( !isConnected ) {
+ isConnected = true;
+ ((AbstractJBossJMXConnectionProvider)getProvider()).fireChanged(JBossServerConnection.this);
+ }
+ } catch( Exception jmxe ) {
+ IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Error connecting to jmx for server "+server.getName(), jmxe);
+ ServerLogger.getDefault().log(server, status);
+ // I thought i was connected but I'm not.
+ if( isConnected ) {
+ isConnected = false;
+ ((AbstractJBossJMXConnectionProvider)getProvider()).fireChanged(JBossServerConnection.this);
+ }
+ }
+ }
/* *************
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/JBoss7ManagerServiceProxy.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/JBoss7ManagerServiceProxy.java 2012-04-18 01:32:40 UTC (rev 40263)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/JBoss7ManagerServiceProxy.java 2012-04-18 03:25:49 UTC (rev 40264)
@@ -88,6 +88,9 @@
}
public void dispose() {
+ IJBoss7ManagerService service = getService();
+ if( service != null )
+ service.dispose();
close();
}
13 years, 11 months
JBoss Tools SVN: r40263 - trunk/ws/tests/org.jboss.tools.ws.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-04-17 21:32:40 -0400 (Tue, 17 Apr 2012)
New Revision: 40263
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/build.properties
Log:
include projects folder into bundle
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/build.properties
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/build.properties 2012-04-18 01:31:03 UTC (rev 40262)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/build.properties 2012-04-18 01:32:40 UTC (rev 40263)
@@ -3,4 +3,4 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- resources/
+ projects/
13 years, 11 months