Author: rob.stryker(a)jboss.com Date: 2011-04-25 18:35:27 -0400 (Mon, 25 Apr 2011) New Revision: 30835 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/AS7Messages.java trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/AS7Messages.properties 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/AS7ManagerUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/DeploymentOperationResult.java trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/DetypedDeployer.java trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBoss7Manager.java trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/ModelDescriptionConstants.java Log: NLS done properly for as7 code Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/AS7Messages.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/AS7Messages.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/AS7Messages.java 2011-04-25 22:35:27 UTC (rev 30835) @@ -0,0 +1,29 @@ +/******************************************************************************* + * 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.management.as7; + +import org.eclipse.osgi.util.NLS; + +public class AS7Messages extends NLS { + public static String ModuleStateEvaluationFailed; + public static String OperationOnAddressFailed; + public static String FailedToBuildOperation; + public static String OperationOutcomeToString; + public static String OperationOnUnitNotExecuted; + public static String OperationOnUnitFailed; + public static String OperationOnUnitRolledBack; + public static String OperationNotExecConfigRequiresRestart; + static { + NLS.initializeMessages("org.jboss.ide.eclipse.as.management.as7.AS7Messages", //$NON-NLS-1$ + AS7Messages.class); + } + +} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/AS7Messages.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/AS7Messages.properties (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/AS7Messages.properties 2011-04-25 22:35:27 UTC (rev 30835) @@ -0,0 +1,8 @@ +ModuleStateEvaluationFailed=Could not evaluate state for deployment {0} +OperationOnAddressFailed=Could not execute {0} for {1}. Failure was {2}. +FailedToBuildOperation=Failed to build operation. +OperationOutcomeToString=Operation outcome is {0}. +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 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-04-25 21:41:55 UTC (rev 30834) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java 2011-04-25 22:35:27 UTC (rev 30835) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. + * 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, @@ -21,10 +21,10 @@ import java.io.File; import java.io.IOException; import java.net.UnknownHostException; -import java.text.MessageFormat; import java.util.concurrent.Future; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.osgi.util.NLS; import org.jboss.as.controller.client.ModelControllerClient; import org.jboss.as.controller.client.helpers.standalone.DeploymentAction; import org.jboss.as.controller.client.helpers.standalone.DeploymentPlanBuilder; @@ -32,9 +32,10 @@ import org.jboss.as.controller.client.helpers.standalone.ServerDeploymentPlanResult; import org.jboss.as.protocol.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; import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManangerException; -import org.jboss.ide.eclipse.as.core.server.internal.v7.IJBoss7DeploymentResult; +import org.jboss.ide.eclipse.as.management.as7.AS7Messages; /** * @author André Dietisheim @@ -124,7 +125,7 @@ Boolean enabled = AS7ManagerUtil.getBooleanProperty(ENABLED, result); if (enabled == null) { throw new JBoss7ManangerException( - MessageFormat.format("Could not evaluate state for deployment {0}", name)); + NLS.bind(AS7Messages.ModuleStateEvaluationFailed, name)); } else if (enabled) { return JBoss7DeploymentState.STARTED; } else { @@ -142,8 +143,11 @@ ModelNode response = client.execute(node); if (!AS7ManagerUtil.isSuccess(response)) { throw new JBoss7ManangerException( - MessageFormat.format("Could not execute {0} for {1}. Failure was {2}.", node.get(OP), - node.get(ADDRESS), response.get(FAILURE_DESCRIPTION))); + NLS.bind(AS7Messages.OperationOnAddressFailed, + new Object[]{ node.get(OP), + node.get(ADDRESS), + response.get(FAILURE_DESCRIPTION)} + )); } return response.get(RESULT); } catch (Exception e) { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7ManagerUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7ManagerUtil.java 2011-04-25 21:41:55 UTC (rev 30834) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7ManagerUtil.java 2011-04-25 22:35:27 UTC (rev 30835) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. + * 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, @@ -23,12 +23,14 @@ import java.util.Collections; import java.util.List; +import org.eclipse.osgi.util.NLS; import org.jboss.as.controller.client.ModelControllerClient; import org.jboss.as.controller.client.Operation; import org.jboss.dmr.ModelNode; import org.jboss.dmr.ModelType; import org.jboss.dmr.Property; import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManangerException; +import org.jboss.ide.eclipse.as.management.as7.AS7Messages; import org.jboss.ide.eclipse.as.management.as7.internal.DefaultOperationRequestBuilder; import org.jboss.ide.eclipse.as.management.as7.internal.OperationFormatException; @@ -105,10 +107,10 @@ final ModelNode request; try { builder.operationName(READ_CHILDREN_NAMES_OPERATION); - builder.addProperty(CHILD_TYPE, "deployment"); + builder.addProperty(CHILD_TYPE, ModelDescriptionConstants.DEPLOYMENT); request = builder.buildRequest(); } catch (OperationFormatException e) { - throw new IllegalStateException("Failed to build operation", e); + throw new IllegalStateException(AS7Messages.FailedToBuildOperation, e); } try { @@ -142,14 +144,15 @@ try { ModelNode result = client.execute(operation); if (result.hasDefined(OUTCOME) - && SUCCESS.equals(result.get("outcome").asString())) { + && SUCCESS.equals(result.get(OUTCOME).asString())) { return result.get(RESULT); } else if (result.hasDefined(FAILURE_DESCRIPTION)) { throw new JBoss7ManangerException(result.get(FAILURE_DESCRIPTION).toString()); } else { - throw new JBoss7ManangerException("Operation outcome is " + result.get(OUTCOME).asString()); + throw new JBoss7ManangerException(NLS.bind( + AS7Messages.OperationOutcomeToString, result.get(OUTCOME).asString())); } } catch (IOException e) { throw new JBoss7ManangerException(e); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/DeploymentOperationResult.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/DeploymentOperationResult.java 2011-04-25 21:41:55 UTC (rev 30834) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/DeploymentOperationResult.java 2011-04-25 22:35:27 UTC (rev 30835) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. + * 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, @@ -16,11 +16,13 @@ import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; +import org.eclipse.osgi.util.NLS; import org.jboss.as.controller.client.helpers.standalone.DeploymentAction; import org.jboss.as.controller.client.helpers.standalone.ServerDeploymentActionResult; import org.jboss.as.controller.client.helpers.standalone.ServerDeploymentPlanResult; import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManangerException; import org.jboss.ide.eclipse.as.core.server.internal.v7.IJBoss7DeploymentResult; +import org.jboss.ide.eclipse.as.management.as7.AS7Messages; import org.jboss.ide.eclipse.as.management.as7.Activator; /** @@ -62,25 +64,27 @@ IStatus status = null; switch (actionResult.getResult()) { case NOT_EXECUTED: - status = createStatus(IStatus.ERROR, "The operation {0} was not executed on unit {1}", - actionName, deploymentName); + status = createStatus(IStatus.ERROR, NLS.bind( + AS7Messages.OperationOnUnitNotExecuted, + actionName, deploymentName)); break; case EXECUTED: status = Status.OK_STATUS; break; case FAILED: - status = createStatus(IStatus.ERROR, "The operation {0} failed for unit {1}", - actionName, deploymentName); + status = createStatus(IStatus.ERROR, NLS.bind(AS7Messages.OperationOnUnitFailed, + actionName, deploymentName)); break; case ROLLED_BACK: - status = createStatus(IStatus.ERROR, "The operation {0} for unit {1} was rolled back", - actionName, deploymentName); + status = createStatus(IStatus.ERROR, + NLS.bind(AS7Messages.OperationOnUnitRolledBack, + actionName, deploymentName)); break; case CONFIGURATION_MODIFIED_REQUIRES_RESTART: status = createStatus( IStatus.WARNING, - "The operation {0} was not executed on unit {1}. The server configuration was changed though and the server needs to be restarted", - actionName, deploymentName); + NLS.bind(AS7Messages.OperationNotExecConfigRequiresRestart, + actionName, deploymentName)); break; } return status; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/DetypedDeployer.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/DetypedDeployer.java 2011-04-25 21:41:55 UTC (rev 30834) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/DetypedDeployer.java 2011-04-25 22:35:27 UTC (rev 30835) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. + * 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, Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBoss7Manager.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBoss7Manager.java 2011-04-25 21:41:55 UTC (rev 30834) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBoss7Manager.java 2011-04-25 22:35:27 UTC (rev 30835) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. + * 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, Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/ModelDescriptionConstants.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/ModelDescriptionConstants.java 2011-04-25 21:41:55 UTC (rev 30834) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/ModelDescriptionConstants.java 2011-04-25 22:35:27 UTC (rev 30835) @@ -1,24 +1,13 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat, Inc., and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ +/******************************************************************************* + * 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.management.as7.deployment;