Author: max.andersen(a)jboss.com Date: 2011-11-30 22:22:06 -0500 (Wed, 30 Nov 2011) New Revision: 36820 Added: 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-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 Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-as-controller-client-7.1.0.CR1-SNAPSHOT.jar trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-as-protocol-7.1.0.CR1-SNAPSHOT.jar trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-remoting-3.2.0.CR3.jar trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-sasl-1.0.0.Beta6.jar trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/xnio-api-3.0.0.CR4.jar trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/xnio-nio-3.0.0.CR4.jar Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerUtil.java 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/JBoss71ManagerService.java Log: JBIDE-10293 committed updated client jars, removed old hack for 71b1 and minimal fix for broken auth handling in our eclipse code Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-12-01 02:07:48 UTC (rev 36819) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-12-01 03:22:06 UTC (rev 36820) @@ -90,6 +90,10 @@ for( int i = 0; i < retPrompts.length; i++) { retPrompts[i] = (String)requiredPropertiesReturned.get(prompts[i]); } + + // If not cleared then it will keep asking for username/password + requiresInfoException = null; + return retPrompts; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerUtil.java 2011-12-01 02:07:48 UTC (rev 36819) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerUtil.java 2011-12-01 03:22:06 UTC (rev 36820) @@ -20,48 +20,14 @@ private static final String JBOSS7_RUNTIME = "org.jboss.ide.eclipse.as.runtime.70"; //$NON-NLS-1$ private static final String JBOSS71_RUNTIME = "org.jboss.ide.eclipse.as.runtime.71"; //$NON-NLS-1$ private static final String EAP6_RUNTIME = "org.jboss.ide.eclipse.as.runtime.eap.60"; //$NON-NLS-1$ - private static final int UNLIKELY_PORT = 65401; public static IJBoss7ManagerService getService(IServer server) throws InvalidSyntaxException { BundleContext context = JBossServerCorePlugin.getContext(); JBoss7ManagerServiceProxy proxy = new JBoss7ManagerServiceProxy(context, getRequiredVersion(server)); - skipLazyInit(); proxy.open(); return proxy; } - - private static boolean initialized = false; - /* HUUUUUUUUGE HACK - * - * Workaround for https://issues.jboss.org/browse/AS7-2772 - * Issue is that AS7.1beta1 client jars changes the security protocol thus we need to ensure it gets registered first. - * */ - private synchronized static void skipLazyInit() { - if( !initialized ) { - - // Testing to see if forcing the proxy open will - BundleContext context = JBossServerCorePlugin.getContext(); - JBoss7ManagerServiceProxy proxy = null; - try { - proxy = new JBoss7ManagerServiceProxy(context, IJBoss7ManagerService.AS_VERSION_710_Beta); - proxy.open(); - //proxy.getServerState("localhost", UNLIKELY_PORT); //$NON-NLS-1$ - proxy.init(); - } catch( Exception e ) { - // ignore, expected failure - } - try { - proxy = new JBoss7ManagerServiceProxy(context, IJBoss7ManagerService.AS_VERSION_700); - proxy.open(); - //proxy.getServerState("localhost", UNLIKELY_PORT); //$NON-NLS-1$ - proxy.init(); - } catch(Exception e ) { - // ignore, expected failure - } - initialized = true; - } - } private static String getRequiredVersion(IServer server) { String id = server.getRuntime().getRuntimeType().getId(); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/.classpath =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/.classpath 2011-12-01 02:07:48 UTC (rev 36819) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/.classpath 2011-12-01 03:22:06 UTC (rev 36820) @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry exported="true" kind="lib" path="jboss-as-controller-client-7.1.0.CR1-SNAPSHOT.jar" sourcepath="/home/rob/code/jboss/as7/jboss-as/controller-client"/> - <classpathentry exported="true" kind="lib" path="jboss-as-protocol-7.1.0.CR1-SNAPSHOT.jar" sourcepath="/home/rob/code/jboss/as7/jboss-as/protocol"/> - <classpathentry exported="true" kind="lib" path="jboss-dmr-1.1.0.Final.jar" sourcepath="/home/rob/code/jboss/as7/jboss-dmr"/> + <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-remoting-3.2.0.CR3.jar"/> - <classpathentry exported="true" kind="lib" path="jboss-sasl-1.0.0.Beta6.jar"/> + <classpathentry exported="true" kind="lib" path="jboss-sasl-1.0.0.Beta8.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.CR4.jar"/> - <classpathentry exported="true" kind="lib" path="xnio-nio-3.0.0.CR4.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 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 2011-12-01 02:07:48 UTC (rev 36819) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/MANIFEST.MF 2011-12-01 03:22:06 UTC (rev 36820) @@ -10,16 +10,16 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ClassPath: ., - jboss-as-controller-client-7.1.0.CR1-SNAPSHOT.jar, - jboss-as-protocol-7.1.0.CR1-SNAPSHOT.jar, + 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.CR3.jar, - jboss-sasl-1.0.0.Beta6.jar, + jboss-remoting-3.2.0.CR5-SNAPSHOT.jar, + jboss-sasl-1.0.0.Beta8.jar, jboss-threads-2.0.0.GA.jar, - xnio-api-3.0.0.CR4.jar, - xnio-nio-3.0.0.CR4.jar + xnio-api-3.0.0.CR5.jar, + xnio-nio-3.0.0.CR5.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 2011-12-01 02:07:48 UTC (rev 36819) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/build.properties 2011-12-01 03:22:06 UTC (rev 36820) @@ -7,13 +7,13 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ - jboss-as-controller-client-7.1.0.CR1-SNAPSHOT.jar,\ - jboss-as-protocol-7.1.0.CR1-SNAPSHOT.jar,\ + 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.CR3.jar,\ - jboss-sasl-1.0.0.Beta6.jar,\ + jboss-sasl-1.0.0.Beta8.jar,\ jboss-threads-2.0.0.GA.jar,\ - xnio-api-3.0.0.CR4.jar,\ - xnio-nio-3.0.0.CR4.jar + xnio-api-3.0.0.CR5.jar,\ + xnio-nio-3.0.0.CR5.jar,\ + jboss-remoting-3.2.0.CR5-SNAPSHOT.jar Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-as-controller-client-7.1.0.Beta1b.jar =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-as-controller-client-7.1.0.Beta1b.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-as-controller-client-7.1.0.CR1-SNAPSHOT.jar =================================================================== (Binary files differ) Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-as-protocol-7.1.0.Beta1b.jar =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-as-protocol-7.1.0.Beta1b.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.CR1-SNAPSHOT.jar =================================================================== (Binary files differ) Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-remoting-3.2.0.CR3.jar =================================================================== (Binary files differ) Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-remoting-3.2.0.CR5-SNAPSHOT.jar =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-remoting-3.2.0.CR5-SNAPSHOT.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-sasl-1.0.0.Beta6.jar =================================================================== (Binary files differ) Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-sasl-1.0.0.Beta8.jar =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-sasl-1.0.0.Beta8.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/JBoss71ManagerService.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/JBoss71ManagerService.java 2011-12-01 02:07:48 UTC (rev 36819) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/JBoss71ManagerService.java 2011-12-01 03:22:06 UTC (rev 36820) @@ -27,10 +27,6 @@ public class JBoss71ManagerService implements IJBoss7ManagerService { public void init() throws Exception { - JBossSaslProvider saslProvider = new JBossSaslProvider(); - if (Security.getProvider(saslProvider.getName()) == null) { - Security.insertProviderAt(saslProvider, 1); - } } public IJBoss7DeploymentResult deployAsync(AS7ManagementDetails details, String deploymentName, Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/xnio-api-3.0.0.CR4.jar =================================================================== (Binary files differ) Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/xnio-api-3.0.0.CR5.jar =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/xnio-api-3.0.0.CR5.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/xnio-nio-3.0.0.CR4.jar =================================================================== (Binary files differ) Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/xnio-nio-3.0.0.CR5.jar =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/xnio-nio-3.0.0.CR5.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream