Author: adietish Date: 2011-06-22 09:37:30 -0400 (Wed, 22 Jun 2011) New Revision: 32289 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/CoreServerAS7Messages.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/CoreServerAS7Messages.properties Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerState.java trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF trunk/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: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/CoreServerAS7Messages.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/CoreServerAS7Messages.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/CoreServerAS7Messages.java 2011-06-22 13:37:30 UTC (rev 32289) @@ -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: trunk/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: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/CoreServerAS7Messages.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/CoreServerAS7Messages.properties (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/CoreServerAS7Messages.properties 2011-06-22 13:37:30 UTC (rev 32289) @@ -0,0 +1 @@ +JBoss7ServerState_noEnumForString="No JBoss7ServerState enum for string {0}" \ No newline at end of file Property changes on: trunk/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: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerState.java =================================================================== --- trunk/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) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerState.java 2011-06-22 13:37:30 UTC (rev 32289) @@ -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: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF 2011-06-22 13:35:37 UTC (rev 32288) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF 2011-06-22 13:37:30 UTC (rev 32289) @@ -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: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java =================================================================== --- trunk/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) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java 2011-06-22 13:37:30 UTC (rev 32289) @@ -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;