Author: adietish Date: 2011-06-22 09:35:37 -0400 (Wed, 22 Jun 2011) New Revision: 32288 Added: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/CoreServerAS7Messages.java branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/CoreServerAS7Messages.properties branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-dmr-1.0.0.Beta6.jar branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-logging-3.0.0.Beta5.jar branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-remoting-3.2.0.Beta1.jar branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/xnio-api-3.0.0.Beta2.jar branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/xnio-nio-3.0.0.Beta2.jar Removed: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-dmr-1.0.0.Beta5.jar branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-logging-3.0.0.Beta3.jar Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerState.java branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/.classpath branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/build.properties branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-as-controller-client-7.0.0.Beta4-SNAPSHOT.jar branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-as-protocol-7.0.0.Beta4-SNAPSHOT.jar branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/AS7Messages.java branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/AS7Messages.properties branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java Log: [JBIDE-9173] added new controller-client jars, fixed issue with new client that was now reporting server state in small letters (was: big letters) Added: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/CoreServerAS7Messages.java =================================================================== --- branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/CoreServerAS7Messages.java (rev 0) +++ branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/CoreServerAS7Messages.java 2011-06-22 13:35:37 UTC (rev 32288) @@ -0,0 +1,23 @@ +/******************************************************************************* + * 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.ide.eclipse.as.core.server.internal.v7; + +import org.eclipse.osgi.util.NLS; + +public class CoreServerAS7Messages extends NLS { + public static String JBoss7ServerState_noEnumForString; + + static { + NLS.initializeMessages("org.jboss.ide.eclipse.as.core.server.internal.v7.CoreServerAS7Messages", //$NON-NLS-1$ + CoreServerAS7Messages.class); + } + +} Property changes on: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/CoreServerAS7Messages.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/CoreServerAS7Messages.properties =================================================================== --- branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/CoreServerAS7Messages.properties (rev 0) +++ branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/CoreServerAS7Messages.properties 2011-06-22 13:35:37 UTC (rev 32288) @@ -0,0 +1 @@ +JBoss7ServerState_noEnumForString="No JBoss7ServerState enum for string {0}" \ No newline at end of file Property changes on: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/CoreServerAS7Messages.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerState.java =================================================================== --- branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerState.java 2011-06-22 13:19:52 UTC (rev 32287) +++ branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerState.java 2011-06-22 13:35:37 UTC (rev 32288) @@ -10,9 +10,30 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.core.server.internal.v7; +import java.text.MessageFormat; + /** * @author André Dietisheim */ public enum JBoss7ServerState { - STARTING, RUNNING, RESTART_REQUIRED; + STARTING, RUNNING, RESTART_REQUIRED; + + public static JBoss7ServerState valueOfIgnoreCase(String stateString) { + JBoss7ServerState matchingState = null; + if (stateString != null && stateString.length() > 0) { + for (JBoss7ServerState availableState : values()) { + if (stateString.equalsIgnoreCase(availableState.name())) { + matchingState = availableState; + break; + } + } + } + if (matchingState == null) { + throw new IllegalArgumentException(MessageFormat.format( + CoreServerAS7Messages.JBoss7ServerState_noEnumForString, + stateString)); + } + + return matchingState; + } } Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/.classpath =================================================================== --- branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/.classpath 2011-06-22 13:19:52 UTC (rev 32287) +++ branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/.classpath 2011-06-22 13:35:37 UTC (rev 32288) @@ -2,10 +2,13 @@ <classpath> <classpathentry exported="true" kind="lib" path="jboss-as-controller-client-7.0.0.Beta4-SNAPSHOT.jar"/> <classpathentry exported="true" kind="lib" path="jboss-as-protocol-7.0.0.Beta4-SNAPSHOT.jar"/> - <classpathentry exported="true" kind="lib" path="jboss-dmr-1.0.0.Beta5.jar" sourcepath="/home/adietish/jboss-workspaces/jboss-tools/jbosstools-src/jboss-dmr-1.0.0.Beta5-sources.jar"/> - <classpathentry exported="true" kind="lib" path="jboss-logging-3.0.0.Beta3.jar"/> + <classpathentry exported="true" kind="lib" path="jboss-dmr-1.0.0.Beta6.jar"/> + <classpathentry exported="true" kind="lib" path="jboss-logging-3.0.0.Beta5.jar"/> <classpathentry exported="true" kind="lib" path="jboss-marshalling-1.3.0.CR8.jar"/> - <classpathentry exported="true" kind="lib" path="jboss-threads-2.0.0.CR8.jar" sourcepath="/home/adietish/jboss-workspaces/jboss-tools/jbosstools-src/jboss-threads-2.0.0.CR8-sources.jar"/> + <classpathentry exported="true" kind="lib" path="jboss-remoting-3.2.0.Beta1.jar"/> + <classpathentry exported="true" kind="lib" path="jboss-threads-2.0.0.CR8.jar"/> + <classpathentry exported="true" kind="lib" path="xnio-api-3.0.0.Beta2.jar"/> + <classpathentry exported="true" kind="lib" path="xnio-nio-3.0.0.Beta2.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.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF 2011-06-22 13:19:52 UTC (rev 32287) +++ branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF 2011-06-22 13:35:37 UTC (rev 32288) @@ -8,13 +8,16 @@ org.jboss.ide.eclipse.as.core Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Bundle-ClassPath: jboss-as-controller-client-7.0.0.Beta4-SNAPSHOT.jar, +Bundle-ClassPath: ., + jboss-as-controller-client-7.0.0.Beta4-SNAPSHOT.jar, jboss-as-protocol-7.0.0.Beta4-SNAPSHOT.jar, - jboss-dmr-1.0.0.Beta5.jar, - jboss-logging-3.0.0.Beta3.jar, + jboss-dmr-1.0.0.Beta6.jar, + jboss-logging-3.0.0.Beta5.jar, jboss-marshalling-1.3.0.CR8.jar, + jboss-remoting-3.2.0.Beta1.jar, jboss-threads-2.0.0.CR8.jar, - . + xnio-api-3.0.0.Beta2.jar, + xnio-nio-3.0.0.Beta2.jar Service-Component: META-INF/jboss-management-service.xml Export-Package: org.jboss.ide.eclipse.as.management.as7.deployment;x-friends:="org.jboss.ide.eclipse.as.management.as7.tests" Bundle-Vendor: JBoss by Red Hat Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/build.properties =================================================================== --- branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/build.properties 2011-06-22 13:19:52 UTC (rev 32287) +++ branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/build.properties 2011-06-22 13:35:37 UTC (rev 32288) @@ -7,9 +7,12 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ - jboss-dmr-1.0.0.Beta5.jar,\ - jboss-logging-3.0.0.Beta3.jar,\ + jboss-as-controller-client-7.0.0.Beta4-SNAPSHOT.jar,\ + jboss-as-protocol-7.0.0.Beta4-SNAPSHOT.jar,\ + jboss-dmr-1.0.0.Beta6.jar,\ + jboss-logging-3.0.0.Beta5.jar,\ jboss-marshalling-1.3.0.CR8.jar,\ + jboss-remoting-3.2.0.Beta1.jar,\ jboss-threads-2.0.0.CR8.jar,\ - jboss-as-controller-client-7.0.0.Beta4-SNAPSHOT.jar,\ - jboss-as-protocol-7.0.0.Beta4-SNAPSHOT.jar + xnio-api-3.0.0.Beta2.jar,\ + xnio-nio-3.0.0.Beta2.jar Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-as-controller-client-7.0.0.Beta4-SNAPSHOT.jar =================================================================== (Binary files differ) Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-as-protocol-7.0.0.Beta4-SNAPSHOT.jar =================================================================== (Binary files differ) Deleted: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-dmr-1.0.0.Beta5.jar =================================================================== (Binary files differ) Added: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-dmr-1.0.0.Beta6.jar =================================================================== (Binary files differ) Property changes on: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-dmr-1.0.0.Beta6.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-logging-3.0.0.Beta3.jar =================================================================== (Binary files differ) Added: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-logging-3.0.0.Beta5.jar =================================================================== (Binary files differ) Property changes on: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-logging-3.0.0.Beta5.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-remoting-3.2.0.Beta1.jar =================================================================== (Binary files differ) Property changes on: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-remoting-3.2.0.Beta1.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/AS7Messages.java =================================================================== --- branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/AS7Messages.java 2011-06-22 13:19:52 UTC (rev 32287) +++ branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/AS7Messages.java 2011-06-22 13:35:37 UTC (rev 32288) @@ -21,6 +21,8 @@ public static String OperationOnUnitFailed; public static String OperationOnUnitRolledBack; public static String OperationNotExecConfigRequiresRestart; + public static String JBoss7ServerState_noEnumForString; + static { NLS.initializeMessages("org.jboss.ide.eclipse.as.management.as7.AS7Messages", //$NON-NLS-1$ AS7Messages.class); Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/AS7Messages.properties =================================================================== --- branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/AS7Messages.properties 2011-06-22 13:19:52 UTC (rev 32287) +++ branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/AS7Messages.properties 2011-06-22 13:35:37 UTC (rev 32288) @@ -5,4 +5,5 @@ OperationOnUnitNotExecuted=The operation {0} was not executed on unit {1} OperationOnUnitFailed=The operation {0} failed for unit {1} OperationOnUnitRolledBack=The operation {0} for unit {1} was rolled back -OperationNotExecConfigRequiresRestart=The operation {0} was not executed on unit {1}. The server configuration was changed though and the server needs to be restarted. \ No newline at end of file +OperationNotExecConfigRequiresRestart=The operation {0} was not executed on unit {1}. The server configuration was changed though and the server needs to be restarted. +JBoss7ServerState_noEnumForString="No JBoss7ServerState enum for string {0}" \ No newline at end of file Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java =================================================================== --- branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java 2011-06-22 13:19:52 UTC (rev 32287) +++ branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java 2011-06-22 13:35:37 UTC (rev 32288) @@ -36,7 +36,7 @@ import org.jboss.as.controller.client.helpers.standalone.DeploymentPlanBuilder; import org.jboss.as.controller.client.helpers.standalone.ServerDeploymentManager; import org.jboss.as.controller.client.helpers.standalone.ServerDeploymentPlanResult; -import org.jboss.as.protocol.StreamUtils; +import org.jboss.as.protocol.old.StreamUtils; import org.jboss.dmr.ModelNode; import org.jboss.ide.eclipse.as.core.server.internal.v7.IJBoss7DeploymentResult; import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7DeploymentState; @@ -167,7 +167,7 @@ private JBoss7ServerState toJBoss7ServerState(ModelNode response) throws JBoss7ManangerException { try { - return JBoss7ServerState.valueOf(response.asString()); + return JBoss7ServerState.valueOfIgnoreCase(response.asString()); } catch (IllegalArgumentException e) { throw new JBoss7ManangerException(e); } Added: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/xnio-api-3.0.0.Beta2.jar =================================================================== (Binary files differ) Property changes on: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/xnio-api-3.0.0.Beta2.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/xnio-nio-3.0.0.Beta2.jar =================================================================== (Binary files differ) Property changes on: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/xnio-nio-3.0.0.Beta2.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream