[jbosstools-commits] 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.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Thu Mar 8 06:55:40 EST 2012
Author: rob.stryker at 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
More information about the jbosstools-commits
mailing list