JBoss Tools SVN: r39378 - branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-03-08 12:38:37 -0500 (Thu, 08 Mar 2012)
New Revision: 39378
Modified:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java
Log:
[JBIDE-11223] re-enable/disable import link when selected app changes
Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-03-08 17:31:33 UTC (rev 39377)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-03-08 17:38:37 UTC (rev 39378)
@@ -321,6 +321,7 @@
}
callback.execute(new SetApplicationCommand(server));
resetDeployProjectCombo();
+ enableImportLink();
postLongRunningValidate();
}
};
@@ -456,9 +457,13 @@
appNameCombo.select(select);
}
}
+ enableImportLink();
+ resetDeployProjectCombo();
+ }
+
+ private void enableImportLink() {
IProject[] p = ExpressServerUtils.findProjectsForApplication(fapplication);
importLink.setEnabled(p == null || p.length == 0);
- resetDeployProjectCombo();
}
private void postLongRunningValidate() {
14 years, 1 month
JBoss Tools SVN: r39377 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-03-08 12:31:33 -0500 (Thu, 08 Mar 2012)
New Revision: 39377
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressWizardFragment.java
Log:
JBIDE-10527 to trunk (override isComplete method)
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressWizardFragment.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressWizardFragment.java 2012-03-08 17:07:57 UTC (rev 39376)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressWizardFragment.java 2012-03-08 17:31:33 UTC (rev 39377)
@@ -33,7 +33,6 @@
private NewServerWizardBehaviourCallback callback;
public ExpressWizardFragment() {
- setComplete(false);
}
public boolean hasComposite() {
@@ -43,6 +42,9 @@
super.setComplete(complete);
}
+ public boolean isComplete() {
+ return getTaskModel().getObject(ExpressServerUtils.TASK_WIZARD_ATTR_SELECTED_APP) != null;
+ }
public Composite createComposite(Composite parent, IWizardHandle handle) {
handle.setTitle("Create an Openshift Server");
@@ -59,7 +61,6 @@
}
};
composite = ExpressDetailsComposite.createComposite(parent,callback, ExpressServerUtils.EXPRESS_SOURCE_MODE, true);
- setComplete(getTaskModel().getObject(ExpressServerUtils.TASK_WIZARD_ATTR_SELECTED_APP) != null);
return composite.getComposite();
}
14 years, 1 month
JBoss Tools SVN: r39376 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-03-08 12:07:57 -0500 (Thu, 08 Mar 2012)
New Revision: 39376
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java
Log:
added author
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-03-08 17:05:19 UTC (rev 39375)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-03-08 17:07:57 UTC (rev 39376)
@@ -70,6 +70,9 @@
import com.openshift.express.client.IApplication;
import com.openshift.express.client.OpenShiftException;
+/**
+ * @author Rob Stryker
+ */
public class ExpressDetailsComposite {
public static ExpressDetailsComposite createComposite(Composite parent,
IServerModeUICallback callback, String mode, boolean showVerify) {
14 years, 1 month
JBoss Tools SVN: r39375 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-03-08 12:05:19 -0500 (Thu, 08 Mar 2012)
New Revision: 39375
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java
Log:
[JBIDE-11223] re-enable/disable import link when selected app changes
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-03-08 15:51:22 UTC (rev 39374)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-03-08 17:05:19 UTC (rev 39375)
@@ -321,6 +321,7 @@
}
callback.execute(new SetApplicationCommand(server));
resetDeployProjectCombo();
+ enableImportLink();
postLongRunningValidate();
}
};
@@ -456,11 +457,15 @@
appNameCombo.select(select);
}
}
+ enableImportLink();
+ resetDeployProjectCombo();
+ }
+
+ private void enableImportLink() {
IProject[] p = ExpressServerUtils.findProjectsForApplication(fapplication);
importLink.setEnabled(p == null || p.length == 0);
- resetDeployProjectCombo();
}
-
+
private void postLongRunningValidate() {
if( !showVerify )
return;
14 years, 1 month
JBoss Tools SVN: r39373 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-03-08 09:10:33 -0500 (Thu, 08 Mar 2012)
New Revision: 39373
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java
Log:
Fixed - JBIDE-11211
*Internal Error* when creating server adapter from *OpenShift console*
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java 2012-03-08 14:01:06 UTC (rev 39372)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java 2012-03-08 14:10:33 UTC (rev 39373)
@@ -26,6 +26,7 @@
import org.eclipse.wst.server.ui.internal.wizard.fragment.TasksWizardFragment;
import org.eclipse.wst.server.ui.wizard.WizardFragment;
import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils;
+import org.jboss.tools.openshift.express.internal.core.console.UserModel;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
@@ -52,7 +53,7 @@
final IApplication application = (IApplication) treeSelection.getFirstElement();
IUser user = application.getUser();
NewServerWizard w = new NewServerWizard(ExpressServerUtils.OPENSHIFT_SERVER_TYPE);
- w.getTaskModel().putObject(ExpressServerUtils.TASK_WIZARD_ATTR_USER, user);
+ w.getTaskModel().putObject(ExpressServerUtils.TASK_WIZARD_ATTR_USER, UserModel.getDefault().findUser(user.getRhlogin()));
w.getTaskModel().putObject(ExpressServerUtils.TASK_WIZARD_ATTR_SELECTED_APP, application);
WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), w);
dialog.open();
14 years, 1 month
JBoss Tools SVN: r39372 - branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-03-08 09:01:06 -0500 (Thu, 08 Mar 2012)
New Revision: 39372
Modified:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java
Log:
Fixed - JBIDE-11211
*Internal Error* when creating server adapter from *OpenShift console*
Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java 2012-03-08 13:52:13 UTC (rev 39371)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java 2012-03-08 14:01:06 UTC (rev 39372)
@@ -16,12 +16,12 @@
import org.eclipse.wst.server.ui.internal.wizard.fragment.TasksWizardFragment;
import org.eclipse.wst.server.ui.wizard.WizardFragment;
import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils;
+import org.jboss.tools.openshift.express.internal.core.console.UserModel;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
import com.openshift.express.client.IApplication;
import com.openshift.express.client.IUser;
-import com.openshift.express.client.OpenShiftException;
public class CreateServerAdapterAction extends AbstractAction {
@@ -38,7 +38,7 @@
final IApplication application = (IApplication) treeSelection.getFirstElement();
IUser user = application.getUser();
NewServerWizard w = new NewServerWizard(ExpressServerUtils.OPENSHIFT_SERVER_TYPE);
- w.getTaskModel().putObject(ExpressServerUtils.TASK_WIZARD_ATTR_USER, user);
+ w.getTaskModel().putObject(ExpressServerUtils.TASK_WIZARD_ATTR_USER, UserModel.getDefault().findUser(user.getRhlogin()));
w.getTaskModel().putObject(ExpressServerUtils.TASK_WIZARD_ATTR_SELECTED_APP, application);
WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), w);
dialog.open();
14 years, 1 month
JBoss Tools SVN: r39371 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-03-08 08:52:13 -0500 (Thu, 08 Mar 2012)
New Revision: 39371
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/AbstractAction.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteApplicationAction.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteConnectionAction.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/OpenInWebBrowserAction.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ShowPropertiesAction.java
Log:
cleanup: added class headers and authors
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/AbstractAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/AbstractAction.java 2012-03-08 12:00:50 UTC (rev 39370)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/AbstractAction.java 2012-03-08 13:52:13 UTC (rev 39371)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.openshift.express.internal.ui.action;
import org.eclipse.jface.action.Action;
@@ -8,6 +18,9 @@
import org.eclipse.jface.viewers.StructuredViewer;
import org.eclipse.ui.navigator.CommonViewer;
+/**
+ * @author Xavier Coulon
+ */
public abstract class AbstractAction extends Action implements ISelectionChangedListener {
/** The current selection in the view. */
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteApplicationAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteApplicationAction.java 2012-03-08 12:00:50 UTC (rev 39370)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteApplicationAction.java 2012-03-08 13:52:13 UTC (rev 39371)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.openshift.express.internal.ui.action;
import java.util.ArrayList;
@@ -20,11 +30,11 @@
import com.openshift.express.client.IApplication;
import com.openshift.express.client.OpenShiftException;
+/**
+ * @author Xavier Coulon
+ */
public class DeleteApplicationAction extends AbstractAction {
- /**
- * Constructor
- */
public DeleteApplicationAction() {
super(OpenShiftExpressUIMessages.DELETE_APPLICATION_ACTION);
setImageDescriptor(PlatformUI.getWorkbench().getSharedImages()
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteConnectionAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteConnectionAction.java 2012-03-08 12:00:50 UTC (rev 39370)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteConnectionAction.java 2012-03-08 13:52:13 UTC (rev 39371)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.openshift.express.internal.ui.action;
import org.eclipse.jface.viewers.ITreeSelection;
@@ -6,6 +16,9 @@
import com.openshift.express.client.IUser;
+/**
+ * @author Xavier Coulon
+ */
public class DeleteConnectionAction extends AbstractAction {
public DeleteConnectionAction() {
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/OpenInWebBrowserAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/OpenInWebBrowserAction.java 2012-03-08 12:00:50 UTC (rev 39370)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/OpenInWebBrowserAction.java 2012-03-08 13:52:13 UTC (rev 39371)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.openshift.express.internal.ui.action;
import org.eclipse.jface.viewers.ITreeSelection;
@@ -9,11 +19,11 @@
import com.openshift.express.client.IApplication;
import com.openshift.express.client.OpenShiftException;
+/**
+ * @author Xavier Coulon
+ */
public class OpenInWebBrowserAction extends AbstractAction {
- /**
- * Constructor
- */
public OpenInWebBrowserAction() {
super(OpenShiftExpressUIMessages.SHOW_IN_BROWSER_ACTION);
setImageDescriptor(OpenShiftUIActivator.getDefault().createImageDescriptor("open-browser.gif"));
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ShowPropertiesAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ShowPropertiesAction.java 2012-03-08 12:00:50 UTC (rev 39370)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ShowPropertiesAction.java 2012-03-08 13:52:13 UTC (rev 39371)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.openshift.express.internal.ui.action;
import org.eclipse.ui.PartInitException;
@@ -5,6 +15,9 @@
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
+/**
+ * @author Xavier Coulon
+ */
public class ShowPropertiesAction extends AbstractAction {
public ShowPropertiesAction() {
14 years, 1 month
JBoss Tools SVN: r39370 - in trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71: META-INF and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-03-08 07:00:50 -0500 (Thu, 08 Mar 2012)
New Revision: 39370
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-as-controller-client-7.1.0.Final.jar
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-as-protocol-7.1.0.Final.jar
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-dmr-1.1.1.Final.jar
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-logging-3.1.0.GA.jar
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-marshalling-1.3.9.GA.jar
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-remoting-3.2.2.GA.jar
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-sasl-1.0.0.Final.jar
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/xnio-api-3.0.3.GA.jar
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/xnio-nio-3.0.3.GA.jar
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-as-controller-client-7.1.0.Beta1b.jar
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-as-protocol-7.1.0.Beta1b.jar
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-dmr-1.1.0.Final.jar
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-logging-3.1.0.CR2.jar
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-marshalling-1.3.4.GA.jar
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-remoting-3.2.0.CR5-SNAPSHOT.jar
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-sasl-1.0.0.Beta8.jar
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/xnio-api-3.0.0.CR5.jar
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/xnio-nio-3.0.0.CR5.jar
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/.classpath
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/build.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/AS71Manager.java
Log:
/JBIDE-11199 to trunk
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/.classpath
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/.classpath 2012-03-08 11:55:39 UTC (rev 39369)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/.classpath 2012-03-08 12:00:50 UTC (rev 39370)
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="lib" path="jboss-remoting-3.2.0.CR5-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="jboss-as-controller-client-7.1.0.Beta1b.jar"/>
- <classpathentry exported="true" kind="lib" path="jboss-as-protocol-7.1.0.Beta1b.jar"/>
- <classpathentry exported="true" kind="lib" path="jboss-dmr-1.1.0.Final.jar"/>
- <classpathentry exported="true" kind="lib" path="jboss-logging-3.1.0.CR2.jar"/>
- <classpathentry exported="true" kind="lib" path="jboss-marshalling-1.3.4.GA.jar"/>
- <classpathentry exported="true" kind="lib" path="jboss-sasl-1.0.0.Beta8.jar"/>
+ <classpathentry exported="true" kind="lib" path="jboss-as-controller-client-7.1.0.Final.jar"/>
+ <classpathentry exported="true" kind="lib" path="jboss-as-protocol-7.1.0.Final.jar"/>
+ <classpathentry exported="true" kind="lib" path="jboss-dmr-1.1.1.Final.jar"/>
+ <classpathentry exported="true" kind="lib" path="jboss-logging-3.1.0.GA.jar"/>
+ <classpathentry exported="true" kind="lib" path="jboss-marshalling-1.3.9.GA.jar"/>
+ <classpathentry exported="true" kind="lib" path="jboss-remoting-3.2.2.GA.jar"/>
+ <classpathentry exported="true" kind="lib" path="jboss-sasl-1.0.0.Final.jar"/>
<classpathentry exported="true" kind="lib" path="jboss-threads-2.0.0.GA.jar"/>
- <classpathentry exported="true" kind="lib" path="xnio-api-3.0.0.CR5.jar"/>
- <classpathentry exported="true" kind="lib" path="xnio-nio-3.0.0.CR5.jar"/>
+ <classpathentry exported="true" kind="lib" path="xnio-api-3.0.3.GA.jar"/>
+ <classpathentry exported="true" kind="lib" path="xnio-nio-3.0.3.GA.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/MANIFEST.MF 2012-03-08 11:55:39 UTC (rev 39369)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/MANIFEST.MF 2012-03-08 12:00:50 UTC (rev 39370)
@@ -10,16 +10,16 @@
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ClassPath: .,
- jboss-as-controller-client-7.1.0.Beta1b.jar,
- jboss-as-protocol-7.1.0.Beta1b.jar,
- jboss-dmr-1.1.0.Final.jar,
- jboss-logging-3.1.0.CR2.jar,
- jboss-marshalling-1.3.4.GA.jar,
- jboss-remoting-3.2.0.CR5-SNAPSHOT.jar,
- jboss-sasl-1.0.0.Beta8.jar,
+ jboss-as-controller-client-7.1.0.Final.jar,
+ jboss-as-protocol-7.1.0.Final.jar,
+ jboss-dmr-1.1.1.Final.jar,
+ jboss-logging-3.1.0.GA.jar,
+ jboss-marshalling-1.3.9.GA.jar,
+ jboss-remoting-3.2.2.GA.jar,
+ jboss-sasl-1.0.0.Final.jar,
jboss-threads-2.0.0.GA.jar,
- xnio-api-3.0.0.CR5.jar,
- xnio-nio-3.0.0.CR5.jar
+ xnio-api-3.0.3.GA.jar,
+ xnio-nio-3.0.3.GA.jar
Service-Component: META-INF/jboss-management-service.xml
Export-Package: org.jboss.ide.eclipse.as.internal.management.as71;x-friends:="org.jboss.ide.eclipse.as.management.as7.tests"
Bundle-Vendor: JBoss by Red Hat
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/build.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/build.properties 2012-03-08 11:55:39 UTC (rev 39369)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/build.properties 2012-03-08 12:00:50 UTC (rev 39370)
@@ -7,13 +7,13 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- jboss-as-controller-client-7.1.0.Beta1b.jar,\
- jboss-as-protocol-7.1.0.Beta1b.jar,\
- jboss-dmr-1.1.0.Final.jar,\
- jboss-logging-3.1.0.CR2.jar,\
- jboss-marshalling-1.3.4.GA.jar,\
- jboss-sasl-1.0.0.Beta8.jar,\
+ jboss-as-controller-client-7.1.0.Final.jar,\
+ jboss-as-protocol-7.1.0.Final.jar,\
+ jboss-dmr-1.1.1.Final.jar,\
+ jboss-logging-3.1.0.GA.jar,\
+ jboss-marshalling-1.3.9.GA.jar,\
+ jboss-remoting-3.2.2.GA.jar,\
+ jboss-sasl-1.0.0.Final.jar,\
jboss-threads-2.0.0.GA.jar,\
- xnio-api-3.0.0.CR5.jar,\
- xnio-nio-3.0.0.CR5.jar,\
- jboss-remoting-3.2.0.CR5-SNAPSHOT.jar
+ xnio-api-3.0.3.GA.jar,\
+ xnio-nio-3.0.3.GA.jar
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-as-controller-client-7.1.0.Beta1b.jar
===================================================================
(Binary files differ)
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-as-controller-client-7.1.0.Final.jar
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-as-controller-client-7.1.0.Final.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-as-protocol-7.1.0.Beta1b.jar
===================================================================
(Binary files differ)
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-as-protocol-7.1.0.Final.jar
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-as-protocol-7.1.0.Final.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-dmr-1.1.0.Final.jar
===================================================================
(Binary files differ)
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-dmr-1.1.1.Final.jar
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-dmr-1.1.1.Final.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-logging-3.1.0.CR2.jar
===================================================================
(Binary files differ)
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-logging-3.1.0.GA.jar
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-logging-3.1.0.GA.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-marshalling-1.3.4.GA.jar
===================================================================
(Binary files differ)
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-marshalling-1.3.9.GA.jar
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-marshalling-1.3.9.GA.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-remoting-3.2.0.CR5-SNAPSHOT.jar
===================================================================
(Binary files differ)
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-remoting-3.2.2.GA.jar
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-remoting-3.2.2.GA.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-sasl-1.0.0.Beta8.jar
===================================================================
(Binary files differ)
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-sasl-1.0.0.Final.jar
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-sasl-1.0.0.Final.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/AS71Manager.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/AS71Manager.java 2012-03-08 11:55:39 UTC (rev 39369)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/AS71Manager.java 2012-03-08 12:00:50 UTC (rev 39370)
@@ -31,6 +31,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import javax.security.auth.callback.Callback;
@@ -284,10 +285,12 @@
}
}
- public void quietlyExecute(ModelNode node) throws JBoss7ManangerException {
+ // this should only be used when doing shutdown and restart operations.
+ private void quietlyExecute(ModelNode node) throws JBoss7ManangerException {
try {
client.execute(node);
} catch (Exception e) {
+ // AS 7.0 servers fails in finishing the client calls thus we will see IOException when calling shutdown that we should ignore.
if (!isConnectionCloseException(e)) {
throw new JBoss7ManangerException(e);
}
@@ -295,9 +298,10 @@
}
private boolean isConnectionCloseException(Exception e) {
- return e instanceof IOException
+ return (e instanceof IOException
&& e.getMessage() != null
- && e.getMessage().indexOf("Channel closed") > -1;
+ && (e.getMessage().indexOf("Channel closed") > -1) // pre-AS 7.1 client lib
+ || e.getMessage().indexOf("Operation failed") > -1); // AS 7.1 client lib
}
private IJBoss7DeploymentResult execute(DeploymentPlanBuilder builder) throws JBoss7ManangerException {
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/xnio-api-3.0.0.CR5.jar
===================================================================
(Binary files differ)
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/xnio-api-3.0.3.GA.jar
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/xnio-api-3.0.3.GA.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/xnio-nio-3.0.0.CR5.jar
===================================================================
(Binary files differ)
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/xnio-nio-3.0.3.GA.jar
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/xnio-nio-3.0.3.GA.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
14 years, 1 month
JBoss Tools SVN: r39369 - in branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71: META-INF and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-03-08 06:55:39 -0500 (Thu, 08 Mar 2012)
New Revision: 39369
Added:
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-as-controller-client-7.1.0.Final.jar
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-as-protocol-7.1.0.Final.jar
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-dmr-1.1.1.Final.jar
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-logging-3.1.0.GA.jar
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-marshalling-1.3.9.GA.jar
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-remoting-3.2.2.GA.jar
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-sasl-1.0.0.Final.jar
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/newjars.zip
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/xnio-api-3.0.3.GA.jar
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/xnio-nio-3.0.3.GA.jar
Removed:
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-as-controller-client-7.1.0.Beta1b.jar
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-as-protocol-7.1.0.Beta1b.jar
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-dmr-1.1.0.Final.jar
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-logging-3.1.0.CR2.jar
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-marshalling-1.3.4.GA.jar
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-remoting-3.2.0.CR5-SNAPSHOT.jar
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-sasl-1.0.0.Beta8.jar
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/xnio-api-3.0.0.CR5.jar
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/xnio-nio-3.0.0.CR5.jar
Modified:
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/.classpath
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/MANIFEST.MF
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/build.properties
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/AS71Manager.java
Log:
JBIDE-11199 commit to beta1 only
Modified: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/.classpath
===================================================================
--- branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/.classpath 2012-03-08 11:54:04 UTC (rev 39368)
+++ branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/.classpath 2012-03-08 11:55:39 UTC (rev 39369)
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="lib" path="jboss-remoting-3.2.0.CR5-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="jboss-as-controller-client-7.1.0.Beta1b.jar"/>
- <classpathentry exported="true" kind="lib" path="jboss-as-protocol-7.1.0.Beta1b.jar"/>
- <classpathentry exported="true" kind="lib" path="jboss-dmr-1.1.0.Final.jar"/>
- <classpathentry exported="true" kind="lib" path="jboss-logging-3.1.0.CR2.jar"/>
- <classpathentry exported="true" kind="lib" path="jboss-marshalling-1.3.4.GA.jar"/>
- <classpathentry exported="true" kind="lib" path="jboss-sasl-1.0.0.Beta8.jar"/>
+ <classpathentry exported="true" kind="lib" path="xnio-nio-3.0.3.GA.jar"/>
+ <classpathentry exported="true" kind="lib" path="xnio-api-3.0.3.GA.jar"/>
<classpathentry exported="true" kind="lib" path="jboss-threads-2.0.0.GA.jar"/>
- <classpathentry exported="true" kind="lib" path="xnio-api-3.0.0.CR5.jar"/>
- <classpathentry exported="true" kind="lib" path="xnio-nio-3.0.0.CR5.jar"/>
+ <classpathentry exported="true" kind="lib" path="jboss-sasl-1.0.0.Final.jar"/>
+ <classpathentry exported="true" kind="lib" path="jboss-remoting-3.2.2.GA.jar"/>
+ <classpathentry exported="true" kind="lib" path="jboss-marshalling-1.3.9.GA.jar"/>
+ <classpathentry exported="true" kind="lib" path="jboss-logging-3.1.0.GA.jar"/>
+ <classpathentry exported="true" kind="lib" path="jboss-dmr-1.1.1.Final.jar"/>
+ <classpathentry exported="true" kind="lib" path="jboss-as-protocol-7.1.0.Final.jar"/>
+ <classpathentry exported="true" kind="lib" path="jboss-as-controller-client-7.1.0.Final.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
Modified: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/MANIFEST.MF 2012-03-08 11:54:04 UTC (rev 39368)
+++ branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/MANIFEST.MF 2012-03-08 11:55:39 UTC (rev 39369)
@@ -10,16 +10,16 @@
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ClassPath: .,
- jboss-as-controller-client-7.1.0.Beta1b.jar,
- jboss-as-protocol-7.1.0.Beta1b.jar,
- jboss-dmr-1.1.0.Final.jar,
- jboss-logging-3.1.0.CR2.jar,
- jboss-marshalling-1.3.4.GA.jar,
- jboss-remoting-3.2.0.CR5-SNAPSHOT.jar,
- jboss-sasl-1.0.0.Beta8.jar,
+ jboss-as-controller-client-7.1.0.Final.jar,
+ jboss-as-protocol-7.1.0.Final.jar,
+ jboss-dmr-1.1.1.Final.jar,
+ jboss-logging-3.1.0.GA.jar,
+ jboss-marshalling-1.3.9.GA.jar,
+ jboss-remoting-3.2.2.GA.jar,
+ jboss-sasl-1.0.0.Final.jar,
jboss-threads-2.0.0.GA.jar,
- xnio-api-3.0.0.CR5.jar,
- xnio-nio-3.0.0.CR5.jar
+ xnio-api-3.0.3.GA.jar,
+ xnio-nio-3.0.3.GA.jar
Service-Component: META-INF/jboss-management-service.xml
Export-Package: org.jboss.ide.eclipse.as.internal.management.as71;x-friends:="org.jboss.ide.eclipse.as.management.as7.tests"
Bundle-Vendor: JBoss by Red Hat
Modified: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/build.properties
===================================================================
--- branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/build.properties 2012-03-08 11:54:04 UTC (rev 39368)
+++ branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/build.properties 2012-03-08 11:55:39 UTC (rev 39369)
@@ -7,13 +7,13 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- jboss-as-controller-client-7.1.0.Beta1b.jar,\
- jboss-as-protocol-7.1.0.Beta1b.jar,\
- jboss-dmr-1.1.0.Final.jar,\
- jboss-logging-3.1.0.CR2.jar,\
- jboss-marshalling-1.3.4.GA.jar,\
- jboss-sasl-1.0.0.Beta8.jar,\
+ jboss-as-controller-client-7.1.0.Final.jar,\
+ jboss-as-protocol-7.1.0.Final.jar,\
+ jboss-dmr-1.1.1.Final.jar,\
+ jboss-logging-3.1.0.GA.jar,\
+ jboss-marshalling-1.3.9.GA.jar,\
+ jboss-remoting-3.2.2.GA.jar,\
+ jboss-sasl-1.0.0.Final.jar,\
jboss-threads-2.0.0.GA.jar,\
- xnio-api-3.0.0.CR5.jar,\
- xnio-nio-3.0.0.CR5.jar,\
- jboss-remoting-3.2.0.CR5-SNAPSHOT.jar
+ xnio-api-3.0.3.GA.jar,\
+ xnio-nio-3.0.3.GA.jar
Deleted: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-as-controller-client-7.1.0.Beta1b.jar
===================================================================
(Binary files differ)
Added: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-as-controller-client-7.1.0.Final.jar
===================================================================
(Binary files differ)
Property changes on: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-as-controller-client-7.1.0.Final.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-as-protocol-7.1.0.Beta1b.jar
===================================================================
(Binary files differ)
Added: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-as-protocol-7.1.0.Final.jar
===================================================================
(Binary files differ)
Property changes on: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-as-protocol-7.1.0.Final.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-dmr-1.1.0.Final.jar
===================================================================
(Binary files differ)
Added: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-dmr-1.1.1.Final.jar
===================================================================
(Binary files differ)
Property changes on: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-dmr-1.1.1.Final.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-logging-3.1.0.CR2.jar
===================================================================
(Binary files differ)
Added: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-logging-3.1.0.GA.jar
===================================================================
(Binary files differ)
Property changes on: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-logging-3.1.0.GA.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-marshalling-1.3.4.GA.jar
===================================================================
(Binary files differ)
Added: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-marshalling-1.3.9.GA.jar
===================================================================
(Binary files differ)
Property changes on: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-marshalling-1.3.9.GA.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-remoting-3.2.0.CR5-SNAPSHOT.jar
===================================================================
(Binary files differ)
Added: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-remoting-3.2.2.GA.jar
===================================================================
(Binary files differ)
Property changes on: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-remoting-3.2.2.GA.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-sasl-1.0.0.Beta8.jar
===================================================================
(Binary files differ)
Added: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-sasl-1.0.0.Final.jar
===================================================================
(Binary files differ)
Property changes on: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-sasl-1.0.0.Final.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/newjars.zip
===================================================================
(Binary files differ)
Property changes on: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/newjars.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/AS71Manager.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/AS71Manager.java 2012-03-08 11:54:04 UTC (rev 39368)
+++ branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/AS71Manager.java 2012-03-08 11:55:39 UTC (rev 39369)
@@ -284,10 +284,12 @@
}
}
- public void quietlyExecute(ModelNode node) throws JBoss7ManangerException {
+ // this should only be used when doing shutdown and restart operations.
+ private void quietlyExecute(ModelNode node) throws JBoss7ManangerException {
try {
client.execute(node);
} catch (Exception e) {
+ // AS 7.0 servers fails in finishing the client calls thus we will see IOException when calling shutdown that we should ignore.
if (!isConnectionCloseException(e)) {
throw new JBoss7ManangerException(e);
}
@@ -295,9 +297,10 @@
}
private boolean isConnectionCloseException(Exception e) {
- return e instanceof IOException
+ return (e instanceof IOException
&& e.getMessage() != null
- && e.getMessage().indexOf("Channel closed") > -1;
+ && (e.getMessage().indexOf("Channel closed") > -1) // pre-AS 7.1 client lib
+ || e.getMessage().indexOf("Operation failed") > -1); // AS 7.1 client lib
}
private IJBoss7DeploymentResult execute(DeploymentPlanBuilder builder) throws JBoss7ManangerException {
Deleted: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/xnio-api-3.0.0.CR5.jar
===================================================================
(Binary files differ)
Added: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/xnio-api-3.0.3.GA.jar
===================================================================
(Binary files differ)
Property changes on: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/xnio-api-3.0.3.GA.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/xnio-nio-3.0.0.CR5.jar
===================================================================
(Binary files differ)
Added: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/xnio-nio-3.0.3.GA.jar
===================================================================
(Binary files differ)
Property changes on: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.management.as71/xnio-nio-3.0.3.GA.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
14 years, 1 month