[eclipse-jbosstools/f19: 28/36] Rebase as.mgmt.as71-4.0.0.patch
Gerard Ryan
galileo at fedoraproject.org
Sun Aug 18 15:23:13 UTC 2013
commit d13b47b542da12b9735bc214570142e6c20551e0
Author: Gerard Ryan <gerard at ryan.lt>
Date: Sun Aug 18 12:09:52 2013 +0100
Rebase as.mgmt.as71-4.0.0.patch
eclipse-jbosstools-as.mgmt.as71-4.0.0.patch | 112 +++++++++++++++------------
1 files changed, 63 insertions(+), 49 deletions(-)
---
diff --git a/eclipse-jbosstools-as.mgmt.as71-4.0.0.patch b/eclipse-jbosstools-as.mgmt.as71-4.0.0.patch
index b93b353..30ce4d2 100644
--- a/eclipse-jbosstools-as.mgmt.as71-4.0.0.patch
+++ b/eclipse-jbosstools-as.mgmt.as71-4.0.0.patch
@@ -1,86 +1,100 @@
-diff -Naur server/as/plugins/org.jboss.ide.eclipse.as.management.as71.orig/build.properties server/as/plugins/org.jboss.ide.eclipse.as.management.as71/build.properties
---- server/as/plugins/org.jboss.ide.eclipse.as.management.as71.orig/build.properties 2012-10-07 00:35:22.664537071 +0100
-+++ server/as/plugins/org.jboss.ide.eclipse.as.management.as71/build.properties 2012-10-07 00:37:13.043431525 +0100
-@@ -7,13 +7,13 @@
+--- jbosstools-server/as/plugins/org.jboss.ide.eclipse.as.management.as71/build.properties.orig 2013-06-08 21:28:25.819247159 +0100
++++ jbosstools-server/as/plugins/org.jboss.ide.eclipse.as.management.as71/build.properties 2013-06-08 21:36:23.643482308 +0100
+@@ -7,14 +7,14 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
-- 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-sasl-1.0.0.Final.jar,\
-- jboss-threads-2.0.0.GA.jar,\
-- xnio-api-3.0.3.GA.jar,\
-- xnio-nio-3.0.3.GA.jar,\
-- jboss-remoting-3.2.7.GA.jar
+- jboss-as-controller-client-7.2.0.Final-redhat-4.jar,\
+- jboss-as-protocol-7.2.0.Final-redhat-4.jar,\
+- jboss-dmr-1.1.6.Final-redhat-1.jar,\
+- jboss-logging-3.1.2.GA-redhat-1.jar,\
+- jboss-marshalling-1.3.16.GA-redhat-1.jar,\
+- jboss-marshalling-river-1.3.16.GA-redhat-1.jar,\
+- jboss-remoting-3.2.16.GA.jar,\
+- jboss-sasl-1.0.3.Final-redhat-1.jar,\
+- jboss-threads-2.1.0.Final-redhat-1.jar,\
+- xnio-api-3.0.7.GA-redhat-1.jar,\
+- xnio-nio-3.0.7.GA-redhat-1.jar
+ jboss-as-controller-client.jar,\
+ jboss-as-protocol.jar,\
+ jboss-dmr.jar,\
+ jboss-logging.jar,\
+ jboss-marshalling.jar,\
++ jboss-marshalling-river.jar,\
++ jboss-remoting.jar,\
+ jboss-sasl.jar,\
+ jboss-threads.jar,\
+ xnio-api.jar,\
-+ xnio-nio.jar,\
-+ jboss-remoting.jar
-diff -Naur server/as/plugins/org.jboss.ide.eclipse.as.management.as71.orig/.classpath server/as/plugins/org.jboss.ide.eclipse.as.management.as71/.classpath
---- server/as/plugins/org.jboss.ide.eclipse.as.management.as71.orig/.classpath 2012-10-07 00:35:22.663537090 +0100
-+++ server/as/plugins/org.jboss.ide.eclipse.as.management.as71/.classpath 2012-10-07 00:38:45.537659799 +0100
-@@ -1,15 +1,15 @@
++ xnio-nio.jar
+--- jbosstools-server/as/plugins/org.jboss.ide.eclipse.as.management.as71/.classpath.orig 2013-06-08 21:28:25.820247141 +0100
++++ jbosstools-server/as/plugins/org.jboss.ide.eclipse.as.management.as71/.classpath 2013-06-08 21:38:42.757923634 +0100
+@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
-- <classpathentry exported="true" kind="lib" path="jboss-as-controller-client-7.1.0.Final.jar" sourcepath="/home/rob/code/jboss/as7/jboss-as/controller-client"/>
-- <classpathentry exported="true" kind="lib" path="jboss-as-protocol-7.1.0.Final.jar" sourcepath="/home/rob/code/jboss/as7/jboss-as/protocol/src"/>
-- <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-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.3.GA.jar"/>
-- <classpathentry exported="true" kind="lib" path="xnio-nio-3.0.3.GA.jar"/>
-- <classpathentry exported="true" kind="lib" path="jboss-remoting-3.2.7.GA.jar"/>
-+ <classpathentry exported="true" kind="lib" path="jboss-as-controller-client.jar" sourcepath="/home/rob/code/jboss/as7/jboss-as/controller-client"/>
-+ <classpathentry exported="true" kind="lib" path="jboss-as-protocol.jar" sourcepath="/home/rob/code/jboss/as7/jboss-as/protocol/src"/>
+- <classpathentry exported="true" kind="lib" path="jboss-as-controller-client-7.2.0.Final-redhat-4.jar"/>
+- <classpathentry exported="true" kind="lib" path="jboss-as-protocol-7.2.0.Final-redhat-4.jar"/>
+- <classpathentry exported="true" kind="lib" path="jboss-dmr-1.1.6.Final-redhat-1.jar"/>
+- <classpathentry exported="true" kind="lib" path="jboss-logging-3.1.2.GA-redhat-1.jar"/>
+- <classpathentry exported="true" kind="lib" path="jboss-marshalling-1.3.16.GA-redhat-1.jar"/>
+- <classpathentry exported="true" kind="lib" path="jboss-marshalling-river-1.3.16.GA-redhat-1.jar"/>
+- <classpathentry exported="true" kind="lib" path="jboss-remoting-3.2.16.GA.jar"/>
+- <classpathentry exported="true" kind="lib" path="jboss-sasl-1.0.3.Final-redhat-1.jar"/>
+- <classpathentry exported="true" kind="lib" path="jboss-threads-2.1.0.Final-redhat-1.jar"/>
+- <classpathentry exported="true" kind="lib" path="xnio-api-3.0.7.GA-redhat-1.jar"/>
+- <classpathentry exported="true" kind="lib" path="xnio-nio-3.0.7.GA-redhat-1.jar"/>
++ <classpathentry exported="true" kind="lib" path="jboss-as-controller-client.jar"/>
++ <classpathentry exported="true" kind="lib" path="jboss-as-protocol.jar"/>
+ <classpathentry exported="true" kind="lib" path="jboss-dmr.jar"/>
+ <classpathentry exported="true" kind="lib" path="jboss-logging.jar"/>
+ <classpathentry exported="true" kind="lib" path="jboss-marshalling.jar"/>
++ <classpathentry exported="true" kind="lib" path="jboss-marshalling-river.jar"/>
++ <classpathentry exported="true" kind="lib" path="jboss-remoting.jar"/>
+ <classpathentry exported="true" kind="lib" path="jboss-sasl.jar"/>
+ <classpathentry exported="true" kind="lib" path="jboss-threads.jar"/>
+ <classpathentry exported="true" kind="lib" path="xnio-api.jar"/>
+ <classpathentry exported="true" kind="lib" path="xnio-nio.jar"/>
-+ <classpathentry exported="true" kind="lib" path="jboss-remoting.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"/>
-diff -Naur server/as/plugins/org.jboss.ide.eclipse.as.management.as71.orig/META-INF/MANIFEST.MF server/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/MANIFEST.MF
---- server/as/plugins/org.jboss.ide.eclipse.as.management.as71.orig/META-INF/MANIFEST.MF 2012-10-07 00:35:22.667537014 +0100
-+++ server/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/MANIFEST.MF 2012-10-07 00:40:07.098095082 +0100
-@@ -10,16 +10,16 @@
+--- jbosstools-server/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/MANIFEST.MF.orig 2013-07-27 14:03:52.979049669 +0100
++++ jbosstools-server/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/MANIFEST.MF 2013-07-27 14:06:29.445273608 +0100
+@@ -10,17 +10,17 @@
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ClassPath: .,
-- 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-sasl-1.0.0.Final.jar,
-- jboss-threads-2.0.0.GA.jar,
-- xnio-api-3.0.3.GA.jar,
-- xnio-nio-3.0.3.GA.jar,
-- jboss-remoting-3.2.7.GA.jar
+- jboss-as-controller-client-7.2.0.Final-redhat-4.jar,
+- jboss-as-protocol-7.2.0.Final-redhat-4.jar,
+- jboss-dmr-1.1.6.Final-redhat-1.jar,
+- jboss-logging-3.1.2.GA-redhat-1.jar,
+- jboss-marshalling-1.3.16.GA-redhat-1.jar,
+- jboss-marshalling-river-1.3.16.GA-redhat-1.jar,
+- jboss-remoting-3.2.16.GA.jar,
+- jboss-sasl-1.0.3.Final-redhat-1.jar,
+- jboss-threads-2.1.0.Final-redhat-1.jar,
+- xnio-api-3.0.7.GA-redhat-1.jar,
+- xnio-nio-3.0.7.GA-redhat-1.jar
+ jboss-as-controller-client.jar,
+ jboss-as-protocol.jar,
+ jboss-dmr.jar,
+ jboss-logging.jar,
+ jboss-marshalling.jar,
++ jboss-marshalling-river.jar,
++ jboss-remoting.jar,
+ jboss-sasl.jar,
+ jboss-threads.jar,
+ xnio-api.jar,
-+ xnio-nio.jar,
-+ jboss-remoting.jar
++ xnio-nio.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
+--- jbosstools-server/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/AS71Manager.java.orig 2013-07-27 14:46:35.182572807 +0100
++++ jbosstools-server/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/AS71Manager.java 2013-07-27 14:47:03.189057486 +0100
+@@ -74,7 +74,7 @@
+ ((Integer)timeout).intValue();
+ this.client = ModelControllerClient.Factory.create(
+ details.getHost(), details.getManagementPort(),
+- getCallbackHandler(), null, timeout2);
++ getCallbackHandler());
+ this.manager = ServerDeploymentManager.Factory.create(client);
+ } catch(UnknownHostException uhe) {
+ throw new JBoss7ManangerException(uhe);
More information about the scm-commits
mailing list