JBoss Tools SVN: r26597 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-11-16 00:03:24 -0500 (Tue, 16 Nov 2010)
New Revision: 26597
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnection.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java
Log:
JBIDE-7608
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java 2010-11-16 04:29:05 UTC (rev 26596)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java 2010-11-16 05:03:24 UTC (rev 26597)
@@ -81,6 +81,7 @@
public static String JMXPauseScannerError;
public static String JMXResumeScannerError;
public static String JMXScannerCanceled;
+ public static String ConnectingToServerViaJMX;
public static String CannotSaveServersStartArgs;
public static String PublishRenameFailure;
static {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2010-11-16 04:29:05 UTC (rev 26596)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2010-11-16 05:03:24 UTC (rev 26597)
@@ -63,3 +63,4 @@
JMXPauseScannerError=JBossTools was unable to pause the JBoss deployment scanner. For optimal performance, verify your version includes an unsecured JMX RMI adaptor
JMXResumeScannerError=JBossTools was unable to resume the JBoss deployment scanner. For optimal performance, verify your version includes an unsecured JMX RMI adaptor
JMXScannerCanceled=JBossTools was unable to contact the JBoss deployment scanner in a reasonable amount of time. This step has been skipped.
+ConnectingToServerViaJMX=Connecting to {0} via JMX
\ No newline at end of file
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnection.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnection.java 2010-11-16 04:29:05 UTC (rev 26596)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnection.java 2010-11-16 05:03:24 UTC (rev 26597)
@@ -18,6 +18,7 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.IServerListener;
import org.eclipse.wst.server.core.ServerEvent;
@@ -109,7 +110,13 @@
if ((eventKind & ServerEvent.SERVER_CHANGE) != 0) {
// server change event
if ((eventKind & ServerEvent.STATE_CHANGE) != 0) {
- checkState();
+ new Job("Connecting to " + event.getServer().getName() + " via JMX") { //$NON-NLS-1$ //$NON-NLS-2$
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ checkState();
+ return Status.OK_STATUS;
+ }
+ }.schedule();
}
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java 2010-11-16 04:29:05 UTC (rev 26596)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java 2010-11-16 05:03:24 UTC (rev 26597)
@@ -219,13 +219,7 @@
boolean started = new WebPortPoller().onePing(beh.getServer());
if( started ) {
beh.setServerStarting();
- new Job("Setting server as started") {
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- beh.setServerStarted();
- return Status.OK_STATUS;
- }
- }.schedule();
+ beh.setServerStarted();
return false;
}
return true;
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26596 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-11-15 23:29:05 -0500 (Mon, 15 Nov 2010)
New Revision: 26596
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java
Log:
JBIDE-7580 JBIDE-7579 improving handling for rse
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java 2010-11-16 01:43:37 UTC (rev 26595)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java 2010-11-16 04:29:05 UTC (rev 26596)
@@ -19,6 +19,7 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
@@ -141,19 +142,18 @@
public static void launchStopServerCommand(JBossServerBehavior behaviour) {
behaviour.setServerStopping();
- IPath home = new Path(RSEUtils.getRSEHomeDir(behaviour.getServer()));
- IPath shutdown = home.append(IJBossRuntimeResourceConstants.BIN)
- .append(IJBossRuntimeResourceConstants.SHUTDOWN_SH);
- String hostname = behaviour.getServer().getHost();
- JBossServer jbs = ServerConverter.getJBossServer(behaviour.getServer());
- String user = jbs.getUsername();
- String pass = jbs.getPassword();
- IJBossRuntimeConstants rc = new IJBossRuntimeConstants() {};
- final String command = shutdown.toString() + rc.SPACE + rc.SHUTDOWN_STOP_ARG + rc.SPACE
- + rc.SHUTDOWN_SERVER_ARG + rc.SPACE + hostname + rc.SPACE + rc.SHUTDOWN_USER_ARG
- + rc.SPACE + user + rc.SPACE + rc.SHUTDOWN_PASS_ARG + rc.SPACE + pass;
+ ILaunchConfiguration config = null;
+ String command2 = "";
+ try {
+ config = behaviour.getServer().getLaunchConfiguration(false, new NullProgressMonitor());
+ String defaultCmd = getDefaultStopCommand(behaviour.getServer());
+ command2 = config == null ? defaultCmd :
+ config.getAttribute(RSE_SHUTDOWN_COMMAND, defaultCmd);
+ } catch(CoreException ce) {
+ }
+ final String command = command2;
IShellService service = null;
try {
service = findShellService(behaviour);
@@ -215,10 +215,17 @@
public boolean preLaunchCheck(ILaunchConfiguration configuration,
String mode, IProgressMonitor monitor) throws CoreException {
// ping if up
- JBossServerBehavior beh = LocalJBossServerStartupLaunchUtil.getServerBehavior(configuration);
+ final JBossServerBehavior beh = LocalJBossServerStartupLaunchUtil.getServerBehavior(configuration);
boolean started = new WebPortPoller().onePing(beh.getServer());
if( started ) {
- beh.setServerStarted();
+ beh.setServerStarting();
+ new Job("Setting server as started") {
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ beh.setServerStarted();
+ return Status.OK_STATUS;
+ }
+ }.schedule();
return false;
}
return true;
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26595 - in trunk: jsf/tests/org.jboss.tools.jsf.test/META-INF and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-11-15 20:43:37 -0500 (Mon, 15 Nov 2010)
New Revision: 26595
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF
Log:
https://jira.jboss.org/browse/JBIDE-7606 org.jboss.tools.jsf.test tests are very slow and network monitor shows active downloads during tests execution
dependency to wst.standsatd.schemas added to fix downloading dtd's from internet during test execution
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/META-INF/MANIFEST.MF 2010-11-16 01:33:41 UTC (rev 26594)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/META-INF/MANIFEST.MF 2010-11-16 01:43:37 UTC (rev 26595)
@@ -90,7 +90,9 @@
org.eclipse.wst.html.core,
org.eclipse.pde.ui,
org.eclipse.core.expressions;bundle-version="[3.4.100,4.0.0)",
- org.jboss.tools.common.ui
+ org.jboss.tools.common.ui,
+ org.eclipse.jst.standard.schemas,
+ org.eclipse.wst.standard.schemas
Bundle-Version: 3.2.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: org.jboss.tools.common.model.ui.jar
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2010-11-16 01:33:41 UTC (rev 26594)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2010-11-16 01:43:37 UTC (rev 26595)
@@ -32,9 +32,7 @@
org.eclipse.wst.validation,
org.jboss.tools.common.el.core,
org.jboss.tools.jst.jsp,
- org.jboss.tools.common.model.test,
- org.eclipse.jst.standard.schemas,
- org.eclipse.wst.standard.schemas;bundle-version="1.0.300"
+ org.jboss.tools.common.model.test
Bundle-Activator: org.jboss.tools.jsf.plugin.JsfTestPlugin
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF 2010-11-16 01:33:41 UTC (rev 26594)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF 2010-11-16 01:43:37 UTC (rev 26595)
@@ -56,7 +56,9 @@
org.eclipse.emf.ecore;bundle-version="2.5.0",
org.eclipse.compare,
org.eclipse.wst.dtd.core,
- org.eclipse.ui
+ org.eclipse.ui,
+ org.eclipse.jst.standard.schemas,
+ org.eclipse.wst.standard.schemas
Bundle-Version: 3.2.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: org.jboss.tools.jsf.model.pv
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26594 - in trunk/jmx: docs/reference and 9 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-11-15 20:33:41 -0500 (Mon, 15 Nov 2010)
New Revision: 26594
Modified:
trunk/jmx/docs/reference/pom.xml
trunk/jmx/features/org.jboss.tools.jmx.feature/pom.xml
trunk/jmx/features/org.jboss.tools.jmx.tests.feature/pom.xml
trunk/jmx/features/pom.xml
trunk/jmx/plugins/org.jboss.tools.jmx.core/pom.xml
trunk/jmx/plugins/org.jboss.tools.jmx.ui/pom.xml
trunk/jmx/plugins/pom.xml
trunk/jmx/pom.xml
trunk/jmx/tests/org.jboss.tools.jmx.core.test/pom.xml
trunk/jmx/tests/org.jboss.tools.jmx.ui.test/pom.xml
trunk/jmx/tests/pom.xml
Log:
tweak GVAs to use FQDNs
Modified: trunk/jmx/docs/reference/pom.xml
===================================================================
--- trunk/jmx/docs/reference/pom.xml 2010-11-16 01:27:28 UTC (rev 26593)
+++ trunk/jmx/docs/reference/pom.xml 2010-11-16 01:33:41 UTC (rev 26594)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.tools</groupId>
- <artifactId>jmx-tools-ref-guide-en-US</artifactId>
+ <artifactId>org.jboss.tools.jmx-tools-ref-guide-en-US</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>JMX_Tools_Reference_Guide</name>
Modified: trunk/jmx/features/org.jboss.tools.jmx.feature/pom.xml
===================================================================
--- trunk/jmx/features/org.jboss.tools.jmx.feature/pom.xml 2010-11-16 01:27:28 UTC (rev 26593)
+++ trunk/jmx/features/org.jboss.tools.jmx.feature/pom.xml 2010-11-16 01:33:41 UTC (rev 26594)
@@ -1,12 +1,12 @@
<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools.jmx.features</groupId>
+ <groupId>org.jboss.tools.jmx</groupId>
<artifactId>org.jboss.tools.jmx.feature</artifactId>
<version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
Modified: trunk/jmx/features/org.jboss.tools.jmx.tests.feature/pom.xml
===================================================================
--- trunk/jmx/features/org.jboss.tools.jmx.tests.feature/pom.xml 2010-11-16 01:27:28 UTC (rev 26593)
+++ trunk/jmx/features/org.jboss.tools.jmx.tests.feature/pom.xml 2010-11-16 01:33:41 UTC (rev 26594)
@@ -1,12 +1,12 @@
<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools.jmx.features</groupId>
+ <groupId>org.jboss.tools.jmx</groupId>
<artifactId>org.jboss.tools.jmx.tests.feature</artifactId>
<version>1.2.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
Modified: trunk/jmx/features/pom.xml
===================================================================
--- trunk/jmx/features/pom.xml 2010-11-16 01:27:28 UTC (rev 26593)
+++ trunk/jmx/features/pom.xml 2010-11-16 01:33:41 UTC (rev 26594)
@@ -2,13 +2,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.tools.jmx</groupId>
- <artifactId>features</artifactId>
+ <artifactId>org.jboss.tools.jmx.features</artifactId>
<version>0.0.1-SNAPSHOT</version>
- <name>jmx.features</name>
+ <name>org.jboss.tools.jmx.features</name>
<packaging>pom</packaging>
<modules>
<module>org.jboss.tools.jmx.feature</module>
<module>org.jboss.tools.jmx.tests.feature</module>
</modules>
</project>
-
\ No newline at end of file
+
Modified: trunk/jmx/plugins/org.jboss.tools.jmx.core/pom.xml
===================================================================
--- trunk/jmx/plugins/org.jboss.tools.jmx.core/pom.xml 2010-11-16 01:27:28 UTC (rev 26593)
+++ trunk/jmx/plugins/org.jboss.tools.jmx.core/pom.xml 2010-11-16 01:33:41 UTC (rev 26594)
@@ -1,12 +1,12 @@
<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools.jmx.plugins</groupId>
+ <groupId>org.jboss.tools.jmx</groupId>
<artifactId>org.jboss.tools.jmx.core</artifactId>
<version>1.2.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
Modified: trunk/jmx/plugins/org.jboss.tools.jmx.ui/pom.xml
===================================================================
--- trunk/jmx/plugins/org.jboss.tools.jmx.ui/pom.xml 2010-11-16 01:27:28 UTC (rev 26593)
+++ trunk/jmx/plugins/org.jboss.tools.jmx.ui/pom.xml 2010-11-16 01:33:41 UTC (rev 26594)
@@ -1,12 +1,12 @@
<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools.jmx.plugins</groupId>
+ <groupId>org.jboss.tools.jmx</groupId>
<artifactId>org.jboss.tools.jmx.ui</artifactId>
<version>1.2.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
Modified: trunk/jmx/plugins/pom.xml
===================================================================
--- trunk/jmx/plugins/pom.xml 2010-11-16 01:27:28 UTC (rev 26593)
+++ trunk/jmx/plugins/pom.xml 2010-11-16 01:33:41 UTC (rev 26594)
@@ -2,13 +2,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.tools.jmx</groupId>
- <artifactId>plugins</artifactId>
+ <artifactId>org.jboss.tools.jmx.plugins</artifactId>
<version>0.0.1-SNAPSHOT</version>
- <name>jmx.plugins</name>
+ <name>org.jboss.tools.jmx.plugins</name>
<packaging>pom</packaging>
<modules>
<module>org.jboss.tools.jmx.core</module>
<module>org.jboss.tools.jmx.ui</module>
</modules>
</project>
-
\ No newline at end of file
+
Modified: trunk/jmx/pom.xml
===================================================================
--- trunk/jmx/pom.xml 2010-11-16 01:27:28 UTC (rev 26593)
+++ trunk/jmx/pom.xml 2010-11-16 01:33:41 UTC (rev 26594)
@@ -1,10 +1,10 @@
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.tools</groupId>
- <artifactId>jmx</artifactId>
+ <groupId>org.jboss.tools.jmx</groupId>
+ <artifactId>org.jboss.tools.jmx.all</artifactId>
+ <name>org.jboss.tools.jmx.all</name>
<version>0.0.1-SNAPSHOT</version>
- <name>jmx.all</name>
<packaging>pom</packaging>
<modules>
<module>features</module>
Modified: trunk/jmx/tests/org.jboss.tools.jmx.core.test/pom.xml
===================================================================
--- trunk/jmx/tests/org.jboss.tools.jmx.core.test/pom.xml 2010-11-16 01:27:28 UTC (rev 26593)
+++ trunk/jmx/tests/org.jboss.tools.jmx.core.test/pom.xml 2010-11-16 01:33:41 UTC (rev 26594)
@@ -1,12 +1,12 @@
<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools.jmx.tests</groupId>
+ <groupId>org.jboss.tools.jmx</groupId>
<artifactId>org.jboss.tools.jmx.core.test</artifactId>
<version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
Modified: trunk/jmx/tests/org.jboss.tools.jmx.ui.test/pom.xml
===================================================================
--- trunk/jmx/tests/org.jboss.tools.jmx.ui.test/pom.xml 2010-11-16 01:27:28 UTC (rev 26593)
+++ trunk/jmx/tests/org.jboss.tools.jmx.ui.test/pom.xml 2010-11-16 01:33:41 UTC (rev 26594)
@@ -6,7 +6,7 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools.jmx.tests</groupId>
+ <groupId>org.jboss.tools.jmx</groupId>
<artifactId>org.jboss.tools.jmx.ui.test</artifactId>
<version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
Modified: trunk/jmx/tests/pom.xml
===================================================================
--- trunk/jmx/tests/pom.xml 2010-11-16 01:27:28 UTC (rev 26593)
+++ trunk/jmx/tests/pom.xml 2010-11-16 01:33:41 UTC (rev 26594)
@@ -2,8 +2,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.tools.jmx</groupId>
- <artifactId>tests</artifactId>
- <name>jmx.tests</name>
+ <artifactId>org.jboss.tools.jmx.tests</artifactId>
+ <name>org.jboss.tools.jmx.tests</name>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
@@ -11,4 +11,4 @@
<module>org.jboss.tools.jmx.ui.test</module>
</modules>
</project>
-
\ No newline at end of file
+
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26593 - in trunk/modeshape: features and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-11-15 20:27:28 -0500 (Mon, 15 Nov 2010)
New Revision: 26593
Modified:
trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/pom.xml
trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/pom.xml
trunk/modeshape/features/pom.xml
trunk/modeshape/plugins/pom.xml
trunk/modeshape/pom.xml
trunk/modeshape/site/pom.xml
trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/pom.xml
trunk/modeshape/tests/pom.xml
Log:
tweak GVAs to use FQDNs
Modified: trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/pom.xml
===================================================================
--- trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/pom.xml 2010-11-16 01:27:10 UTC (rev 26592)
+++ trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/pom.xml 2010-11-16 01:27:28 UTC (rev 26593)
@@ -1,12 +1,12 @@
<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools.modeshape.features</groupId>
+ <groupId>org.jboss.tools.modeshape</groupId>
<artifactId>org.jboss.tools.modeshape.rest.feature</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
Modified: trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/pom.xml
===================================================================
--- trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/pom.xml 2010-11-16 01:27:10 UTC (rev 26592)
+++ trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/pom.xml 2010-11-16 01:27:28 UTC (rev 26593)
@@ -1,12 +1,12 @@
<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools.modeshape.features</groupId>
+ <groupId>org.jboss.tools.modeshape</groupId>
<artifactId>org.jboss.tools.modeshape.rest.test.feature</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
Modified: trunk/modeshape/features/pom.xml
===================================================================
--- trunk/modeshape/features/pom.xml 2010-11-16 01:27:10 UTC (rev 26592)
+++ trunk/modeshape/features/pom.xml 2010-11-16 01:27:28 UTC (rev 26593)
@@ -1,9 +1,9 @@
<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.tools.modeshape</groupId>
- <artifactId>features</artifactId>
- <name>modeshape.features</name>
+ <artifactId>org.jboss.tools.modeshape.features</artifactId>
+ <name>org.jboss.tools.modeshape.features</name>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
@@ -11,4 +11,3 @@
<module>org.jboss.tools.modeshape.rest.test.feature</module>
</modules>
</project>
-
Modified: trunk/modeshape/plugins/pom.xml
===================================================================
--- trunk/modeshape/plugins/pom.xml 2010-11-16 01:27:10 UTC (rev 26592)
+++ trunk/modeshape/plugins/pom.xml 2010-11-16 01:27:28 UTC (rev 26593)
@@ -1,13 +1,12 @@
<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.tools.modeshape</groupId>
- <artifactId>plugins</artifactId>
- <name>modeshape.plugins</name>
+ <artifactId>org.jboss.tools.modeshape.plugins</artifactId>
+ <name>org.jboss.tools.modeshape.plugins</name>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<module>org.jboss.tools.modeshape.rest</module>
</modules>
</project>
-
Modified: trunk/modeshape/pom.xml
===================================================================
--- trunk/modeshape/pom.xml 2010-11-16 01:27:10 UTC (rev 26592)
+++ trunk/modeshape/pom.xml 2010-11-16 01:27:28 UTC (rev 26593)
@@ -2,8 +2,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.tools</groupId>
- <artifactId>modeshape</artifactId>
- <name>modeshape.all</name>
+ <artifactId>org.jboss.tools.modeshape.all</artifactId>
+ <name>org.jboss.tools.modeshape.all</name>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
Modified: trunk/modeshape/site/pom.xml
===================================================================
--- trunk/modeshape/site/pom.xml 2010-11-16 01:27:10 UTC (rev 26592)
+++ trunk/modeshape/site/pom.xml 2010-11-16 01:27:28 UTC (rev 26593)
@@ -1,14 +1,14 @@
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
-
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.modeshape</groupId>
- <artifactId>modeshape.site</artifactId>
- <name>modeshape.site</name>
+ <artifactId>org.jboss.tools.modeshape.modeshape.site</artifactId>
+ <name>org.jboss.tools.modeshape.site</name>
<version>0.0.1-SNAPSHOT</version>
<packaging>eclipse-update-site</packaging>
</project>
Modified: trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/pom.xml
===================================================================
--- trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/pom.xml 2010-11-16 01:27:10 UTC (rev 26592)
+++ trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/pom.xml 2010-11-16 01:27:28 UTC (rev 26593)
@@ -1,16 +1,15 @@
<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools.modeshape.tests</groupId>
+ <groupId>org.jboss.tools.modeshape</groupId>
<artifactId>org.jboss.tools.modeshape.rest.test</artifactId>
<version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
-
<properties>
<emma.filter>org.jboss.tools.modeshape.rest*</emma.filter>
<emma.instrument.bundles>org.jboss.tools.modeshape.rest</emma.instrument.bundles>
Modified: trunk/modeshape/tests/pom.xml
===================================================================
--- trunk/modeshape/tests/pom.xml 2010-11-16 01:27:10 UTC (rev 26592)
+++ trunk/modeshape/tests/pom.xml 2010-11-16 01:27:28 UTC (rev 26593)
@@ -1,13 +1,11 @@
<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.tools.modeshape</groupId>
- <artifactId>tests</artifactId>
- <name>modeshape.tests</name>
+ <artifactId>org.jboss.tools.modeshape.tests</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<module>org.jboss.tools.modeshape.rest.test</module>
</modules>
</project>
-
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26592 - trunk/modeshape/plugins/org.jboss.tools.modeshape.rest.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-11-15 20:27:10 -0500 (Mon, 15 Nov 2010)
New Revision: 26592
Modified:
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/pom.xml
Log:
fix groupId
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/pom.xml
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/pom.xml 2010-11-16 01:07:23 UTC (rev 26591)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/pom.xml 2010-11-16 01:27:10 UTC (rev 26592)
@@ -7,7 +7,7 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools.modeshape.plugins</groupId>
+ <groupId>org.jboss.tools.modeshape</groupId>
<artifactId>org.jboss.tools.modeshape.rest</artifactId>
<version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26591 - trunk/esb/tests/org.jboss.tools.esb.validator.test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-11-15 20:07:23 -0500 (Mon, 15 Nov 2010)
New Revision: 26591
Modified:
trunk/esb/tests/org.jboss.tools.esb.validator.test/pom.xml
Log:
https://jira.jboss.org/browse/JBIDE-7607 org.jboss.tools.esb.validator.test.ESBValidatorAllTests
fixed
coverage properties added to esb.validator.test pom.xml
Modified: trunk/esb/tests/org.jboss.tools.esb.validator.test/pom.xml
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.validator.test/pom.xml 2010-11-16 00:14:44 UTC (rev 26590)
+++ trunk/esb/tests/org.jboss.tools.esb.validator.test/pom.xml 2010-11-16 01:07:23 UTC (rev 26591)
@@ -10,4 +10,9 @@
<artifactId>org.jboss.tools.esb.validator.test</artifactId>
<version>1.3.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
+
+ <properties>
+ <emma.filter>org.jboss.tools.esb.*</emma.filter>
+ <emma.instrument.bundles>org.jboss.tools.esb.core,org.jboss.tools.esb.validator,org.jboss.tools.esb.project.core</emma.instrument.bundles>
+ </properties>
</project>
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26590 - trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-11-15 19:14:44 -0500 (Mon, 15 Nov 2010)
New Revision: 26590
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF
Log:
https://jira.jboss.org/browse/JBIDE-7606 org.jboss.tools.jsf.test tests are very slow and network monitor shows active downloads during tests execution
dependency to wst.standsatd.schemas added to fix downloading dtd's from internet during test execution
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2010-11-15 23:26:40 UTC (rev 26589)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2010-11-16 00:14:44 UTC (rev 26590)
@@ -33,7 +33,8 @@
org.jboss.tools.common.el.core,
org.jboss.tools.jst.jsp,
org.jboss.tools.common.model.test,
- org.eclipse.jst.standard.schemas
+ org.eclipse.jst.standard.schemas,
+ org.eclipse.wst.standard.schemas;bundle-version="1.0.300"
Bundle-Activator: org.jboss.tools.jsf.plugin.JsfTestPlugin
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26589 - in trunk/deltacloud/plugins: org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-15 18:26:40 -0500 (Mon, 15 Nov 2010)
New Revision: 26589
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ErrorUtils.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/RSEUtils.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ShowRSEViewRunnable.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java
Removed:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnection.java
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/NewConnectionHandler.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RefreshInstancesHandler.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/ShowInRemoteSystemExplorerHandler.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/PerformDestroyInstanceActionThread.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/PerformInstanceActionThread.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceModel.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard2.java
Log:
[JBIDE-7603] removed lot of duplicate code, added error dialog when failing to open remote system explorer
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-11-15 22:55:00 UTC (rev 26588)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-11-15 23:26:40 UTC (rev 26589)
@@ -1,3 +1,13 @@
+2010-11-16 André Dietisheim <adietish(a)redhat.com>
+
+ * src/org/jboss/tools/deltacloud/core/DeltaCloud.java (registerInstanceJob):
+ (getInstanceJob):
+ (registerInstanceJob):
+ (removeInstanceJob):
+ [JBIDE-7603] renamed instance job related methods from action job to instance job (since jobs are not only used for actions)
+ (waitWhilePending):
+ [JBIDE-7603] moved (duplicate) instance state waiting code to delta cloud and removed duplication
+
2010-11-11 André Dietisheim <adietish(a)redhat.com>
* src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java (DeltaCloudInstance):
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-11-15 22:55:00 UTC (rev 26588)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-11-15 23:26:40 UTC (rev 26589)
@@ -18,6 +18,7 @@
import java.util.Map;
import java.util.regex.PatternSyntaxException;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.ListenerList;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.equinox.security.storage.EncodingUtils;
@@ -256,7 +257,7 @@
((IImageListListener) listeners[i]).listChanged(this, array);
}
- public Job getActionJob(String id) {
+ public Job getInstanceJob(String id) {
synchronized (actionLock) {
Job j = null;
if (actionJobs != null) {
@@ -266,7 +267,7 @@
}
}
- public void registerActionJob(String id, Job j) {
+ public void registerInstanceJob(String id, Job j) {
synchronized (actionLock) {
if (actionJobs == null)
actionJobs = new HashMap<String, Job>();
@@ -274,7 +275,19 @@
}
}
- public void removeActionJob(String id, Job j) {
+ public DeltaCloudInstance waitWhilePending(String instanceId, IProgressMonitor pm) throws InterruptedException {
+ DeltaCloudInstance instance = null;
+ while (!pm.isCanceled()) {
+ instance = refreshInstance(instanceId);
+ if (instance != null && !instance.getState().equals(DeltaCloudInstance.PENDING)) {
+ return instance;
+ }
+ Thread.sleep(400);
+ }
+ return instance;
+ }
+
+ public void removeInstanceJob(String id, Job j) {
synchronized (actionLock) {
if (actionJobs != null && actionJobs.get(id) == j)
actionJobs.remove(id);
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-11-15 22:55:00 UTC (rev 26588)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-11-15 23:26:40 UTC (rev 26589)
@@ -1,3 +1,13 @@
+2010-11-16 André Dietisheim <adietish(a)redhat.com>
+
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard2.java (WatchCreateJob.run):
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java (WatchCreateJob.run):
+ [JBIDE-7603] moved (duplicate) instance state waiting code to delta cloud and removed duplication
+ * src/org/jboss/tools/deltacloud/ui/commands/ShowInRemoteSystemExplorerHandler.java (execute):
+ [JBIDE-7603] unified RSE related (duplicate) code with code in NewConnectionHandler2
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java:
+ [JBIDE-7603] renamed NewCloudConnection to NewCloudConnectionWizard (since it is a wizard)
+
2010-11-15 André Dietisheim <adietish(a)redhat.com>
* src/org/jboss/tools/deltacloud/ui/commands/ShowInRemoteSystemExplorerHandler.java (launchRemoteSystemExplorer):
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2010-11-15 22:55:00 UTC (rev 26588)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2010-11-15 23:26:40 UTC (rev 26589)
@@ -78,7 +78,7 @@
</category>
<wizard
category="org.jboss.tools.deltacloud.ui.wizard.category"
- class="org.jboss.tools.internal.deltacloud.ui.wizards.NewCloudConnection"
+ class="org.jboss.tools.internal.deltacloud.ui.wizards.NewCloudConnectionWizard"
icon="icons/delta.gif"
id="org.jboss.tools.deltacloud.ui.connection.wizard"
name="%NewWizard.name">
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ErrorUtils.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ErrorUtils.java (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ErrorUtils.java 2010-11-15 23:26:40 UTC (rev 26589)
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * 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.deltacloud.ui;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.jboss.tools.common.log.StatusFactory;
+
+public class ErrorUtils {
+ public static IStatus openErrorDialog(final String title, final String message, Exception e, final Shell shell) {
+ final IStatus status = StatusFactory.getInstance(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage(), e);
+ // TODO: internationalize strings
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ ErrorDialog.openError(shell, title, message, status);
+ }
+ });
+ return status;
+ }
+}
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ErrorUtils.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/RSEUtils.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/RSEUtils.java (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/RSEUtils.java 2010-11-15 23:26:40 UTC (rev 26589)
@@ -0,0 +1,105 @@
+/*******************************************************************************
+ * 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.deltacloud.ui;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.rse.core.IRSECoreRegistry;
+import org.eclipse.rse.core.IRSESystemType;
+import org.eclipse.rse.core.RSECorePlugin;
+import org.eclipse.rse.core.model.IHost;
+import org.eclipse.rse.core.model.ISystemRegistry;
+import org.eclipse.rse.core.model.SystemStartHere;
+import org.eclipse.rse.core.subsystems.IConnectorService;
+import org.eclipse.swt.widgets.Display;
+import org.jboss.tools.common.log.StatusFactory;
+import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
+import org.jboss.tools.deltacloud.ui.views.CVMessages;
+
+public class RSEUtils {
+
+ private final static String RSE_CONNECTING_MSG = "ConnectingRSE.msg"; //$NON-NLS-1$
+
+ public static IRSESystemType getSSHOnlySystemType() {
+ IRSESystemType sshType = null;
+ RSECorePlugin rsep = RSECorePlugin.getDefault();
+ IRSECoreRegistry coreRegistry = rsep.getCoreRegistry();
+ IRSESystemType[] sysTypes = coreRegistry.getSystemTypes();
+ for (IRSESystemType sysType : sysTypes) {
+ if (sysType.getId().equals(IRSESystemType.SYSTEMTYPE_SSH_ONLY_ID))
+ sshType = sysType;
+ }
+ return sshType;
+ }
+
+ public static ISystemRegistry getSystemRegistry() {
+ return SystemStartHere.getSystemRegistry();
+ }
+
+ public static String createConnectionName(DeltaCloudInstance instance) {
+ return instance.getName() + " [" + instance.getId() + "]"; //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public static String createHostName(DeltaCloudInstance instance) {
+ return instance.getHostName();
+ }
+
+ public static IHost createHost(String connectionName, String hostname) throws Exception {
+ ISystemRegistry registry = getSystemRegistry();
+ IRSESystemType sshOnlySystemType = getSSHOnlySystemType();
+ // TODO: Internationalize string
+ Assert.isTrue(sshOnlySystemType != null,
+ "Remote System Explorer could not initialize SSH subsystem: ssh type not found");
+ IHost host = registry.createHost(sshOnlySystemType, connectionName, hostname, null);
+ host.setDefaultUserId("root"); //$NON-NLS-1$
+ return host;
+ }
+
+ public static IConnectorService getConnectorService(IHost host) {
+ IConnectorService[] services = host.getConnectorServices();
+ if (services == null || services.length <= 0) {
+ return null;
+ }
+ return services[0];
+ }
+
+ public static void connect(final String instanceName, final IConnectorService service, String connectionName) {
+ // TODO: internationalize strings
+ Assert.isLegal(service != null, "Remote System Explorer could not connect: connector service not found.");
+ Job connect = new Job(CVMessages.getFormattedString(RSE_CONNECTING_MSG, connectionName)) {
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ try {
+ service.connect(monitor);
+ Display.getDefault().asyncExec(new ShowRSEViewRunnable(instanceName));
+ return Status.OK_STATUS;
+ } catch (Exception e) {
+ return StatusFactory.getInstance(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage(), e);
+ }
+ }
+ };
+ connect.setUser(true);
+ connect.schedule();
+ }
+
+ public static void launchRemoteSystemExplorer(String instanceName, String connectionName, IHost host) throws Exception {
+ if (host != null) {
+ IConnectorService service = RSEUtils.getConnectorService(host);
+ RSEUtils.connect(instanceName, service, connectionName);
+ } else {
+ // Assume failure is due to name already in use
+ Display.getDefault().asyncExec(new ShowRSEViewRunnable(instanceName));
+ }
+ }
+}
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/RSEUtils.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ShowRSEViewRunnable.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ShowRSEViewRunnable.java (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ShowRSEViewRunnable.java 2010-11-15 23:26:40 UTC (rev 26589)
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * 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.deltacloud.ui;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.common.log.StatusFactory;
+
+public class ShowRSEViewRunnable implements Runnable {
+
+ private static final String VIEW_REMOTESYSEXPLORER_ID = "org.eclipse.rse.ui.view.systemView";
+
+ private String instanceName;
+
+ public ShowRSEViewRunnable(String instanceName) {
+ this.instanceName = instanceName;
+ }
+
+ @Override
+ public void run() {
+ try {
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow()
+ .getActivePage()
+ .showView(VIEW_REMOTESYSEXPLORER_ID);
+ } catch (PartInitException e) {
+ IStatus status = StatusFactory.getInstance(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage(), e);
+ // TODO: internationalize strings
+ ErrorDialog.openError(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
+ "Error",
+ "Could not launch remote system explorer for instance \"" + instanceName + "\"",
+ status);
+ }
+ }
+}
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ShowRSEViewRunnable.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/NewConnectionHandler.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/NewConnectionHandler.java 2010-11-15 22:55:00 UTC (rev 26588)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/NewConnectionHandler.java 2010-11-15 23:26:40 UTC (rev 26589)
@@ -17,7 +17,7 @@
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.ui.PlatformUI;
-import org.jboss.tools.internal.deltacloud.ui.wizards.NewCloudConnection;
+import org.jboss.tools.internal.deltacloud.ui.wizards.NewCloudConnectionWizard;
/**
* @author Andre Dietisheim
@@ -26,7 +26,7 @@
@Override
public Object execute(ExecutionEvent event) throws ExecutionException {
- NewCloudConnection wizard = new NewCloudConnection();
+ NewCloudConnectionWizard wizard = new NewCloudConnectionWizard();
wizard.init(PlatformUI.getWorkbench(), new StructuredSelection());
WizardDialog dialog = new WizardDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
wizard);
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RefreshInstancesHandler.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RefreshInstancesHandler.java 2010-11-15 22:55:00 UTC (rev 26588)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RefreshInstancesHandler.java 2010-11-15 23:26:40 UTC (rev 26589)
@@ -44,10 +44,10 @@
}
private void refresh(final DeltaCloudInstance deltaCloudInstance) {
- // TODO: internationalize strings
if (deltaCloudInstance != null) {
final DeltaCloud cloud = deltaCloudInstance.getDeltaCloud();
if (cloud != null) {
+ // TODO: internationalize strings
new Job("Refreshing instances on cloud " + cloud.getName()) {
@Override
@@ -56,11 +56,8 @@
cloud.loadChildren();
return Status.OK_STATUS;
} catch (Exception e) {
- IStatus status = StatusFactory.getInstance(
- IStatus.ERROR,
- Activator.PLUGIN_ID,
- e.getMessage(),
- e);
+ IStatus status = StatusFactory.getInstance(IStatus.ERROR, Activator.PLUGIN_ID,
+ e.getMessage(), e);
return status;
}
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/ShowInRemoteSystemExplorerHandler.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/ShowInRemoteSystemExplorerHandler.java 2010-11-15 22:55:00 UTC (rev 26588)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/ShowInRemoteSystemExplorerHandler.java 2010-11-15 23:26:40 UTC (rev 26589)
@@ -14,30 +14,18 @@
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.commands.IHandler;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.core.IRSECoreRegistry;
-import org.eclipse.rse.core.IRSESystemType;
-import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.model.ISystemRegistry;
-import org.eclipse.rse.core.model.SystemStartHere;
-import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.handlers.HandlerUtil;
import org.jboss.tools.common.log.StatusFactory;
import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
import org.jboss.tools.deltacloud.ui.Activator;
-import org.jboss.tools.deltacloud.ui.views.CVMessages;
+import org.jboss.tools.deltacloud.ui.RSEUtils;
import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils;
/**
@@ -45,9 +33,6 @@
*/
public class ShowInRemoteSystemExplorerHandler extends AbstractHandler implements IHandler {
- private static final String VIEW_REMOTESYSEXPLORER_ID = "org.eclipse.rse.ui.view.systemView";
- private final static String RSE_CONNECTING_MSG = "ConnectingRSE.msg"; //$NON-NLS-1$
-
@Override
public Object execute(ExecutionEvent event) throws ExecutionException {
ISelection selection = HandlerUtil.getCurrentSelection(event);
@@ -55,86 +40,19 @@
DeltaCloudInstance instance = UIUtils.getFirstAdaptedElement(selection, DeltaCloudInstance.class);
Shell shell = HandlerUtil.getActiveShell(event);
try {
- launchRemoteSystemExplorer(instance, shell);
+ String connectionName = RSEUtils.createConnectionName(instance);
+ IHost host = RSEUtils.createHost(connectionName, RSEUtils.createHostName(instance));
+ RSEUtils.launchRemoteSystemExplorer(instance.getName(), connectionName, host);
} catch (Exception e) {
- return showCannotLaunchRSEErrorDialog(instance, shell, e);
+ IStatus status = StatusFactory.getInstance(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage(), e);
+ // TODO: internationalize strings
+ ErrorDialog.openError(shell, "Error",
+ "Could not launch remote system explorer for instance \"" + instance.getName() + "\"",
+ status);
+ return status;
}
}
return Status.OK_STATUS;
}
-
- private void launchRemoteSystemExplorer(final DeltaCloudInstance instance, final Shell shell) throws Exception {
- String hostname = instance.getHostName();
- IRSESystemType sshType = getRSESystemType();
- // TODO: internationalize string
- Assert.isTrue(sshType != null, "Remote System Explorer could not initialize SSH subsystem: ssh type not found");
- String connectionName = instance.getName() + " [" + instance.getId() + "]"; //$NON-NLS-1$ //$NON-NLS-2$
- ISystemRegistry registry = SystemStartHere.getSystemRegistry();
- IHost host = registry.createHost(sshType, connectionName, hostname, null);
- if (host != null) {
- host.setDefaultUserId("root"); //$NON-NLS-1$
- IConnectorService[] services = host.getConnectorServices();
- if (services.length > 0) {
- final IConnectorService service = services[0];
- Job connect = new Job(CVMessages.getFormattedString(RSE_CONNECTING_MSG, connectionName)) {
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- try {
- service.connect(monitor);
- Display.getDefault().asyncExec(showRSEViewRunnable(instance, shell));
- return Status.OK_STATUS;
- } catch (Exception e) {
- return StatusFactory.getInstance(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage(), e);
- }
- }
- };
- connect.setUser(true);
- connect.schedule();
- }
- } else {
- // Assume failure is due to name already in use
- shell.getDisplay().asyncExec(showRSEViewRunnable(instance, shell));
- }
- }
-
- private IRSESystemType getRSESystemType() {
- IRSESystemType sshType = null;
- RSECorePlugin rsep = RSECorePlugin.getDefault();
- IRSECoreRegistry coreRegistry = rsep.getCoreRegistry();
- IRSESystemType[] sysTypes = coreRegistry.getSystemTypes();
- for (IRSESystemType sysType : sysTypes) {
- if (sysType.getId().equals(IRSESystemType.SYSTEMTYPE_SSH_ONLY_ID))
- sshType = sysType;
- }
- return sshType;
- }
-
- private IStatus showCannotLaunchRSEErrorDialog(final DeltaCloudInstance instance, final Shell shell,
- Exception e) {
- IStatus status = StatusFactory.getInstance(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage(), e);
- // TODO: internationalize strings
- ErrorDialog.openError(shell,
- "Error",
- "Could not launch remote system explorer for instance \"" + instance.getName() + "\"",
- status);
- return status;
- }
-
- private Runnable showRSEViewRunnable(final DeltaCloudInstance instance, final Shell shell) {
-
- return new Runnable() {
- @Override
- public void run() {
- try {
- PlatformUI.getWorkbench().getActiveWorkbenchWindow()
- .getActivePage()
- .showView(VIEW_REMOTESYSEXPLORER_ID);
- } catch (PartInitException e) {
- showCannotLaunchRSEErrorDialog(instance, shell, e);
- }
- }
- };
- }
-
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-11-15 22:55:00 UTC (rev 26588)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-11-15 23:26:40 UTC (rev 26589)
@@ -308,16 +308,16 @@
cloudSelector.addModifyListener(cloudModifyListener);
}
- public void listChanged(DeltaCloud cloud, DeltaCloudInstance[] list) {
+ public void listChanged(DeltaCloud cloud, final DeltaCloudInstance[] instances) {
// Run following under Display thread since this can be
// triggered by a non-display thread notifying listeners.
- final DeltaCloudInstance[] finalList = list;
if (cloud.getName().equals(currCloud.getName())) {
Display.getDefault().syncExec(new Runnable() {
@Override
public void run() {
currCloud.removeInstanceListListener(parentView);
- viewer.setInput(finalList);
+
+ viewer.setInput(instances);
currCloud.addInstanceListListener(parentView);
viewer.refresh();
refreshToolbarCommandStates();
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/PerformDestroyInstanceActionThread.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/PerformDestroyInstanceActionThread.java 2010-11-15 22:55:00 UTC (rev 26588)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/PerformDestroyInstanceActionThread.java 2010-11-15 23:26:40 UTC (rev 26589)
@@ -29,7 +29,7 @@
pm.worked(1);
// To handle the user starting a new action when we haven't confirmed the last one yet,
// cancel the previous job and then go on performing this action
- Job job = cloud.getActionJob(id);
+ Job job = cloud.getInstanceJob(id);
if (job != null) {
job.cancel();
try {
@@ -38,7 +38,7 @@
// do nothing, this is ok
}
}
- cloud.registerActionJob(id, this);
+ cloud.registerInstanceJob(id, this);
Display.getDefault().asyncExec(new Runnable() {
@Override
public void run() {
@@ -46,7 +46,7 @@
}
});
} finally {
- cloud.removeActionJob(id, this);
+ cloud.removeInstanceJob(id, this);
pm.done();
}
return Status.OK_STATUS;
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/PerformInstanceActionThread.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/PerformInstanceActionThread.java 2010-11-15 22:55:00 UTC (rev 26588)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/PerformInstanceActionThread.java 2010-11-15 23:26:40 UTC (rev 26589)
@@ -71,14 +71,14 @@
});
} finally {
- cloud.removeActionJob(id, this);
+ cloud.removeInstanceJob(id, this);
pm.done();
}
return Status.OK_STATUS;
}
private void cancelPreviousJob(String id) {
- Job job = cloud.getActionJob(id);
+ Job job = cloud.getInstanceJob(id);
if (job != null) {
job.cancel();
try {
Deleted: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnection.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnection.java 2010-11-15 22:55:00 UTC (rev 26588)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnection.java 2010-11-15 23:26:40 UTC (rev 26589)
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Red Hat Inc..
- * All rights reserved. This program and the accompanying materials
- * are 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 Incorporated - initial API and implementation
- *******************************************************************************/
-package org.jboss.tools.internal.deltacloud.ui.wizards;
-
-import java.net.MalformedURLException;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.jboss.tools.common.log.StatusFactory;
-import org.jboss.tools.deltacloud.core.DeltaCloud;
-import org.jboss.tools.deltacloud.core.DeltaCloudManager;
-import org.jboss.tools.deltacloud.core.client.DeltaCloudClientException;
-import org.jboss.tools.deltacloud.ui.Activator;
-
-public class NewCloudConnection extends Wizard implements INewWizard, CloudConnection {
-
- private static final String MAINPAGE_NAME = "NewCloudConnection.name"; //$NON-NLS-1$
- private CloudConnectionPage mainPage;
-
- public NewCloudConnection() {
- super();
- }
-
- @Override
- public void init(IWorkbench workbench, IStructuredSelection selection) {
- }
-
- @Override
- public void addPages() {
- mainPage = new CloudConnectionPage(WizardMessages.getString(MAINPAGE_NAME), this);
- addPage(mainPage);
- }
-
- @Override
- public boolean canFinish() {
- return mainPage.isPageComplete();
- }
-
- public boolean performTest() {
- String name = mainPage.getName();
- String url = mainPage.getModel().getUrl();
- String username = mainPage.getModel().getUsername();
- String password = mainPage.getModel().getPassword();
- try {
- DeltaCloud newCloud = new DeltaCloud(name, url, username, password);
- return newCloud.testConnection();
- } catch (MalformedURLException e) {
- Activator.log(e);
- return false;
- } catch (DeltaCloudClientException e) {
- IStatus status = StatusFactory.getInstance(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage(), e);
- Activator.log(status);
- ErrorDialog.openError(
- getShell(),
- WizardMessages.getString("CloudConnectionAuthError.title"),
- WizardMessages.getFormattedString("CloudConnectionAuthError.message", url),
- status);
- return true;
- }
- }
-
- @Override
- public boolean performFinish() {
- String name = mainPage.getModel().getName();
- String url = mainPage.getModel().getUrl();
- String username = mainPage.getModel().getUsername();
- String password = mainPage.getModel().getPassword();
- String type = mainPage.getModel().getType().toString();
- try {
- DeltaCloud newCloud = new DeltaCloud(name, url, username, password, type, true);
- DeltaCloudManager.getDefault().addCloud(newCloud);
- } catch (MalformedURLException e) {
- Activator.log(e);
- }
- return true;
- }
-
- @Override
- public boolean needsProgressMonitor() {
- return true;
- }
-}
Copied: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java (from rev 26556, trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnection.java)
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2010-11-15 23:26:40 UTC (rev 26589)
@@ -0,0 +1,94 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are 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 Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.jboss.tools.internal.deltacloud.ui.wizards;
+
+import java.net.MalformedURLException;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.jboss.tools.common.log.StatusFactory;
+import org.jboss.tools.deltacloud.core.DeltaCloud;
+import org.jboss.tools.deltacloud.core.DeltaCloudManager;
+import org.jboss.tools.deltacloud.core.client.DeltaCloudClientException;
+import org.jboss.tools.deltacloud.ui.Activator;
+
+public class NewCloudConnectionWizard extends Wizard implements INewWizard, CloudConnection {
+
+ private static final String MAINPAGE_NAME = "NewCloudConnection.name"; //$NON-NLS-1$
+ private CloudConnectionPage mainPage;
+
+ public NewCloudConnectionWizard() {
+ super();
+ }
+
+ @Override
+ public void init(IWorkbench workbench, IStructuredSelection selection) {
+ }
+
+ @Override
+ public void addPages() {
+ mainPage = new CloudConnectionPage(WizardMessages.getString(MAINPAGE_NAME), this);
+ addPage(mainPage);
+ }
+
+ @Override
+ public boolean canFinish() {
+ return mainPage.isPageComplete();
+ }
+
+ public boolean performTest() {
+ String name = mainPage.getName();
+ String url = mainPage.getModel().getUrl();
+ String username = mainPage.getModel().getUsername();
+ String password = mainPage.getModel().getPassword();
+ try {
+ DeltaCloud newCloud = new DeltaCloud(name, url, username, password);
+ return newCloud.testConnection();
+ } catch (MalformedURLException e) {
+ Activator.log(e);
+ return false;
+ } catch (DeltaCloudClientException e) {
+ IStatus status = StatusFactory.getInstance(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage(), e);
+ Activator.log(status);
+ ErrorDialog.openError(
+ getShell(),
+ WizardMessages.getString("CloudConnectionAuthError.title"),
+ WizardMessages.getFormattedString("CloudConnectionAuthError.message", url),
+ status);
+ return true;
+ }
+ }
+
+ @Override
+ public boolean performFinish() {
+ String name = mainPage.getModel().getName();
+ String url = mainPage.getModel().getUrl();
+ String username = mainPage.getModel().getUsername();
+ String password = mainPage.getModel().getPassword();
+ String type = mainPage.getModel().getType().toString();
+ try {
+ DeltaCloud newCloud = new DeltaCloud(name, url, username, password, type, true);
+ DeltaCloudManager.getDefault().addCloud(newCloud);
+ } catch (MalformedURLException e) {
+ Activator.log(e);
+ }
+ return true;
+ }
+
+ @Override
+ public boolean needsProgressMonitor() {
+ return true;
+ }
+}
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceModel.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceModel.java 2010-11-15 22:55:00 UTC (rev 26588)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceModel.java 2010-11-15 23:26:40 UTC (rev 26589)
@@ -111,8 +111,8 @@
@Override
public IStatus validate(Object value) {
- Assert.isTrue(value instanceof String);
- if (value != null && ((String) value).length() > 0) {
+ if (value instanceof String
+ && ((String) value).length() > 0) {
return ValidationStatus.ok();
} else {
return ValidationStatus.error(WizardMessages.getString(IMAGE_ID_NOT_FOUND));
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2010-11-15 22:55:00 UTC (rev 26588)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2010-11-15 23:26:40 UTC (rev 26589)
@@ -96,20 +96,13 @@
try {
pm.beginTask(WizardMessages.getFormattedString(STARTING_INSTANCE_MSG, new String[] {instanceName}), IProgressMonitor.UNKNOWN);
pm.worked(1);
- cloud.registerActionJob(instanceId, this);
- boolean finished = false;
- while (!finished && !pm.isCanceled()) {
- instance = cloud.refreshInstance(instanceId);
- if (instance != null && !instance.getState().equals(DeltaCloudInstance.PENDING))
- break;
- Thread.sleep(400);
- }
-
+ cloud.registerInstanceJob(instanceId, this);
+ instance = cloud.waitWhilePending(instanceId, pm);
} catch (Exception e) {
// do nothing
} finally {
cloud.replaceInstance(instance);
- cloud.removeActionJob(instanceId, this);
+ cloud.removeInstanceJob(instanceId, this);
String hostname = instance.getHostName();
Preferences prefs = new InstanceScope().getNode(Activator.PLUGIN_ID);
boolean autoConnect = prefs.getBoolean(IDeltaCloudPreferenceConstants.AUTO_CONNECT_INSTANCE, true);
@@ -198,6 +191,7 @@
prefs.putBoolean(IDeltaCloudPreferenceConstants.DONT_CONFIRM_CREATE_INSTANCE, true);
}
}
+
instance = cloud.createInstance(name, imageId, realmId, profileId, keyname, memory, storage);
if (instance != null)
result = true;
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard2.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard2.java 2010-11-15 22:55:00 UTC (rev 26588)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard2.java 2010-11-15 23:26:40 UTC (rev 26589)
@@ -22,19 +22,14 @@
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.dialogs.MessageDialogWithToggle;
import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.rse.core.IRSECoreRegistry;
-import org.eclipse.rse.core.IRSESystemType;
-import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.model.ISystemRegistry;
-import org.eclipse.rse.core.model.SystemStartHere;
-import org.eclipse.rse.core.subsystems.IConnectorService;
import org.jboss.tools.deltacloud.core.DeltaCloud;
import org.jboss.tools.deltacloud.core.DeltaCloudException;
import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
import org.jboss.tools.deltacloud.ui.Activator;
+import org.jboss.tools.deltacloud.ui.ErrorUtils;
import org.jboss.tools.deltacloud.ui.IDeltaCloudPreferenceConstants;
-import org.jboss.tools.deltacloud.ui.views.CVMessages;
+import org.jboss.tools.deltacloud.ui.RSEUtils;
import org.osgi.service.prefs.Preferences;
public class NewInstanceWizard2 extends Wizard {
@@ -47,117 +42,80 @@
private final static String DONT_SHOW_THIS_AGAIN_MSG = "DontShowThisAgain.msg"; //$NON-NLS-1$
private final static String STARTING_INSTANCE_MSG = "StartingInstance.msg"; //$NON-NLS-1$
private final static String STARTING_INSTANCE_TITLE = "StartingInstance.title"; //$NON-NLS-1$
- private final static String RSE_CONNECTING_MSG = "ConnectingRSE.msg"; //$NON-NLS-1$
-
private NewInstancePage2 mainPage;
-
+
private DeltaCloud cloud;
private DeltaCloudInstance instance;
public NewInstanceWizard2(DeltaCloud cloud) {
this.cloud = cloud;
}
-
+
@Override
public void addPages() {
// TODO Auto-generated method stub
mainPage = new NewInstancePage2(cloud);
addPage(mainPage);
}
-
+
@Override
public boolean canFinish() {
return mainPage.isPageComplete();
}
-
-
+
private class WatchCreateJob extends Job {
-
+
private DeltaCloud cloud;
private String instanceId;
private String instanceName;
-
- public WatchCreateJob(String title, DeltaCloud cloud,
+
+ public WatchCreateJob(String title, DeltaCloud cloud,
String instanceId, String instanceName) {
super(title);
this.cloud = cloud;
this.instanceId = instanceId;
this.instanceName = instanceName;
}
-
+
public IStatus run(IProgressMonitor pm) {
- if (!pm.isCanceled()){
+ if (!pm.isCanceled()) {
DeltaCloudInstance instance = null;
try {
- pm.beginTask(WizardMessages.getFormattedString(STARTING_INSTANCE_MSG, new String[] {instanceName}), IProgressMonitor.UNKNOWN);
+ pm.beginTask(
+ WizardMessages.getFormattedString(STARTING_INSTANCE_MSG, new String[] { instanceName }),
+ IProgressMonitor.UNKNOWN);
pm.worked(1);
- cloud.registerActionJob(instanceId, this);
- boolean finished = false;
- while (!finished && !pm.isCanceled()) {
- instance = cloud.refreshInstance(instanceId);
- if (instance != null && !instance.getState().equals(DeltaCloudInstance.PENDING))
- break;
- Thread.sleep(400);
- }
-
+ cloud.registerInstanceJob(instanceId, this);
+ instance = cloud.waitWhilePending(instanceId, pm);
} catch (Exception e) {
// do nothing
} finally {
cloud.replaceInstance(instance);
- cloud.removeActionJob(instanceId, this);
- String hostname = instance.getHostName();
+ cloud.removeInstanceJob(instanceId, this);
+ String hostname = RSEUtils.createHostName(instance);
Preferences prefs = new InstanceScope().getNode(Activator.PLUGIN_ID);
boolean autoConnect = prefs.getBoolean(IDeltaCloudPreferenceConstants.AUTO_CONNECT_INSTANCE, true);
if (hostname != null && hostname.length() > 0 && autoConnect) {
- ISystemRegistry registry = SystemStartHere.getSystemRegistry();
- RSECorePlugin rsep = RSECorePlugin.getDefault();
- IRSECoreRegistry coreRegistry = rsep.getCoreRegistry();
- IRSESystemType[] sysTypes = coreRegistry.getSystemTypes();
- IRSESystemType sshType = null;
- for (IRSESystemType sysType : sysTypes) {
- if (sysType.getId().equals(IRSESystemType.SYSTEMTYPE_SSH_ONLY_ID))
- sshType = sysType;
- }
- String connectionName = instance.getName() + " [" + instance.getId() + "]"; //$NON-NLS-1$ //$NON-NLS-2$
try {
- IHost host = registry.createHost(sshType, connectionName, hostname, null);
- if (host != null) {
- host.setDefaultUserId("root"); //$NON-NLS-1$
- IConnectorService[] services = host.getConnectorServices();
- if (services.length > 0) {
- final IConnectorService service = services[0];
- Job connect = new Job(CVMessages.getFormattedString(RSE_CONNECTING_MSG, connectionName)) {
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- try {
- service.connect(monitor);
- return Status.OK_STATUS;
- } catch(Exception e) {
- return Status.CANCEL_STATUS;
- }
- }
- };
- connect.setUser(true);
- connect.schedule();
- }
- }
+ String connectionName = RSEUtils.createConnectionName(instance);
+ IHost host = RSEUtils.createHost(connectionName, RSEUtils.createHostName(instance));
+ RSEUtils.launchRemoteSystemExplorer(instance.getName(), connectionName, host);
} catch (Exception e) {
- // TODO Auto-generated catch block
- Activator.log(e);
+ ErrorUtils.openErrorDialog("Error", "Could not launch remote system explorer for instance \"" + instance.getName() + "\"", e, getShell());
+ return Status.OK_STATUS;
}
}
pm.done();
}
return Status.OK_STATUS;
- }
- else {
+ } else {
pm.done();
return Status.CANCEL_STATUS;
}
};
};
-
+
@Override
public boolean performFinish() {
String imageId = mainPage.getImageId();
@@ -167,36 +125,39 @@
String storage = mainPage.getStorageProperty();
String keyname = mainPage.getKeyName();
String name = null;
-
+
// Save persistent settings for this particular cloud
cloud.setLastImageId(imageId);
cloud.setLastKeyname(keyname);
cloud.save();
Preferences prefs = new InstanceScope().getNode(Activator.PLUGIN_ID);
-
+
try {
name = URLEncoder.encode(mainPage.getInstanceName(), "UTF-8");
} catch (UnsupportedEncodingException e) {
// TODO Auto-generated catch block
e.printStackTrace();
} //$NON-NLS-1$
-
+
boolean result = false;
String errorMessage = WizardMessages.getString(DEFAULT_REASON);
try {
- boolean dontShowDialog = prefs.getBoolean(IDeltaCloudPreferenceConstants.DONT_CONFIRM_CREATE_INSTANCE, false);
+ boolean dontShowDialog = prefs.getBoolean(IDeltaCloudPreferenceConstants.DONT_CONFIRM_CREATE_INSTANCE,
+ false);
if (!dontShowDialog) {
MessageDialogWithToggle dialog =
- MessageDialogWithToggle.openOkCancelConfirm(getShell(), WizardMessages.getString(CONFIRM_CREATE_TITLE),
- WizardMessages.getString(CONFIRM_CREATE_MSG),
- WizardMessages.getString(DONT_SHOW_THIS_AGAIN_MSG),
- false, null, null);
+ MessageDialogWithToggle.openOkCancelConfirm(getShell(),
+ WizardMessages.getString(CONFIRM_CREATE_TITLE),
+ WizardMessages.getString(CONFIRM_CREATE_MSG),
+ WizardMessages.getString(DONT_SHOW_THIS_AGAIN_MSG),
+ false, null, null);
int retCode = dialog.getReturnCode();
boolean toggleState = dialog.getToggleState();
if (retCode == Dialog.CANCEL)
return true;
- // If warning turned off by user, set the preference for future usage
+ // If warning turned off by user, set the preference for future
+ // usage
if (toggleState) {
prefs.putBoolean(IDeltaCloudPreferenceConstants.DONT_CONFIRM_CREATE_INSTANCE, true);
}
@@ -216,9 +177,11 @@
errorMessage = e.getLocalizedMessage();
}
if (!result) {
- ErrorDialog.openError(this.getShell(),
+ ErrorDialog.openError(
+ this.getShell(),
WizardMessages.getString(CREATE_INSTANCE_FAILURE_TITLE),
- WizardMessages.getFormattedString(CREATE_INSTANCE_FAILURE_MSG, new String[] {name, imageId, realmId, profileId}),
+ WizardMessages.getFormattedString(CREATE_INSTANCE_FAILURE_MSG, new String[] { name, imageId,
+ realmId, profileId }),
new Status(IStatus.ERROR, Activator.PLUGIN_ID, errorMessage));
}
return result;
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26588 - trunk/documentation/guides/JBDS_Release_Notes/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2010-11-15 17:55:00 -0500 (Mon, 15 Nov 2010)
New Revision: 26588
Modified:
trunk/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml
trunk/documentation/guides/JBDS_Release_Notes/en-US/Component_Versions.xml
trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml
trunk/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml
Log:
updated
Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2010-11-15 20:36:05 UTC (rev 26587)
+++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2010-11-15 22:55:00 UTC (rev 26588)
@@ -6,7 +6,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>4.0.0</productnumber>
<edition>0</edition>
- <pubsnumber>4</pubsnumber>
+ <pubsnumber>5</pubsnumber>
<abstract>
<para>
These release notes contain important information related to the JBoss Developer Studio. New features,<!-- known problems,--> resources, and other current issues are addressed here.
Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Component_Versions.xml
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/en-US/Component_Versions.xml 2010-11-15 20:36:05 UTC (rev 26587)
+++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Component_Versions.xml 2010-11-15 22:55:00 UTC (rev 26588)
@@ -7,17 +7,17 @@
<itemizedlist>
<listitem>
<para>
- Eclipse 3.5 (Galileo)
+ Eclipse 3.6
</para>
</listitem>
<listitem>
<para>
- JBoss Tools 3.1.1
+ JBoss Tools 3.2.1
</para>
</listitem>
<listitem>
<para>
- JBoss Enterprise Application Platform 5.0
+ JBoss Enterprise Application Platform 5.1
</para>
</listitem>
</itemizedlist>
Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2010-11-15 20:36:05 UTC (rev 26587)
+++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2010-11-15 22:55:00 UTC (rev 26588)
@@ -173,7 +173,8 @@
</itemizedlist>
</para>
</formalpara>
- <formalpara>
+<!-- Include in JBT Release Notes only!!! -->
+<!-- <formalpara>
<title>Deltacloud</title>
<para>
<itemizedlist>
@@ -184,7 +185,7 @@
</listitem>
</itemizedlist>
</para>
- </formalpara>
+ </formalpara> -->
<formalpara>
<title>Drools</title>
<para>
Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml 2010-11-15 20:36:05 UTC (rev 26587)
+++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml 2010-11-15 22:55:00 UTC (rev 26588)
@@ -6,28 +6,38 @@
</para>
<itemizedlist>
<listitem>
+ <para>
+ BIRT
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Contexts and Dependency Injection (CDI)
+ </para>
+ </listitem>
+ <listitem>
<para>
Hibernate
</para>
</listitem>
<listitem>
- <para>
- JBoss Seam
- </para>
+ <para>
+ JavaServer Faces (JSF)
+ </para>
</listitem>
<listitem>
- <para>
- RichFaces
- </para>
+ <para>
+ JBoss Drools
+ </para>
</listitem>
<listitem>
- <para>
- JBoss jBPM
- </para>
+ <para>
+ JBoss ESB
+ </para>
</listitem>
<listitem>
<para>
- JBoss ESB
+ JBoss jBPM
</para>
</listitem>
<listitem>
@@ -36,9 +46,9 @@
</para>
</listitem>
<listitem>
- <para>
- JBoss Drools
- </para>
+ <para>
+ JBoss Seam
+ </para>
</listitem>
<listitem>
<para>
@@ -46,10 +56,25 @@
</para>
</listitem>
<listitem>
+ <para>
+ RichFaces
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Smooks
+ </para>
+ </listitem>
+ <listitem>
<para>
Teiid
</para>
</listitem>
+ <listitem>
+ <para>
+ Web Services
+ </para>
+ </listitem>
</itemizedlist>
<para>
JBoss Developer Studio includes both certified visual tooling and a runtime platform (that Red Hat supports for 3 years (Limited) and 5 years respectively), ensuring developers of a stable, upgradable, deployable and supportable platform.
15 years, 5 months
- 1
- 0