Jira-ID: CRNT-22383 Merge changes done on b_dev_6_0_x after 6.0.2.GA (6.0.2.2-r49368) through 6.0.3.GA (6.0.3.6-r50668) and beyond (6.0.x HEAD) to 7.0 (trunk) - moonglow / simulation / tate / tds (org.eclipse.stardust.modeling.deploy)

git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ide@53270 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b

10 files changed, 284 insertions, 119 deletions

diff --git a/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/DeployModelDialog.java b/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/DeployModelDialog.java
index 53c0a84..e87de2d 100644
--- a/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/DeployModelDialog.java
+++ b/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/DeployModelDialog.java
@@ -89,7 +89,7 @@ public class DeployModelDialog extends AbstractDialog implements ActionListener
 
    protected JComponent createContent()
    {
-      overwriteButton = new JRadioButton(new AbstractAction(Internal_ExportMessages.getString("LB_Overwrite")) //$NON-NLS-1$
+      overwriteButton = new JRadioButton(new AbstractAction(Deploy_Messages.getString("LB_Overwrite")) //$NON-NLS-1$

       {
          private static final long serialVersionUID = 1L;
 
@@ -98,7 +98,7 @@ public class DeployModelDialog extends AbstractDialog implements ActionListener
             card.show(listPanel, OVERWRITE_CARD);
          }
       });
-      deployButton = new JRadioButton(new AbstractAction(Internal_ExportMessages.getString("LB_DeployVersion")) //$NON-NLS-1$
+      deployButton = new JRadioButton(new AbstractAction(Deploy_Messages.getString("LB_DeployVersion")) //$NON-NLS-1$

       {
          private static final long serialVersionUID = 1L;
 
@@ -114,7 +114,7 @@ public class DeployModelDialog extends AbstractDialog implements ActionListener
       JPanel mainPanel = new JPanel(new BorderLayout());
       Box options = new Box(BoxLayout.X_AXIS);
 
-      options.add(new JLabel(Internal_ExportMessages.getString("LB_Action"))); //$NON-NLS-1$
+      options.add(new JLabel(Deploy_Messages.getString("LB_Action"))); //$NON-NLS-1$

       options.add(deployButton);
       options.add(overwriteButton);
       mainPanel.add(options, BorderLayout.NORTH);
@@ -132,7 +132,7 @@ public class DeployModelDialog extends AbstractDialog implements ActionListener
    {
       if (overwriteButton.isSelected() && overwriteView.getSelectedModelOID() == -1)
       {
-         throw new ValidationException(Internal_ExportMessages.getString("MSG_NoModelToOverwrite"), false); //$NON-NLS-1$
+         throw new ValidationException(Deploy_Messages.getString("MSG_NoModelToOverwrite"), false); //$NON-NLS-1$

       }
    }
 
@@ -196,7 +196,7 @@ public class DeployModelDialog extends AbstractDialog implements ActionListener
    private boolean ignoreWarnings(List<Inconsistency> warnings)
    {
       boolean isDaemonRunning = false;
-      ValidationException e = new ValidationException(Internal_ExportMessages
+      ValidationException e = new ValidationException(Deploy_Messages

             .getString("MSG_ContinueDeploying"), warnings, true); //$NON-NLS-1$
       List<Daemon> daemons = sf.getAdministrationService().getAllDaemons(true);
       for (Daemon daemon : daemons)
@@ -205,8 +205,8 @@ public class DeployModelDialog extends AbstractDialog implements ActionListener
          {
             isDaemonRunning = true;
             JOptionPane.showMessageDialog(this,
-                        Internal_ExportMessages.getString("MSG_DeploymentNotPossible"), //$NON-NLS-1$
-                        Internal_ExportMessages.getString("TITLE_Warning"), //$NON-NLS-1$
+                        Deploy_Messages.getString("MSG_DeploymentNotPossible"), //$NON-NLS-1$

+                        Deploy_Messages.getString("TITLE_Warning"), //$NON-NLS-1$

                         JOptionPane.WARNING_MESSAGE);
          }
       }
@@ -217,7 +217,7 @@ public class DeployModelDialog extends AbstractDialog implements ActionListener
    private void showErrors(List<Inconsistency> errors)
    {
       ValidationException e = new ValidationException(
-            Internal_ExportMessages.getString("MSG_NoErrors"), errors, false); //$NON-NLS-1$
+            Deploy_Messages.getString("MSG_NoErrors"), errors, false); //$NON-NLS-1$

       ValidationExceptionDialog.showDialog(this, e);
    }
 
@@ -237,7 +237,7 @@ public class DeployModelDialog extends AbstractDialog implements ActionListener
    public static boolean showDialog(ServiceFactory service, List<String> modelFiles, List<IModel> models, JFrame parent)
    {
       DeployModelDialog instance = new DeployModelDialog(parent, service, modelFiles, models);
-      showDialog(Internal_ExportMessages.getString("DIALOG_Model"), instance, parent); //$NON-NLS-1$
+      showDialog(Deploy_Messages.getString("DIALOG_Model"), instance, parent); //$NON-NLS-1$

       return instance.wasDeployed;
    }
 }
\ No newline at end of file
diff --git a/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/DeployUtil.java b/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/DeployUtil.java
index a65e0b4..7437315 100644
--- a/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/DeployUtil.java
+++ b/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/DeployUtil.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.stardust.modeling.deploy;
 
+import java.text.MessageFormat;

 import java.util.List;
 
 import org.eclipse.core.resources.IProject;
@@ -61,7 +62,7 @@ public class DeployUtil
             // String debug =
             // " -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000";
             wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS,
-                  "-Xms50m -Xmx256m");
+                  "-Xms50m -Xmx256m"); //$NON-NLS-1$

             // "-Xms50m -Xmx256m" + debug);
                         
             boolean version = PlatformUI.getPreferenceStore().getBoolean(BpmProjectNature.PREFERENCE_DEPLOY_version);
@@ -76,7 +77,7 @@ public class DeployUtil
             boolean separator = false;
             for (IResource resource : resources)
             {
-               addArgument(programAttributes, "filename64", resource.getLocation().toOSString(), true, separator);            
+               addArgument(programAttributes, "filename64", resource.getLocation().toOSString(), true, separator);             //$NON-NLS-1$

                separator = true;
             }
             if (version)
@@ -153,8 +154,11 @@ public class DeployUtil
          IProject prj = resource.getProject();
          if (prj == null)
          {
-            throw new CoreException(new Status(IStatus.ERROR, DeployPlugin.PLUGIN_ID, DeployPlugin.INVALID_PROJECT_CODE,
-                  "Resource " + resource + " is not part of a project.", null));
+            throw new CoreException(new Status(IStatus.ERROR, DeployPlugin.PLUGIN_ID,

+                  DeployPlugin.INVALID_PROJECT_CODE, MessageFormat.format(

+                        Deploy_Messages

+                              .getString("MSG_RESOURCE_NOT_PART_OF_PROJECT"), resource), //$NON-NLS-1$

+                  null));

          }
          if (project == null)
          {
@@ -162,8 +166,10 @@ public class DeployUtil
          }
          else if (project != prj)
          {
-            throw new CoreException(new Status(IStatus.ERROR, DeployPlugin.PLUGIN_ID, DeployPlugin.INVALID_PROJECT_CODE,
-                  "Deployment of resources from different projects is not supported.", null));
+            throw new CoreException(new Status(IStatus.ERROR, DeployPlugin.PLUGIN_ID,

+                  DeployPlugin.INVALID_PROJECT_CODE,

+                  Deploy_Messages.getString("MSG_REOURCES_DIFFERENT_PROJECTS"), //$NON-NLS-1$

+                  null));

          }
       }
       return project;
diff --git a/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/Internal_ExportMessages.java b/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/Deploy_Messages.java
index 536bff0..3738856 100644
--- a/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/Internal_ExportMessages.java
+++ b/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/Deploy_Messages.java
@@ -1,38 +1,38 @@
-/*******************************************************************************
- * Copyright (c) 2011 SunGard CSA LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- *    SunGard CSA LLC - initial API and implementation and/or initial documentation
- *******************************************************************************/
-package org.eclipse.stardust.modeling.deploy;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Internal_ExportMessages
-{
-   private static final String BUNDLE_NAME = "org.eclipse.stardust.modeling.deploy.internal_export_messages"; //$NON-NLS-1$
-
-   private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
-         .getBundle(BUNDLE_NAME);
-
-   private Internal_ExportMessages()
-   {}
-
-   public static String getString(String key)
-   {
-      // TODO Auto-generated method stub
-      try
-      {
-         return RESOURCE_BUNDLE.getString(key);
-      }
-      catch (MissingResourceException e)
-      {
-         return '!' + key + '!';
-      }
-   }
-}
+/*******************************************************************************

+ * Copyright (c) 2011 SunGard CSA LLC and others.

+ * All rights reserved. This program and the accompanying materials

+ * are 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:

+ *    SunGard CSA LLC - initial API and implementation and/or initial documentation

+ *******************************************************************************/

+package org.eclipse.stardust.modeling.deploy;

+

+import java.util.MissingResourceException;

+import java.util.ResourceBundle;

+

+public class Deploy_Messages

+{

+   private static final String BUNDLE_NAME = "org.eclipse.stardust.modeling.deploy"; //$NON-NLS-1$

+

+   private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle

+         .getBundle(BUNDLE_NAME);

+

+   private Deploy_Messages()

+   {}

+

+   public static String getString(String key)

+   {

+      // TODO Auto-generated method stub

+      try

+      {

+         return RESOURCE_BUNDLE.getString(key);

+      }

+      catch (MissingResourceException e)

+      {

+         return '!' + key + '!';

+      }

+   }

+}

diff --git a/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/DeployedModelsView.java b/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/DeployedModelsView.java
index 2052b90..4955760 100644
--- a/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/DeployedModelsView.java
+++ b/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/DeployedModelsView.java
@@ -17,6 +17,7 @@ import java.awt.Dimension;
 import java.awt.Font;

 import java.awt.Graphics;

 import java.awt.event.ActionEvent;
+import java.text.MessageFormat;

 import java.util.ArrayList;

 import java.util.Calendar;

 import java.util.Collections;

@@ -79,7 +80,8 @@ public class DeployedModelsView extends JComponent
    private List<ModelTemplate> templates = Collections.emptyList();
    private Map<Segment, ModelTemplate> segments = CollectionUtils.newMap();
 
-   private Action oneYearAction = new AbstractAction("1 year")
+   private Action oneYearAction = new AbstractAction(

+         Deploy_Messages.getString("MSG_ONE_YEAR")) //$NON-NLS-1$

    {
       private static final long serialVersionUID = 1L;
 
@@ -90,7 +92,8 @@ public class DeployedModelsView extends JComponent
       }
    };
 
-   private Action twoYearsAction = new AbstractAction("2 years")
+   private Action twoYearsAction = new AbstractAction(

+         Deploy_Messages.getString("MSG_TWO_YEARS")) //$NON-NLS-1$

    {
       private static final long serialVersionUID = 1L;
 
@@ -108,7 +111,8 @@ public class DeployedModelsView extends JComponent
       }
    };
 
-   private Action fullScaleAction = new AbstractAction("all")
+   private Action fullScaleAction = new AbstractAction(

+         Deploy_Messages.getString("MSG_ALL")) //$NON-NLS-1$

    {
       private static final long serialVersionUID = 1L;
 
@@ -122,7 +126,7 @@ public class DeployedModelsView extends JComponent
          for (ModelTemplate template : templates)
          {
             Date d = template.validFrom;
-            if (d != null && s >= d.getTime() )
+            if (d != null && s >= d.getTime())

             {
                s = d.getTime();
                set = true;
@@ -206,7 +210,7 @@ public class DeployedModelsView extends JComponent
       group.add(fullScale);
       oneYear.setSelected(true);
 
-      buttons.add(new JLabel("Scale: "));
+      buttons.add(new JLabel(Deploy_Messages.getString("LB_SCALE"))); //$NON-NLS-1$

       buttons.add(oneYear);
       buttons.add(twoYears);
       buttons.add(fullScale);
@@ -239,12 +243,12 @@ public class DeployedModelsView extends JComponent
       commentEntry.setInputVerifier(detailsVerifier);
 
       CellConstraints cc = new CellConstraints();
-      FormLayout layout = new FormLayout("4dlu, default, 4dlu, default",
-            "default, 4dlu, default, 4dlu, default, 4dlu, default, default, default");
+      FormLayout layout = new FormLayout("4dlu, default, 4dlu, default", //$NON-NLS-1$

+            "default, 4dlu, default, 4dlu, default, 4dlu, default, default, default"); //$NON-NLS-1$

       JPanel panel = new JPanel(layout);
-      panel.add(new JLabel("Valid from:"), cc.xy(2, 1));
+      panel.add(new JLabel(Deploy_Messages.getString("LBL_VALID_FROM")), cc.xy(2, 1)); //$NON-NLS-1$

       panel.add(validFromEntry, cc.xy(4, 1));
-      panel.add(new JLabel("Deployment comment:"), cc.xy(2, 3));
+      panel.add(new JLabel(Deploy_Messages.getString("LBL_DEPLOYMENT_COMMENT")), cc.xy(2, 3)); //$NON-NLS-1$

       panel.add(new JScrollPane(commentEntry), cc.xywh(2, 5, 3, 1));
       add(panel, BorderLayout.EAST);
       list.addListSelectionListener(listener);
@@ -431,7 +435,7 @@ public class DeployedModelsView extends JComponent
          StringBuffer text = new StringBuffer();
          text.append(' ');
          text.append(current.name);
-         text.append(": ");
+         text.append(": "); //$NON-NLS-1$

          text.append(DateUtils.formatDate(current.validFrom));
          setText(text.toString());
          if (deployments.contains(current))
@@ -469,8 +473,9 @@ public class DeployedModelsView extends JComponent
       {
          modelOID = md.getModelOID();
          id = md.getId();
-         name = md.getName() + " (version: " + md.getVersion() +
-               ", OID: " + md.getModelOID() + ")";
+         name = MessageFormat.format(

+               Deploy_Messages.getString("LBL_NAME_VERSION_OID"), new Object[] { //$NON-NLS-1$

+                     md.getName(), md.getVersion(), modelOID});

          validFrom = md.getValidFrom();
          comment = md.getDeploymentComment();
       }
@@ -480,8 +485,20 @@ public class DeployedModelsView extends JComponent
          modelOID = md.getModelOID();
          id = md.getId();
          String version = (String) md.getAttribute(PredefinedConstants.VERSION_ATT);
-         name = md.getName() + " (version: " + version +
-               (modelOID == 0 ? "" : ", OID: " + modelOID) + ")";
+        

+         if (modelOID == 0)

+         {

+            name = MessageFormat.format(

+                  Deploy_Messages.getString("LBL_NAME_VERSION"), //$NON-NLS-1$

+                  new Object[] {md.getName(), version});

+         }

+         else

+         {

+            name = MessageFormat.format(

+                  Deploy_Messages.getString("LBL_NAME_VERSION_OID"), //$NON-NLS-1$

+                  new Object[] {md.getName(), version, modelOID});

+         }

+

          validFrom = (Date) md.getAttribute(PredefinedConstants.VALID_FROM_ATT);
          comment = (String) md.getAttribute(PredefinedConstants.DEPLOYMENT_COMMENT_ATT);
       }
diff --git a/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/LoginDialog.java b/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/LoginDialog.java
index dd74915..522e5e4 100644
--- a/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/LoginDialog.java
+++ b/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/LoginDialog.java
@@ -115,28 +115,28 @@ public class LoginDialog extends Dialog
          }
       };
 
-      idEntry = FormBuilder.createLabeledText(panel, "ID:");
+      idEntry = FormBuilder.createLabeledText(panel, Deploy_Messages.getString("LBL_ID")); //$NON-NLS-1$
       idEntry.getText().addKeyListener(listener);
       idEntry.getText().addModifyListener(modifyListener);
 
-      passwordField = FormBuilder.createLabeledText(panel, "Password:", true);
+      passwordField = FormBuilder.createLabeledText(panel, Deploy_Messages.getString("LBL_PASSWORD"), true); //$NON-NLS-1$
       passwordField.getText().addKeyListener(listener);
 
       if (Parameters.instance().getBoolean(SecurityProperties.PROMPT_FOR_PARTITION, false))
       {
-         partitionEntry = FormBuilder.createLabeledText(panel, "Partition:");
+         partitionEntry = FormBuilder.createLabeledText(panel, Deploy_Messages.getString("LBL_PARTITION")); //$NON-NLS-1$
          partitionEntry.getText().addKeyListener(listener);
       }
 
       if (Parameters.instance().getBoolean(SecurityProperties.PROMPT_FOR_DOMAIN, false))
       {
-         domainEntry = FormBuilder.createLabeledText(panel, "Domain:");
+         domainEntry = FormBuilder.createLabeledText(panel, Deploy_Messages.getString("LBL_DOMAIN")); //$NON-NLS-1$
          domainEntry.getText().addKeyListener(listener);
       }
 
       if (Parameters.instance().getBoolean(SecurityProperties.PROMPT_FOR_REALM, false))
       {
-         realmEntry = FormBuilder.createLabeledText(panel, "Realm:");
+         realmEntry = FormBuilder.createLabeledText(panel, Deploy_Messages.getString("LBL_REALM")); //$NON-NLS-1$
          realmEntry.getText().addKeyListener(listener);
       }
 
@@ -158,7 +158,7 @@ public class LoginDialog extends Dialog
    protected void configureShell(Shell shell)
    {
       super.configureShell(shell);
-      shell.setText("Login");
+      shell.setText(Deploy_Messages.getString("TITLE_LOGIN")); //$NON-NLS-1$
    }
 
    protected boolean checkCanClose()
@@ -203,13 +203,13 @@ public class LoginDialog extends Dialog
          if (StringUtils.isEmpty(entry.getText().getText()))
          {
             entry.getLabel().setValidationStatus(IQuickValidationStatus.ERRORS);
-            entry.getLabel().setToolTipText("Field must not be empty.");
+            entry.getLabel().setToolTipText(Deploy_Messages.getString("MSG_FIELD_NOT_EMPTY")); //$NON-NLS-1$
             result = false;
          }
          else
          {
             entry.getLabel().setValidationStatus(IQuickValidationStatus.OK);
-            entry.getLabel().setToolTipText("");
+            entry.getLabel().setToolTipText(""); //$NON-NLS-1$
             result = true;
          }
       }
diff --git a/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/ModelDeploymentTool.java b/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/ModelDeploymentTool.java
index f652529..6fb0adf 100644
--- a/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/ModelDeploymentTool.java
+++ b/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/ModelDeploymentTool.java
@@ -69,7 +69,7 @@ public class ModelDeploymentTool
          // ignore
       }
 
-      trace.info(Internal_ExportMessages.getString("MSG_Starting")); //$NON-NLS-1$
+      trace.info(Deploy_Messages.getString("MSG_Starting")); //$NON-NLS-1$

 
       List<String> modelFiles = CollectionUtils.newList();
 
@@ -110,8 +110,8 @@ public class ModelDeploymentTool
          }
       }
 
-      trace.info(Internal_ExportMessages.getString("MSG_DeployModel") + modelFiles); //$NON-NLS-1$
-
+      trace.info(Deploy_Messages.getString("MSG_DeployModel") + modelFiles); //$NON-NLS-1$

+      

       // Activate below section if debugging is needed.
       /*trace.info("Waiting 30 sek for the debugger to connect...");
       try
@@ -130,14 +130,14 @@ public class ModelDeploymentTool
       }
       else
       {
-         trace.error(Internal_ExportMessages.getString("MSG_NoModelSpecified")); //$NON-NLS-1$
+         trace.error(Deploy_Messages.getString("MSG_NoModelSpecified")); //$NON-NLS-1$

       }
    }
 
    public ModelDeploymentTool(List<String> modelFiles)
    {
          ProgressDialog progress = ProgressDialog.showDialog(null,
-               Internal_ExportMessages.getString("MSG_LoadingModel"), //$NON-NLS-1$
+               Deploy_Messages.getString("MSG_LoadingModel"), //$NON-NLS-1$

                ProgressDialog.ON_CANCEL_EXIT_WITH_MINUS_ONE);
 
       List<IModel> models = CollectionUtils.newList(modelFiles.size());
@@ -164,11 +164,11 @@ public class ModelDeploymentTool
 
       if (deployModel(modelFiles, models))
       {
-         JOptionPane.showMessageDialog(null, Internal_ExportMessages.getString("MSG_ModelDeployed")); //$NON-NLS-1$
+         JOptionPane.showMessageDialog(null, Deploy_Messages.getString("MSG_ModelDeployed")); //$NON-NLS-1$

       }
       else
       {
-         JOptionPane.showMessageDialog(null, Internal_ExportMessages.getString("MSG_ModelNotDeployed")); //$NON-NLS-1$
+         JOptionPane.showMessageDialog(null, Deploy_Messages.getString("MSG_ModelNotDeployed")); //$NON-NLS-1$

       }
 
       System.exit(0);
@@ -201,9 +201,9 @@ public class ModelDeploymentTool
             {
                int dialogResult = JOptionPane.showConfirmDialog(null,
                   /*Internal_ExportMessages.getString("MSG_InconsistentVersion")*/ //$NON-NLS-1$
-                     inconsistencies.get(0).getMessage() + " "
-                     + Internal_ExportMessages.getString("MSG_Continue"), //$NON-NLS-1$
-                  Internal_ExportMessages.getString("MSG_ModelVersionDeployment"), //$NON-NLS-1$
+                     inconsistencies.get(0).getMessage() + " " //$NON-NLS-1$

+                     + Deploy_Messages.getString("MSG_Continue"), //$NON-NLS-1$

+                  Deploy_Messages.getString("MSG_ModelVersionDeployment"), //$NON-NLS-1$

                   JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
                if (dialogResult != JOptionPane.OK_OPTION)
                {
@@ -256,7 +256,7 @@ public class ModelDeploymentTool
          {
             return deployed;
          }
-         JOptionPane.showMessageDialog(null, Internal_ExportMessages.getString("MSG_LoginFailed") //$NON-NLS-1$
+         JOptionPane.showMessageDialog(null, Deploy_Messages.getString("MSG_LoginFailed") //$NON-NLS-1$

                + e.getMessage());
       }
       catch (Exception x)
diff --git a/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/deploy-messages.properties b/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/deploy-messages.properties
new file mode 100644
index 0000000..ef00bb0
--- a/dev/null
+++ b/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/deploy-messages.properties
@@ -0,0 +1,35 @@
+MSG_LoadingModel=Loading model ...

+MSG_ModelDeployed=Model was deployed.

+MSG_ModelNotDeployed=Model was not deployed.

+MSG_LoginFailed=Login Failed: 

+LB_DeployVersion=Deploy version

+LB_Overwrite=Overwrite

+LB_Action=Action: 

+DIALOG_Model=Deploy Model

+MSG_DeploymentNotPossible=Deployment is not possible. Daemons are running.

+MSG_DeployModel=Deploying model from file 

+MSG_NoModelToOverwrite=No model to overwrite selected.

+MSG_NoModelSpecified=No model file was specified.

+MSG_ContinueDeploying=Warnings issued. Continue deploying ?

+MSG_NoErrors=There were errors during deployment.

+MSG_Starting=Starting ...

+MSG_Continue=Continue?

+MSG_ModelVersionDeployment=Model Version Deployment

+TITLE_Warning=Warning

+MSG_ONE_YEAR=1 year

+MSG_TWO_YEARS=2 years

+MSG_ALL=all

+LB_SCALE=Scale: 

+LBL_DEPLOYMENT_COMMENT=Deployment Comment:

+LBL_NAME_VERSION_OID={0} (version: {1}, OID: {2})

+LBL_NAME_VERSION={0} (version: {1})

+MSG_RESOURCE_NOT_PART_OF_PROJECT=Resource ''{0}'' is not part of a project.

+MSG_REOURCES_DIFFERENT_PROJECTS=Deployment of resources from different projects is not supported.

+LBL_ID=ID:

+LBL_PASSWORD=Password:

+LBL_PARTITION=Partition:

+LBL_DOMAIN=Domain:

+LBL_REALM=Realm:

+TITLE_LOGIN=Login

+MSG_FIELD_NOT_EMPTY=Field must not be empty.

+LBL_VALID_FROM=Valid from:

diff --git a/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/deploy-messages_en.properties b/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/deploy-messages_en.properties
new file mode 100644
index 0000000..f051f95
--- a/dev/null
+++ b/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/deploy-messages_en.properties
@@ -0,0 +1,70 @@
+MSG_LoadingModel=Loading model ...

+# MSG_LoadingModel_en=Loading model ...

+MSG_ModelDeployed=Model was deployed.

+# MSG_ModelDeployed_en=Model was deployed.

+MSG_ModelNotDeployed=Model was not deployed.

+# MSG_ModelNotDeployed_en=Model was not deployed.

+MSG_LoginFailed=Login Failed: 

+# MSG_LoginFailed_en=Login Failed: 

+LB_DeployVersion=Deploy version

+# LB_DeployVersion_en=Deploy version

+LB_Overwrite=Overwrite

+# LB_Overwrite_en=Overwrite

+LB_Action=Action: 

+# LB_Action_en=Action: 

+DIALOG_Model=Deploy Model

+# DIALOG_Model_en=Deploy Model

+MSG_DeploymentNotPossible=Deployment is not possible. Daemons are running.

+# MSG_DeploymentNotPossible_en=Deployment is not possible. Daemons are running.

+MSG_DeployModel=Deploying model from file 

+# MSG_DeployModel_en=Deploying model from file 

+MSG_NoModelToOverwrite=No model to overwrite selected.

+# MSG_NoModelToOverwrite_en=No model to overwrite selected.

+MSG_NoModelSpecified=No model file was specified.

+# MSG_NoModelSpecified_en=No model file was specified.

+MSG_ContinueDeploying=Warnings issued. Continue deploying ?

+# MSG_ContinueDeploying_en=Warnings issued. Continue deploying ?

+MSG_NoErrors=There were errors during deployment.

+# MSG_NoErrors_en=There were errors during deployment.

+MSG_Starting=Starting ...

+# MSG_Starting_en=Starting ...

+MSG_Continue=Continue?

+# MSG_Continue_en=Continue?

+MSG_ModelVersionDeployment=Model Version Deployment

+# MSG_ModelVersionDeployment_en=Model Version Deployment

+TITLE_Warning=Warning

+# TITLE_Warning_en=Warning

+MSG_ONE_YEAR=1 year

+# MSG_ONE_YEAR_en=1 year

+MSG_TWO_YEARS=2 years

+# MSG_TWO_YEARS_en=2 years

+MSG_ALL=all

+# MSG_ALL_en=all

+LB_SCALE=Scale: 

+# LB_SCALE_en=Scale: 

+LBL_DEPLOYMENT_COMMENT=Deployment Comment:

+# LBL_DEPLOYMENT_COMMENT_en=Deployment Comment:

+LBL_NAME_VERSION_OID={0} (version: {1}, OID: {2})

+# LBL_NAME_VERSION_OID_en={0} (version: {1}, OID: {2})

+LBL_NAME_VERSION={0} (version: {1})

+# LBL_NAME_VERSION_en={0} (version: {1})

+MSG_RESOURCE_NOT_PART_OF_PROJECT=Resource ''{0}'' is not part of a project.

+# MSG_RESOURCE_NOT_PART_OF_PROJECT_en=Resource ''{0}'' is not part of a project.

+MSG_REOURCES_DIFFERENT_PROJECTS=Deployment of resources from different projects is not supported.

+# MSG_REOURCES_DIFFERENT_PROJECTS_en=Deployment of resources from different projects is not supported.

+LBL_ID=ID:

+# LBL_ID_en=ID:

+LBL_PASSWORD=Password:

+# LBL_PASSWORD_en=Password:

+LBL_PARTITION=Partition:

+# LBL_PARTITION_en=Partition:

+LBL_DOMAIN=Domain:

+# LBL_DOMAIN_en=Domain:

+LBL_REALM=Realm:

+# LBL_REALM_en=Realm:

+TITLE_LOGIN=Login

+# TITLE_LOGIN_en=Login

+MSG_FIELD_NOT_EMPTY=Field must not be empty.

+# MSG_FIELD_NOT_EMPTY_en=Field must not be empty.

+LBL_VALID_FROM=Valid from:

+# LBL_VALID_FROM_en=Valid from:

diff --git a/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/deploy-messages_ja.properties b/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/deploy-messages_ja.properties
new file mode 100644
index 0000000..9e7f7cb
--- a/dev/null
+++ b/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/deploy-messages_ja.properties
@@ -0,0 +1,70 @@
+MSG_LoadingModel = \u30E2\u30C7\u30EB\u3092\u8AAD\u307F\u8FBC\u3093\u3067\u3044\u307E\u3059\u2026

+# MSG_LoadingModel_en=Loading model ...

+MSG_ModelDeployed = \u30E2\u30C7\u30EB\u304C\u30C7\u30D7\u30ED\u30A4\u3055\u308C\u307E\u3057\u305F\u3002

+# MSG_ModelDeployed_en=Model was deployed.

+MSG_ModelNotDeployed = \u30E2\u30C7\u30EB\u306F\u30C7\u30D7\u30ED\u30A4\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002

+# MSG_ModelNotDeployed_en=Model was not deployed.

+MSG_LoginFailed = \u30ED\u30B0\u30A4\u30F3\u306B\u5931\u6557\u3057\u307E\u3057\u305F\uFF1A

+# MSG_LoginFailed_en=Login Failed: 

+LB_DeployVersion = \u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u30C7\u30D7\u30ED\u30A4

+# LB_DeployVersion_en=Deploy version

+LB_Overwrite = \u4E0A\u66F8\u304D

+# LB_Overwrite_en=Overwrite

+LB_Action = \u30A2\u30AF\u30B7\u30E7\u30F3\uFF1A

+# LB_Action_en=Action: 

+DIALOG_Model = \u30E2\u30C7\u30EB\u3092\u30C7\u30D7\u30ED\u30A4

+# DIALOG_Model_en=Deploy Model

+MSG_DeploymentNotPossible = \u30C7\u30D7\u30ED\u30A4\u306F\u4E0D\u53EF\u80FD\u3067\u3059\u3002\u30C7\u30FC\u30E2\u30F3\u304C\u5B9F\u884C\u3055\u308C\u3066\u3044\u307E\u3059\u3002

+# MSG_DeploymentNotPossible_en=Deployment is not possible. Daemons are running.

+MSG_DeployModel = \u30D5\u30A1\u30A4\u30EB\u304B\u3089\u30E2\u30C7\u30EB\u3092\u30C7\u30D7\u30ED\u30A4\u4E2D

+# MSG_DeployModel_en=Deploying model from file 

+MSG_NoModelToOverwrite = \u4E0A\u66F8\u304D\u3067\u9078\u629E\u3055\u308C\u305F\u30E2\u30C7\u30EB\u304C\u3042\u308A\u307E\u305B\u3093\u3002

+# MSG_NoModelToOverwrite_en=No model to overwrite selected.

+MSG_NoModelSpecified = \u30E2\u30C7\u30EB\u30D5\u30A1\u30A4\u30EB\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002

+# MSG_NoModelSpecified_en=No model file was specified.

+MSG_ContinueDeploying = \u8B66\u544A\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u30C7\u30D7\u30ED\u30A4\u3092\u7D9A\u3051\u307E\u3059\u304B\uFF1F

+# MSG_ContinueDeploying_en=Warnings issued. Continue deploying ?

+MSG_NoErrors = \u30C7\u30D7\u30ED\u30A4\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u3042\u308A\u307E\u3057\u305F\u3002

+# MSG_NoErrors_en=There were errors during deployment.

+MSG_Starting = \u958B\u59CB\u2026

+# MSG_Starting_en=Starting ...

+MSG_Continue = \u7D9A\u884C\u3057\u307E\u3059\u304B\uFF1F

+# MSG_Continue_en=Continue?

+MSG_ModelVersionDeployment = \u65B0\u3057\u3044\u30D0\u30FC\u30B8\u30E7\u30F3\u3068\u3057\u3066\u30E2\u30C7\u30EB\u3092\u30C7\u30D7\u30ED\u30A4

+# MSG_ModelVersionDeployment_en=Model Version Deployment

+TITLE_Warning = \u8B66\u544A

+# TITLE_Warning_en=Warning

+MSG_ONE_YEAR = 1\u5E74

+# MSG_ONE_YEAR_en=1 year

+MSG_TWO_YEARS = 2\u5E74

+# MSG_TWO_YEARS_en=2 years

+MSG_ALL = \u5168\u3066

+# MSG_ALL_en=all

+LB_SCALE = \u898F\u6A21\uFF1A

+# LB_SCALE_en=Scale: 

+LBL_DEPLOYMENT_COMMENT = \u30C7\u30D7\u30ED\u30A4\u6642\u306E\u30B3\u30E1\u30F3\u30C8\uFF1A

+# LBL_DEPLOYMENT_COMMENT_en=Deployment Comment:

+LBL_NAME_VERSION_OID = {0}\uFF08\u30D0\u30FC\u30B8\u30E7\u30F3\uFF1A{1}\u3001OID\uFF1A{2}\uFF09

+# LBL_NAME_VERSION_OID_en={0} (version: {1}, OID: {2})

+LBL_NAME_VERSION = {0}\uFF08\u30D0\u30FC\u30B8\u30E7\u30F3\uFF1A{1}\uFF09

+# LBL_NAME_VERSION_en={0} (version: {1})

+MSG_RESOURCE_NOT_PART_OF_PROJECT = \u30EA\u30BD\u30FC\u30B9'' {0} ''\u306F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u4E00\u90E8\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002

+# MSG_RESOURCE_NOT_PART_OF_PROJECT_en=Resource ''{0}'' is not part of a project.

+MSG_REOURCES_DIFFERENT_PROJECTS = \u5225\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u304B\u3089\u306E\u30EA\u30BD\u30FC\u30B9\u306E\u30C7\u30D7\u30ED\u30A4\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002

+# MSG_REOURCES_DIFFERENT_PROJECTS_en=Deployment of resources from different projects is not supported.

+LBL_ID = ID\uFF1A

+# LBL_ID_en=ID:

+LBL_PASSWORD = \u30D1\u30B9\u30EF\u30FC\u30C9\uFF1A

+# LBL_PASSWORD_en=Password:

+LBL_PARTITION = \u30D1\u30FC\u30C6\u30A3\u30B7\u30E7\u30F3\uFF1A

+# LBL_PARTITION_en=Partition:

+LBL_DOMAIN = \u30C9\u30E1\u30A4\u30F3\uFF1A

+# LBL_DOMAIN_en=Domain:

+LBL_REALM = \u30EC\u30EB\u30E0\uFF1A

+# LBL_REALM_en=Realm:

+TITLE_LOGIN = \u30ED\u30B0\u30A4\u30F3

+# TITLE_LOGIN_en=Login

+MSG_FIELD_NOT_EMPTY = \u30D5\u30A3\u30FC\u30EB\u30C9\u306F\u7A7A\u306B\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002

+# MSG_FIELD_NOT_EMPTY_en=Field must not be empty.

+LBL_VALID_FROM = \u6709\u52B9\u671F\u9650\uFF08From\uFF09\uFF1A

+# LBL_VALID_FROM_en=Valid from:

diff --git a/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/internal_export_messages.properties b/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/internal_export_messages.properties
deleted file mode 100644
index 52cf469..0000000
--- a/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/internal_export_messages.properties
+++ b/dev/null
@@ -1,33 +0,0 @@
-###############################################################################
-# Copyright (c) 2011 SunGard CSA LLC and others.
-# All rights reserved. This program and the accompanying materials
-# are 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:
-#    SunGard CSA LLC - initial API and implementation and/or initial documentation
-###############################################################################
-MSG_FileNotFound=File not found: '
-MSG_LoadingModel=Loading model ...
-MSG_ModelDeployed=Model was deployed.
-MSG_ModelNotDeployed=Model was not deployed.
-MSG_LoginFailed=Login Failed: 
-LB_DeployVersion=Deploy version
-LB_Overwrite=Overwrite
-LB_Action=Action: 
-DIALOG_Model=Deploy Model
-MSG_DeploymentErrors=There were errors during deployment.
-MSG_DeploymentNotPossible=Deployment is not possible. Daemons are running.
-MSG_DeployModel=Deploying model from file 
-MSG_NoModelToOverwrite=No model to overwrite selected.
-MSG_NoModelSpecified=No model file was specified.
-MSG_InconsistentVersion=You are going to deploy an inconsistent model version\nto a production environment.\n\n
-MSG_ContinueDeploying=Warnings issued. Continue deploying ?
-MSG_NoErrors=There were errors during deployment.
-MSG_NotImpl=Not implemented.
-MSG_Starting=Starting ...
-MSG_Continue=Continue?
-ERR_FileNotFound=File not found: '
-MSG_ModelVersionDeployment=Model Version Deployment
-TITLE_Warning=Warning