Jira-ID: CRNT-22383

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.model.xpdl) git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ide@53309 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
author: Rainer Pielmann 2012-02-01 09:24:21 (EST)
committer: Stephan Born 2012-04-24 04:30:13 (EDT)
commit: 452f9b356756dc5f75f282818151ca71b08fdeab (patch) (side-by-side diff)
tree: 28dd9dff12d12e7b6e5c89a4ae70951aa6e94ae1
parent: 5e240e5f27c6f56192410e40bdad4051d19236e3 (diff)
download: org.eclipse.stardust.ide-452f9b356756dc5f75f282818151ca71b08fdeab.zip
org.eclipse.stardust.ide-452f9b356756dc5f75f282818151ca71b08fdeab.tar.gz
org.eclipse.stardust.ide-452f9b356756dc5f75f282818151ca71b08fdeab.tar.bz2
171 files changed, 1142 insertions, 1176 deletions
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/ActivityImplementationType.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/ActivityImplementationType.java
index bc92e64..18f5faf 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/ActivityImplementationType.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/ActivityImplementationType.java
@@ -35,7 +35,7 @@ public enum ActivityImplementationType implements Enumerator
     * @generated
     * @ordered
     */
-   ROUTE_LITERAL(0, "Route", "Route"),
+   ROUTE_LITERAL(0, "Route", "Route"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>Manual</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -44,7 +44,7 @@ public enum ActivityImplementationType implements Enumerator
     * @generated
     * @ordered
     */
-   MANUAL_LITERAL(1, "Manual", "Manual"),
+   MANUAL_LITERAL(1, "Manual", "Manual"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>Application</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -53,7 +53,7 @@ public enum ActivityImplementationType implements Enumerator
     * @generated
     * @ordered
     */
-   APPLICATION_LITERAL(2, "Application", "Application"),
+   APPLICATION_LITERAL(2, "Application", "Application"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>Subprocess</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -62,7 +62,7 @@ public enum ActivityImplementationType implements Enumerator
     * @generated
     * @ordered
     */
-   SUBPROCESS_LITERAL(3, "Subprocess", "Subprocess");
+   SUBPROCESS_LITERAL(3, "Subprocess", "Subprocess"); //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/Code.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/Code.java
index 24ba8b1..1f727af 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/Code.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/Code.java
@@ -36,7 +36,7 @@ public interface Code extends EObject
     * <!-- end-user-doc -->
     * @generated
     */
-   String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
 
    /**
     * Returns the value of the '<em><b>Code</b></em>' attribute.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/CwmPlugin.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/CwmPlugin.java
index c0206a1..16e3230 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/CwmPlugin.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/CwmPlugin.java
@@ -15,9 +15,9 @@ import org.osgi.framework.BundleContext;
 
 public class CwmPlugin extends Plugin
 {
-   public static final String PLUGIN_ID = "org.eclipse.stardust.model.xpdl";
+   public static final String PLUGIN_ID = "org.eclipse.stardust.model.xpdl"; //$NON-NLS-1$
 
-   public static final String EXTENSION_POINT_MODEL_ADAPTER_FACTORY = "modelAdapterFactory";
+   public static final String EXTENSION_POINT_MODEL_ADAPTER_FACTORY = "modelAdapterFactory"; //$NON-NLS-1$
 
    private static CwmPlugin instance;
 
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/DiagramModeType.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/DiagramModeType.java
index a398bb8..a92c474 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/DiagramModeType.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/DiagramModeType.java
@@ -35,7 +35,7 @@ public enum DiagramModeType implements Enumerator
     * @generated
     * @ordered
     */
-   MODE_400_LITERAL(0, "MODE_4_0_0", "MODE_4_0_0"),
+   MODE_400_LITERAL(0, "MODE_4_0_0", "MODE_4_0_0"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>MODE 450</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -44,13 +44,13 @@ public enum DiagramModeType implements Enumerator
     * @generated
     * @ordered
     */
-   MODE_450_LITERAL(1, "MODE_4_5_0", "MODE_4_5_0");
+   MODE_450_LITERAL(1, "MODE_4_5_0", "MODE_4_5_0"); //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
     * @generated
     */
-   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
 
    /**
     * The '<em><b>MODE 400</b></em>' literal value.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/DirectionType.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/DirectionType.java
index c1da61d..7babded 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/DirectionType.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/DirectionType.java
@@ -35,7 +35,7 @@ public enum DirectionType implements Enumerator
     * @generated
     * @ordered
     */
-   IN_LITERAL(1, "IN", "IN"),
+   IN_LITERAL(1, "IN", "IN"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>OUT</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -44,7 +44,7 @@ public enum DirectionType implements Enumerator
     * @generated
     * @ordered
     */
-   OUT_LITERAL(2, "OUT", "OUT"),
+   OUT_LITERAL(2, "OUT", "OUT"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>INOUT</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -53,7 +53,7 @@ public enum DirectionType implements Enumerator
     * @generated
     * @ordered
     */
-   INOUT_LITERAL(3, "INOUT", "INOUT");
+   INOUT_LITERAL(3, "INOUT", "INOUT"); //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/FlowControlType.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/FlowControlType.java
index c39d3ac..73f8796 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/FlowControlType.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/FlowControlType.java
@@ -35,7 +35,7 @@ public enum FlowControlType implements Enumerator
     * @generated
     * @ordered
     */
-   NONE_LITERAL(0, "none", "none"),
+   NONE_LITERAL(0, "none", "none"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>Join</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -44,7 +44,7 @@ public enum FlowControlType implements Enumerator
     * @generated
     * @ordered
     */
-   JOIN_LITERAL(1, "join", "join"),
+   JOIN_LITERAL(1, "join", "join"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>Split</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -53,7 +53,7 @@ public enum FlowControlType implements Enumerator
     * @generated
     * @ordered
     */
-   SPLIT_LITERAL(2, "split", "split");
+   SPLIT_LITERAL(2, "split", "split"); //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/GenericLinkConnectionType.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/GenericLinkConnectionType.java
index c1db97f..c80484a 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/GenericLinkConnectionType.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/GenericLinkConnectionType.java
@@ -36,7 +36,7 @@ public interface GenericLinkConnectionType extends IConnectionSymbol, ITypedElem
     * <!-- end-user-doc -->
     * @generated
     */
-   String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
 
    /**
     * Returns the value of the '<em><b>Link Type</b></em>' reference.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/IdRef.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/IdRef.java
index be69a9a..31bec7f 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/IdRef.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/IdRef.java
@@ -38,7 +38,7 @@ public interface IdRef extends EObject
     * <!-- end-user-doc -->
     * @generated
     */
-   String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
 
    /**
     * Returns the value of the '<em><b>Package Ref</b></em>' reference.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/IdentifiableReference.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/IdentifiableReference.java
index b10e22f..123ed81 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/IdentifiableReference.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/IdentifiableReference.java
@@ -35,7 +35,7 @@ public interface IdentifiableReference extends EObject {
 	 * <!-- end-user-doc -->
     * @generated
     */
-	String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+	String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
 
 	/**
     * Returns the value of the '<em><b>Attribute</b></em>' reference.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/ImplementationType.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/ImplementationType.java
index 3319da9..ff0e41e 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/ImplementationType.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/ImplementationType.java
@@ -35,7 +35,7 @@ public enum ImplementationType implements Enumerator
     * @generated
     * @ordered
     */
-   ENGINE_LITERAL(0, "engine", "engine"),
+   ENGINE_LITERAL(0, "engine", "engine"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>Pull</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -44,7 +44,7 @@ public enum ImplementationType implements Enumerator
     * @generated
     * @ordered
     */
-   PULL_LITERAL(1, "pull", "pull"),
+   PULL_LITERAL(1, "pull", "pull"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>Push</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -53,7 +53,7 @@ public enum ImplementationType implements Enumerator
     * @generated
     * @ordered
     */
-   PUSH_LITERAL(2, "push", "push");
+   PUSH_LITERAL(2, "push", "push"); //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/JoinSplitType.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/JoinSplitType.java
index 3000569..de71fff 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/JoinSplitType.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/JoinSplitType.java
@@ -35,7 +35,7 @@ public enum JoinSplitType implements Enumerator
     * @generated
     * @ordered
     */
-   NONE_LITERAL(0, "None", "None"),
+   NONE_LITERAL(0, "None", "None"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>XOR</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -44,7 +44,7 @@ public enum JoinSplitType implements Enumerator
     * @generated
     * @ordered
     */
-   XOR_LITERAL(1, "XOR", "XOR"),
+   XOR_LITERAL(1, "XOR", "XOR"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>AND</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -53,7 +53,7 @@ public enum JoinSplitType implements Enumerator
     * @generated
     * @ordered
     */
-   AND_LITERAL(2, "AND", "AND");
+   AND_LITERAL(2, "AND", "AND"); //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/LinkCardinality.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/LinkCardinality.java
index 652773f..e73ca86 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/LinkCardinality.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/LinkCardinality.java
@@ -35,7 +35,7 @@ public enum LinkCardinality implements Enumerator
     * @generated NOT
     * @ordered
     */
-   UNKNOWN_LITERAL(-1, "", ""),
+   UNKNOWN_LITERAL(-1, "", ""), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>One</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -44,7 +44,7 @@ public enum LinkCardinality implements Enumerator
     * @generated NOT
     * @ordered
     */
-   ONE_LITERAL(0, "*:1", "*:1"),
+   ONE_LITERAL(0, "*:1", "*:1"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>Many</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -53,13 +53,13 @@ public enum LinkCardinality implements Enumerator
     * @generated NOT
     * @ordered
     */
-   MANY_LITERAL(1, "*:N", "*:N");
+   MANY_LITERAL(1, "*:N", "*:N"); //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
     * @generated
     */
-   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
 
    /**
     * The '<em><b>Unknown</b></em>' literal value.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/LinkColor.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/LinkColor.java
index c23f6b9..e31a2f0 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/LinkColor.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/LinkColor.java
@@ -35,7 +35,7 @@ public enum LinkColor implements Enumerator
     * @generated NOT
     * @ordered
     */
-   UNKNOWN_LITERAL(-1, "", ""),
+   UNKNOWN_LITERAL(-1, "", ""), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>Black</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -44,7 +44,7 @@ public enum LinkColor implements Enumerator
     * @generated NOT
     * @ordered
     */
-   BLACK_LITERAL(0, "black", "black"),
+   BLACK_LITERAL(0, "black", "black"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>Dark Blue</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -53,7 +53,7 @@ public enum LinkColor implements Enumerator
     * @generated NOT
     * @ordered
     */
-   DARK_BLUE_LITERAL(1, "dark blue", "dark blue"),
+   DARK_BLUE_LITERAL(1, "dark blue", "dark blue"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>Dark Gray</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -62,7 +62,7 @@ public enum LinkColor implements Enumerator
     * @generated NOT
     * @ordered
     */
-   DARK_GRAY_LITERAL(2, "dark gray", "dark gray"),
+   DARK_GRAY_LITERAL(2, "dark gray", "dark gray"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>Blue</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -71,7 +71,7 @@ public enum LinkColor implements Enumerator
     * @generated NOT
     * @ordered
     */
-   BLUE_LITERAL(3, "blue", "blue"),
+   BLUE_LITERAL(3, "blue", "blue"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>Light Gray</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -80,7 +80,7 @@ public enum LinkColor implements Enumerator
     * @generated NOT
     * @ordered
     */
-   LIGHT_GRAY_LITERAL(4, "light gray", "light gray"),
+   LIGHT_GRAY_LITERAL(4, "light gray", "light gray"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>Red</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -89,7 +89,7 @@ public enum LinkColor implements Enumerator
     * @generated NOT
     * @ordered
     */
-   RED_LITERAL(5, "red", "red"),
+   RED_LITERAL(5, "red", "red"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>Yellow</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -98,13 +98,13 @@ public enum LinkColor implements Enumerator
     * @generated NOT
     * @ordered
     */
-   YELLOW_LITERAL(6, "yellow", "yellow");
+   YELLOW_LITERAL(6, "yellow", "yellow"); //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
     * @generated
     */
-   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
 
    /**
     * The '<em><b>Unknown</b></em>' literal value.
@@ -261,7 +261,7 @@ public enum LinkColor implements Enumerator
     */
    public static LinkColor get(String literal)
    {
-      if ("ligth gray".equals(literal))
+      if ("ligth gray".equals(literal)) //$NON-NLS-1$
       {
          return LIGHT_GRAY_LITERAL;
       }
@@ -284,7 +284,7 @@ public enum LinkColor implements Enumerator
     */
    public static LinkColor getByName(String name)
    {
-      if ("ligth gray".equals(name))
+      if ("ligth gray".equals(name)) //$NON-NLS-1$
       {
          return LIGHT_GRAY_LITERAL;
       }
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/LinkEndStyle.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/LinkEndStyle.java
index 835ab8d..1976cbe 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/LinkEndStyle.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/LinkEndStyle.java
@@ -35,7 +35,7 @@ public enum LinkEndStyle implements Enumerator
     * @generated NOT
     * @ordered
     */
-   UNKNOWN_LITERAL(-1, "", ""),
+   UNKNOWN_LITERAL(-1, "", ""), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>No Arrow</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -44,7 +44,7 @@ public enum LinkEndStyle implements Enumerator
     * @generated NOT
     * @ordered
     */
-   NO_ARROW_LITERAL(0, "without Symbol", "without Symbol"),
+   NO_ARROW_LITERAL(0, "without Symbol", "without Symbol"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>Open Triangle</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -53,7 +53,7 @@ public enum LinkEndStyle implements Enumerator
     * @generated NOT
     * @ordered
     */
-   OPEN_TRIANGLE_LITERAL(1, "open Triangle", "open Triangle"),
+   OPEN_TRIANGLE_LITERAL(1, "open Triangle", "open Triangle"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>Empty Triangle</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -62,7 +62,7 @@ public enum LinkEndStyle implements Enumerator
     * @generated NOT
     * @ordered
     */
-   EMPTY_TRIANGLE_LITERAL(2, "empty Triangle", "empty Triangle"),
+   EMPTY_TRIANGLE_LITERAL(2, "empty Triangle", "empty Triangle"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>Filled Triangle</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -71,7 +71,7 @@ public enum LinkEndStyle implements Enumerator
     * @generated NOT
     * @ordered
     */
-   FILLED_TRIANGLE_LITERAL(3, "filled Triangle", "filled Triangle"),
+   FILLED_TRIANGLE_LITERAL(3, "filled Triangle", "filled Triangle"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>Empty Rhombus</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -80,7 +80,7 @@ public enum LinkEndStyle implements Enumerator
     * @generated NOT
     * @ordered
     */
-   EMPTY_RHOMBUS_LITERAL(4, "empty Rhombus", "empty Rhombus"),
+   EMPTY_RHOMBUS_LITERAL(4, "empty Rhombus", "empty Rhombus"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>Filled Rhombus</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -89,13 +89,13 @@ public enum LinkEndStyle implements Enumerator
     * @generated NOT
     * @ordered
     */
-   FILLED_RHOMBUS_LITERAL(5, "filled Rhombus", "filled Rhombus");
+   FILLED_RHOMBUS_LITERAL(5, "filled Rhombus", "filled Rhombus"); //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
     * @generated
     */
-   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
 
    /**
     * The '<em><b>Unknown</b></em>' literal value.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/LinkLineStyle.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/LinkLineStyle.java
index 494a188..995674c 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/LinkLineStyle.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/LinkLineStyle.java
@@ -35,7 +35,7 @@ public enum LinkLineStyle implements Enumerator
     * @generated NOT
     * @ordered
     */
-   UNKNOWN_LITERAL(-1, "", ""),
+   UNKNOWN_LITERAL(-1, "", ""), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>Normal</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -44,7 +44,7 @@ public enum LinkLineStyle implements Enumerator
     * @generated NOT
     * @ordered
     */
-   NORMAL_LITERAL(0, "normal line", "normal line"),
+   NORMAL_LITERAL(0, "normal line", "normal line"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>Short Strokes</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -53,7 +53,7 @@ public enum LinkLineStyle implements Enumerator
     * @generated NOT
     * @ordered
     */
-   SHORT_STROKES_LITERAL(1, "short strokes", "short strokes"),
+   SHORT_STROKES_LITERAL(1, "short strokes", "short strokes"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>Long Strokes</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -62,13 +62,13 @@ public enum LinkLineStyle implements Enumerator
     * @generated NOT
     * @ordered
     */
-   LONG_STROKES_LITERAL(2, "long strokes", "long strokes");
+   LONG_STROKES_LITERAL(2, "long strokes", "long strokes"); //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
     * @generated
     */
-   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
 
    /**
     * The '<em><b>Unknown</b></em>' literal value.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/LinkTypeType.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/LinkTypeType.java
index 61da535..42d5426 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/LinkTypeType.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/LinkTypeType.java
@@ -47,7 +47,7 @@ public interface LinkTypeType extends IMetaType, IExtensibleElement
     * <!-- end-user-doc -->
     * @generated
     */
-   String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
 
    /**
     * Returns the value of the '<em><b>Source Role</b></em>' attribute.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/LoopType.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/LoopType.java
index bc24c05..5c055a5 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/LoopType.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/LoopType.java
@@ -35,7 +35,7 @@ public enum LoopType implements Enumerator
     * @generated
     * @ordered
     */
-   UNKNOWN_LITERAL(0, "Unknown", "Unknown"),
+   UNKNOWN_LITERAL(0, "Unknown", "Unknown"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>None</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -44,7 +44,7 @@ public enum LoopType implements Enumerator
     * @generated NOT
     * @ordered
     */
-   NONE_LITERAL(1, "No Loop", "No Loop"),
+   NONE_LITERAL(1, "No Loop", "No Loop"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>While</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -53,7 +53,7 @@ public enum LoopType implements Enumerator
     * @generated
     * @ordered
     */
-   WHILE_LITERAL(2, "While", "While"),
+   WHILE_LITERAL(2, "While", "While"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>Repeat</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -62,13 +62,13 @@ public enum LoopType implements Enumerator
     * @generated
     * @ordered
     */
-   REPEAT_LITERAL(3, "Repeat", "Repeat");
+   REPEAT_LITERAL(3, "Repeat", "Repeat"); //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
     * @generated
     */
-   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
 
    /**
     * The '<em><b>Unknown</b></em>' literal value.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/ModelMessages.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/ModelMessages.java
deleted file mode 100644
index 9557f80..0000000
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/ModelMessages.java
+++ b/dev/null
@@ -1,40 +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
- *******************************************************************************/
-package org.eclipse.stardust.model.xpdl.carnot;
-
-import org.eclipse.osgi.util.NLS;
-
-public class ModelMessages extends NLS
-{
-   private static final String BUNDLE_NAME = "org.eclipse.stardust.model.xpdl.carnot.model_messages"; //$NON-NLS-1$
-
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, ModelMessages.class);
-	}
-
-	public static String MSG_ATTRIBUTE_CATEGORY_EXISTS = "MSG_AttributeCategoryExists";
-	public static String MSG_ATTRIBUTE_EXISTS = "MSG_AttributeExists";
-	public static String MSG_NO_VALID_ENUMERATION = "MSG_NoValidEnum";
-	public static String MSG_CLASS_NOT_VALID = "MSG_ClassNotValid";
-	public static String MSG_DATATYPE_NOT_VALID = "MSG_DatatypeNotValid";
-	public static String MSG_FAILED_LOADING_MODEL = "MSG_FailedLoadingModel";
-	public static String MSG_INVALID_JAXP_SETUP = "MSG_InvalidJaxpSetup";
-	public static String MSG_UNABLE_TO_LOAD_XPDL_IMPORT = "MSG_UnableToLoadXpdlImport";
-	public static String MSG_UNABLE_TO_FIND_XPDL_IMPORT = "MSG_UnableToFindXpdlImport";
-	public static String MSG_FATAL_ERR = "MSG_FatalErr";
-	public static String MSG_ERR = "MSG_Err";
-	public static String MSG_WARN = "MSG_Warn";
-
-   private ModelMessages()
-   {}
-
-}
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/Model_Messages.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/Model_Messages.java
index 30d96a7..011a271 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/Model_Messages.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/Model_Messages.java
@@ -105,6 +105,8 @@ public class Model_Messages extends NLS
    public static String ASYNC_SEPARATE;
    
    public static String NEW_ENTRY;
+   
+   public static String EXC_FAILED_INSTANTIATING_EXTENSION;
 
 
 }
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/OrientationType.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/OrientationType.java
index f0cc7b2..5fcd274 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/OrientationType.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/OrientationType.java
@@ -35,7 +35,7 @@ public enum OrientationType implements Enumerator
     * @generated
     * @ordered
     */
-   VERTICAL_LITERAL(0, "Vertical", "Vertical"),
+   VERTICAL_LITERAL(0, "Vertical", "Vertical"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>Horizontal</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -44,7 +44,7 @@ public enum OrientationType implements Enumerator
     * @generated
     * @ordered
     */
-   HORIZONTAL_LITERAL(1, "Horizontal", "Horizontal");
+   HORIZONTAL_LITERAL(1, "Horizontal", "Horizontal"); //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/PublicInterfaceSymbol.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/PublicInterfaceSymbol.java
index 1b658be..0573314 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/PublicInterfaceSymbol.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/PublicInterfaceSymbol.java
@@ -28,6 +28,6 @@ public interface PublicInterfaceSymbol extends AbstractEventSymbol
     * <!-- end-user-doc -->
     * @generated
     */
-   String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
 
 } // PublicInterfaceSymbol
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/QualityControlType.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/QualityControlType.java
index bfc3b26..2584086 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/QualityControlType.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/QualityControlType.java
@@ -36,7 +36,7 @@ public interface QualityControlType extends EObject
     * <!-- end-user-doc -->
     * @generated
     */
-   String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
 
    /**
     * Returns the value of the '<em><b>Code</b></em>' containment reference list.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/RoutingType.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/RoutingType.java
index 72fc107..8c2f31b 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/RoutingType.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/RoutingType.java
@@ -35,7 +35,7 @@ public enum RoutingType implements Enumerator
     * @generated
     * @ordered
     */
-   DEFAULT_LITERAL(0, "Default", "Default"),
+   DEFAULT_LITERAL(0, "Default", "Default"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>Shortest Path</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -44,7 +44,7 @@ public enum RoutingType implements Enumerator
     * @generated
     * @ordered
     */
-   SHORTEST_PATH_LITERAL(1, "ShortestPath", "ShortestPath"),
+   SHORTEST_PATH_LITERAL(1, "ShortestPath", "ShortestPath"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>Manhattan</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -53,7 +53,7 @@ public enum RoutingType implements Enumerator
     * @generated
     * @ordered
     */
-   MANHATTAN_LITERAL(2, "Manhattan", "Manhattan"),
+   MANHATTAN_LITERAL(2, "Manhattan", "Manhattan"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>Explicit</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -62,7 +62,7 @@ public enum RoutingType implements Enumerator
     * @generated
     * @ordered
     */
-   EXPLICIT_LITERAL(3, "Explicit", "Explicit");
+   EXPLICIT_LITERAL(3, "Explicit", "Explicit"); //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/SubProcessModeType.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/SubProcessModeType.java
index 6e33ce8..8f2165d 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/SubProcessModeType.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/SubProcessModeType.java
@@ -35,7 +35,7 @@ public enum SubProcessModeType implements Enumerator
     * @generated
     * @ordered
     */
-   SYNC_SHARED_LITERAL(0, "sync_shared", "Synchronous / Shared Data"),
+   SYNC_SHARED_LITERAL(0, "sync_shared", "Synchronous / Shared Data"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>Sync separate</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -44,7 +44,7 @@ public enum SubProcessModeType implements Enumerator
     * @generated
     * @ordered
     */
-   SYNC_SEPARATE_LITERAL(1, "sync_separate", "Synchronous / Separate Data"),
+   SYNC_SEPARATE_LITERAL(1, "sync_separate", "Synchronous / Separate Data"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>Async separate</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -53,13 +53,13 @@ public enum SubProcessModeType implements Enumerator
     * @generated
     * @ordered
     */
-   ASYNC_SEPARATE_LITERAL(2, "async_separate", "Asynchronous / Separate Data");
+   ASYNC_SEPARATE_LITERAL(2, "async_separate", "Asynchronous / Separate Data"); //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
     * @generated
     */
-   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
 
    /**
     * The '<em><b>Sync shared</b></em>' literal value.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/TeamLeadConnectionType.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/TeamLeadConnectionType.java
index 96a9899..aac3cb6 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/TeamLeadConnectionType.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/TeamLeadConnectionType.java
@@ -35,7 +35,7 @@ public interface TeamLeadConnectionType extends IConnectionSymbol
     * <!-- end-user-doc -->
     * @generated
     */
-   String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
 
    /**
     * Returns the value of the '<em><b>Team Symbol</b></em>' reference.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/TriggersConnectionType.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/TriggersConnectionType.java
index 49bc3c8..385ce36 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/TriggersConnectionType.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/TriggersConnectionType.java
@@ -35,7 +35,7 @@ public interface TriggersConnectionType extends IConnectionSymbol
     * <!-- end-user-doc -->
     * @generated
     */
-   String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
 
    /**
     * Returns the value of the '<em><b>Start Event Symbol</b></em>' reference.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/ExtensionsFactory.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/ExtensionsFactory.java
index 2f3ebcb..c4477e4 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/ExtensionsFactory.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/ExtensionsFactory.java
@@ -27,7 +27,7 @@ public interface ExtensionsFactory extends EFactory
     * <!-- end-user-doc -->
     * @generated
     */
-   String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
 
    /**
     * The singleton instance of the factory.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/ExtensionsPackage.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/ExtensionsPackage.java
index 0e4ba50..d78c460 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/ExtensionsPackage.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/ExtensionsPackage.java
@@ -36,7 +36,7 @@ public interface ExtensionsPackage extends EPackage
     * <!-- end-user-doc -->
     * @generated
     */
-   String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
 
    /**
     * The package name.
@@ -44,7 +44,7 @@ public interface ExtensionsPackage extends EPackage
     * <!-- end-user-doc -->
     * @generated
     */
-   String eNAME = "extensions";
+   String eNAME = "extensions"; //$NON-NLS-1$
 
    /**
     * The package namespace URI.
@@ -52,7 +52,7 @@ public interface ExtensionsPackage extends EPackage
     * <!-- end-user-doc -->
     * @generated
     */
-   String eNS_URI = "http://www.carnot.ag/xpdl/3.1";
+   String eNS_URI = "http://www.carnot.ag/xpdl/3.1"; //$NON-NLS-1$
 
    /**
     * The package namespace name.
@@ -60,7 +60,7 @@ public interface ExtensionsPackage extends EPackage
     * <!-- end-user-doc -->
     * @generated
     */
-   String eNS_PREFIX = "carnot";
+   String eNS_PREFIX = "carnot"; //$NON-NLS-1$
 
    /**
     * The singleton instance of the package.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/FormalParameterMappingType.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/FormalParameterMappingType.java
index 3836815..34a23ba 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/FormalParameterMappingType.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/FormalParameterMappingType.java
@@ -40,7 +40,7 @@ public interface FormalParameterMappingType extends EObject
     * <!-- end-user-doc -->
     * @generated
     */
-   String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
 
    /**
     * Returns the value of the '<em><b>Data</b></em>' reference.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/FormalParameterMappingsType.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/FormalParameterMappingsType.java
index 61554fd..3524bc0 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/FormalParameterMappingsType.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/FormalParameterMappingsType.java
@@ -40,7 +40,7 @@ public interface FormalParameterMappingsType extends EObject
     * <!-- end-user-doc -->
     * @generated
     */
-   String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
 
    /**
     * Returns the value of the '<em><b>Mapping</b></em>' containment reference list.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/impl/ExtensionsFactoryImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/impl/ExtensionsFactoryImpl.java
index 7fb9c01..327e806 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/impl/ExtensionsFactoryImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/impl/ExtensionsFactoryImpl.java
@@ -11,11 +11,14 @@
 package org.eclipse.stardust.model.xpdl.carnot.extensions.impl;
 
 
+import java.text.MessageFormat;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.stardust.model.xpdl.carnot.Model_Messages;
 import org.eclipse.stardust.model.xpdl.carnot.extensions.ExtensionsFactory;
 import org.eclipse.stardust.model.xpdl.carnot.extensions.ExtensionsPackage;
 import org.eclipse.stardust.model.xpdl.carnot.extensions.FormalParameterMappingType;
@@ -34,7 +37,7 @@ public class ExtensionsFactoryImpl extends EFactoryImpl implements ExtensionsFac
     * <!-- end-user-doc -->
     * @generated
     */
-   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
 
    /**
     * Creates the default factory implementation.
@@ -46,7 +49,7 @@ public class ExtensionsFactoryImpl extends EFactoryImpl implements ExtensionsFac
    {
       try
       {
-         ExtensionsFactory theExtensionsFactory = (ExtensionsFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.carnot.ag/xpdl/3.1"); 
+         ExtensionsFactory theExtensionsFactory = (ExtensionsFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.carnot.ag/xpdl/3.1");  //$NON-NLS-1$
          if (theExtensionsFactory != null)
          {
             return theExtensionsFactory;
@@ -83,7 +86,7 @@ public class ExtensionsFactoryImpl extends EFactoryImpl implements ExtensionsFac
          case ExtensionsPackage.FORMAL_PARAMETER_MAPPING_TYPE: return createFormalParameterMappingType();
          case ExtensionsPackage.FORMAL_PARAMETER_MAPPINGS_TYPE: return createFormalParameterMappingsType();
          default:
-            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_CLASS_NULL_IS_NOT_A_VALID_CLASSIFIER, new Object[]{eClass.getName()}));
       }
    }
 
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/impl/ExtensionsPackageImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/impl/ExtensionsPackageImpl.java
index 84e55d5..25a3c87 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/impl/ExtensionsPackageImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/impl/ExtensionsPackageImpl.java
@@ -38,7 +38,7 @@ public class ExtensionsPackageImpl extends EPackageImpl implements ExtensionsPac
     * <!-- end-user-doc -->
     * @generated
     */
-   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
 
    /**
     * <!-- begin-user-doc -->
@@ -222,7 +222,7 @@ public class ExtensionsPackageImpl extends EPackageImpl implements ExtensionsPac
    {
       if (eClassifier.getInstanceClassName() == null)
       {
-         eClassifier.setInstanceClassName("org.eclipse.stardust.model.xpdl.carnot.extensions." + eClassifier.getName());
+         eClassifier.setInstanceClassName("org.eclipse.stardust.model.xpdl.carnot.extensions." + eClassifier.getName()); //$NON-NLS-1$
          setGeneratedClassName(eClassifier);
       }
    }
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/impl/FormalParameterMappingTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/impl/FormalParameterMappingTypeImpl.java
index 9185022..1b5554f 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/impl/FormalParameterMappingTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/impl/FormalParameterMappingTypeImpl.java
@@ -43,7 +43,7 @@ public class FormalParameterMappingTypeImpl extends EObjectImpl implements Forma
     * <!-- end-user-doc -->
     * @generated
     */
-   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
 
    /**
     * The cached value of the '{@link #getData() <em>Data</em>}' reference.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/impl/FormalParameterMappingsTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/impl/FormalParameterMappingsTypeImpl.java
index 740782b..d66368a 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/impl/FormalParameterMappingsTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/impl/FormalParameterMappingsTypeImpl.java
@@ -49,7 +49,7 @@ public class FormalParameterMappingsTypeImpl extends EObjectImpl implements Form
     * <!-- end-user-doc -->
     * @generated
     */
-   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
 
    /**
     * The cached value of the '{@link #getMapping() <em>Mapping</em>}' containment reference list.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/util/ExtensionsAdapterFactory.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/util/ExtensionsAdapterFactory.java
index aaf4101..2dd0645 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/util/ExtensionsAdapterFactory.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/util/ExtensionsAdapterFactory.java
@@ -34,7 +34,7 @@ public class ExtensionsAdapterFactory extends AdapterFactoryImpl
     * <!-- end-user-doc -->
     * @generated
     */
-   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
 
    /**
     * The cached model package.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/util/ExtensionsResourceFactoryImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/util/ExtensionsResourceFactoryImpl.java
index d7e1b5e..168d899 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/util/ExtensionsResourceFactoryImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/util/ExtensionsResourceFactoryImpl.java
@@ -29,7 +29,7 @@ public class ExtensionsResourceFactoryImpl extends ResourceFactoryImpl
     * <!-- end-user-doc -->
     * @generated
     */
-   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
    /**
     * Creates an instance of the resource factory.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/util/ExtensionsResourceImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/util/ExtensionsResourceImpl.java
index 0989b94..3a73291 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/util/ExtensionsResourceImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/util/ExtensionsResourceImpl.java
@@ -27,7 +27,7 @@ public class ExtensionsResourceImpl extends XMLResourceImpl
     * <!-- end-user-doc -->
     * @generated
     */
-   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
    /**
     * Creates an instance of the resource.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/util/ExtensionsSwitch.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/util/ExtensionsSwitch.java
index 02de98c..79d8b0e 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/util/ExtensionsSwitch.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/util/ExtensionsSwitch.java
@@ -39,7 +39,7 @@ public class ExtensionsSwitch<T>
     * <!-- end-user-doc -->
     * @generated
     */
-   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
 
    /**
     * The cached model package
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/util/ExtensionsXMLProcessor.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/util/ExtensionsXMLProcessor.java
index 97d94eb..be5e968 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/util/ExtensionsXMLProcessor.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/extensions/util/ExtensionsXMLProcessor.java
@@ -31,7 +31,7 @@ public class ExtensionsXMLProcessor extends XMLProcessor
     * <!-- end-user-doc -->
     * @generated
     */
-   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
 
    /**
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/AbstractEventActionImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/AbstractEventActionImpl.java
index 23b25fc..26490c3 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/AbstractEventActionImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/AbstractEventActionImpl.java
@@ -719,12 +719,12 @@ public abstract class AbstractEventActionImpl extends EObjectImpl implements Abs
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", id: ");
-      if (idESet) result.append(id); else result.append("<unset>");
-      result.append(", name: ");
-      if (nameESet) result.append(name); else result.append("<unset>");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", id: "); //$NON-NLS-1$
+      if (idESet) result.append(id); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", name: "); //$NON-NLS-1$
+      if (nameESet) result.append(name); else result.append("<unset>"); //$NON-NLS-1$
       result.append(')');
       return result.toString();
    }
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/AccessPointTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/AccessPointTypeImpl.java
index b6b6b1c..e317a44 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/AccessPointTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/AccessPointTypeImpl.java
@@ -727,13 +727,13 @@ public class AccessPointTypeImpl extends EObjectImpl implements AccessPointType
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", id: ");
-      if (idESet) result.append(id); else result.append("<unset>");
-      result.append(", name: ");
-      if (nameESet) result.append(name); else result.append("<unset>");
-      result.append(", direction: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", id: "); //$NON-NLS-1$
+      if (idESet) result.append(id); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", name: "); //$NON-NLS-1$
+      if (nameESet) result.append(name); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", direction: "); //$NON-NLS-1$
       result.append(direction);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ActivityTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ActivityTypeImpl.java
index 93da051..2121459 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ActivityTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ActivityTypeImpl.java
@@ -1960,28 +1960,28 @@ public class ActivityTypeImpl extends EObjectImpl implements ActivityType
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", id: ");
-      if (idESet) result.append(id); else result.append("<unset>");
-      result.append(", name: ");
-      if (nameESet) result.append(name); else result.append("<unset>");
-      result.append(", allowsAbortByPerformer: ");
-      if (allowsAbortByPerformerESet) result.append(allowsAbortByPerformer); else result.append("<unset>");
-      result.append(", hibernateOnCreation: ");
-      if (hibernateOnCreationESet) result.append(hibernateOnCreation); else result.append("<unset>");
-      result.append(", implementation: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", id: "); //$NON-NLS-1$
+      if (idESet) result.append(id); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", name: "); //$NON-NLS-1$
+      if (nameESet) result.append(name); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", allowsAbortByPerformer: "); //$NON-NLS-1$
+      if (allowsAbortByPerformerESet) result.append(allowsAbortByPerformer); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", hibernateOnCreation: "); //$NON-NLS-1$
+      if (hibernateOnCreationESet) result.append(hibernateOnCreation); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", implementation: "); //$NON-NLS-1$
       result.append(implementation);
-      result.append(", join: ");
-      if (joinESet) result.append(join); else result.append("<unset>");
-      result.append(", loopCondition: ");
+      result.append(", join: "); //$NON-NLS-1$
+      if (joinESet) result.append(join); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", loopCondition: "); //$NON-NLS-1$
       result.append(loopCondition);
-      result.append(", loopType: ");
-      if (loopTypeESet) result.append(loopType); else result.append("<unset>");
-      result.append(", split: ");
-      if (splitESet) result.append(split); else result.append("<unset>");
-      result.append(", subProcessMode: ");
-      if (subProcessModeESet) result.append(subProcessMode); else result.append("<unset>");
+      result.append(", loopType: "); //$NON-NLS-1$
+      if (loopTypeESet) result.append(loopType); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", split: "); //$NON-NLS-1$
+      if (splitESet) result.append(split); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", subProcessMode: "); //$NON-NLS-1$
+      if (subProcessModeESet) result.append(subProcessMode); else result.append("<unset>"); //$NON-NLS-1$
       result.append(')');
       return result.toString();
    }
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/AnnotationSymbolTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/AnnotationSymbolTypeImpl.java
index 0b0a3df..c5af44c 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/AnnotationSymbolTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/AnnotationSymbolTypeImpl.java
@@ -1045,23 +1045,23 @@ public class AnnotationSymbolTypeImpl extends EObjectImpl implements AnnotationS
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", borderColor: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", borderColor: "); //$NON-NLS-1$
       result.append(borderColor);
-      result.append(", fillColor: ");
+      result.append(", fillColor: "); //$NON-NLS-1$
       result.append(fillColor);
-      result.append(", style: ");
+      result.append(", style: "); //$NON-NLS-1$
       result.append(style);
-      result.append(", xPos: ");
-      if (xPosESet) result.append(xPos); else result.append("<unset>");
-      result.append(", yPos: ");
-      if (yPosESet) result.append(yPos); else result.append("<unset>");
-      result.append(", width: ");
-      if (widthESet) result.append(width); else result.append("<unset>");
-      result.append(", height: ");
-      if (heightESet) result.append(height); else result.append("<unset>");
-      result.append(", shape: ");
+      result.append(", xPos: "); //$NON-NLS-1$
+      if (xPosESet) result.append(xPos); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", yPos: "); //$NON-NLS-1$
+      if (yPosESet) result.append(yPos); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", width: "); //$NON-NLS-1$
+      if (widthESet) result.append(width); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", height: "); //$NON-NLS-1$
+      if (heightESet) result.append(height); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", shape: "); //$NON-NLS-1$
       result.append(shape);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ApplicationContextTypeTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ApplicationContextTypeTypeImpl.java
index c8c571d..bc09c33 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ApplicationContextTypeTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ApplicationContextTypeTypeImpl.java
@@ -1111,23 +1111,23 @@ public class ApplicationContextTypeTypeImpl extends EObjectImpl implements Appli
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", id: ");
-      if (idESet) result.append(id); else result.append("<unset>");
-      result.append(", name: ");
-      if (nameESet) result.append(name); else result.append("<unset>");
-      result.append(", isPredefined: ");
-      if (isPredefinedESet) result.append(isPredefined); else result.append("<unset>");
-      result.append(", accessPointProviderClass: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", id: "); //$NON-NLS-1$
+      if (idESet) result.append(id); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", name: "); //$NON-NLS-1$
+      if (nameESet) result.append(name); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", isPredefined: "); //$NON-NLS-1$
+      if (isPredefinedESet) result.append(isPredefined); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", accessPointProviderClass: "); //$NON-NLS-1$
       result.append(accessPointProviderClass);
-      result.append(", hasApplicationPath: ");
-      if (hasApplicationPathESet) result.append(hasApplicationPath); else result.append("<unset>");
-      result.append(", hasMappingId: ");
-      if (hasMappingIdESet) result.append(hasMappingId); else result.append("<unset>");
-      result.append(", panelClass: ");
+      result.append(", hasApplicationPath: "); //$NON-NLS-1$
+      if (hasApplicationPathESet) result.append(hasApplicationPath); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", hasMappingId: "); //$NON-NLS-1$
+      if (hasMappingIdESet) result.append(hasMappingId); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", panelClass: "); //$NON-NLS-1$
       result.append(panelClass);
-      result.append(", validatorClass: ");
+      result.append(", validatorClass: "); //$NON-NLS-1$
       result.append(validatorClass);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ApplicationTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ApplicationTypeImpl.java
index 6804516..5bc4e48 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ApplicationTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ApplicationTypeImpl.java
@@ -947,13 +947,13 @@ public class ApplicationTypeImpl extends EObjectImpl implements ApplicationType
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", id: ");
-      if (idESet) result.append(id); else result.append("<unset>");
-      result.append(", name: ");
-      if (nameESet) result.append(name); else result.append("<unset>");
-      result.append(", interactive: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", id: "); //$NON-NLS-1$
+      if (idESet) result.append(id); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", name: "); //$NON-NLS-1$
+      if (nameESet) result.append(name); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", interactive: "); //$NON-NLS-1$
       result.append(interactive);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ApplicationTypeTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ApplicationTypeTypeImpl.java
index 1c5d6b8..1ec9ebe 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ApplicationTypeTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ApplicationTypeTypeImpl.java
@@ -1075,23 +1075,23 @@ public class ApplicationTypeTypeImpl extends EObjectImpl implements ApplicationT
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", id: ");
-      if (idESet) result.append(id); else result.append("<unset>");
-      result.append(", name: ");
-      if (nameESet) result.append(name); else result.append("<unset>");
-      result.append(", isPredefined: ");
-      if (isPredefinedESet) result.append(isPredefined); else result.append("<unset>");
-      result.append(", accessPointProviderClass: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", id: "); //$NON-NLS-1$
+      if (idESet) result.append(id); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", name: "); //$NON-NLS-1$
+      if (nameESet) result.append(name); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", isPredefined: "); //$NON-NLS-1$
+      if (isPredefinedESet) result.append(isPredefined); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", accessPointProviderClass: "); //$NON-NLS-1$
       result.append(accessPointProviderClass);
-      result.append(", instanceClass: ");
+      result.append(", instanceClass: "); //$NON-NLS-1$
       result.append(instanceClass);
-      result.append(", panelClass: ");
+      result.append(", panelClass: "); //$NON-NLS-1$
       result.append(panelClass);
-      result.append(", synchronous: ");
-      if (synchronousESet) result.append(synchronous); else result.append("<unset>");
-      result.append(", validatorClass: ");
+      result.append(", synchronous: "); //$NON-NLS-1$
+      if (synchronousESet) result.append(synchronous); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", validatorClass: "); //$NON-NLS-1$
       result.append(validatorClass);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/AttributeCategory.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/AttributeCategory.java
index 894ec61..32ca97a 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/AttributeCategory.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/AttributeCategory.java
@@ -19,7 +19,7 @@ import org.eclipse.stardust.model.xpdl.carnot.AttributeType;
 import org.eclipse.stardust.model.xpdl.carnot.CarnotWorkflowModelFactory;
 import org.eclipse.stardust.model.xpdl.carnot.IAttributeCategory;
 import org.eclipse.stardust.model.xpdl.carnot.IExtensibleElement;
-import org.eclipse.stardust.model.xpdl.carnot.ModelMessages;
+import org.eclipse.stardust.model.xpdl.carnot.Model_Messages;
 import org.eclipse.stardust.model.xpdl.carnot.util.AttributeUtil;
 
 public class AttributeCategory implements IAttributeCategory
@@ -61,12 +61,12 @@ public class AttributeCategory implements IAttributeCategory
       String prefix = getFullId();
       if (prefix != null)
       {
-         prefix += ":";
+         prefix += ":"; //$NON-NLS-1$
       }
       for (AttributeType attribute : target.getAttribute())
       {
          String name = attribute.getName();
-         if (prefix == null && name.indexOf(":") < 0
+         if (prefix == null && name.indexOf(":") < 0 //$NON-NLS-1$
                || name != null && name.startsWith(prefix)
                   && name.indexOf(':', prefix.length()) < 0)
          {
@@ -83,7 +83,7 @@ public class AttributeCategory implements IAttributeCategory
       String prefix = getFullId();
       if (prefix != null)
       {
-         prefix += ":";
+         prefix += ":"; //$NON-NLS-1$
          for (AttributeType attribute : target.getAttribute())
          {
             String name = attribute.getName();
@@ -169,7 +169,7 @@ public class AttributeCategory implements IAttributeCategory
          if (AttributeUtil.getAttribute(target, attName) != null)
          {
             throw new IllegalArgumentException(MessageFormat.format(
-                  ModelMessages.MSG_ATTRIBUTE_EXISTS, new Object[] {attName})); //$NON-NLS-1$
+                  Model_Messages.MSG_ATTRIBUTE_EXISTS, new Object[] {attName})); //$NON-NLS-1$
          }
          AttributeType attribute = CarnotWorkflowModelFactory.eINSTANCE
                .createAttributeType();
@@ -190,7 +190,7 @@ public class AttributeCategory implements IAttributeCategory
             if (attribute.getName().startsWith(prefix))
             {
                throw new IllegalArgumentException(MessageFormat.format(
-                     ModelMessages.MSG_ATTRIBUTE_CATEGORY_EXISTS, //$NON-NLS-1$
+                     Model_Messages.MSG_ATTRIBUTE_CATEGORY_EXISTS, //$NON-NLS-1$
                      new Object[] {prefix}));
             }
          }
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/AttributeTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/AttributeTypeImpl.java
index 4d08dd9..569544f 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/AttributeTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/AttributeTypeImpl.java
@@ -587,13 +587,13 @@ public class AttributeTypeImpl extends EObjectImpl implements AttributeType
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (mixed: ");
+      result.append(" (mixed: "); //$NON-NLS-1$
       result.append(mixed);
-      result.append(", name: ");
+      result.append(", name: "); //$NON-NLS-1$
       result.append(name);
-      result.append(", type: ");
+      result.append(", type: "); //$NON-NLS-1$
       result.append(type);
-      result.append(", value: ");
+      result.append(", value: "); //$NON-NLS-1$
       result.append(value);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/CarnotWorkflowModelFactoryImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/CarnotWorkflowModelFactoryImpl.java
index ae9869f..6e148c9 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/CarnotWorkflowModelFactoryImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/CarnotWorkflowModelFactoryImpl.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.stardust.model.xpdl.carnot.impl;
 
+import java.text.MessageFormat;
 import java.util.List;
 
 import org.eclipse.emf.ecore.EClass;
@@ -70,8 +71,8 @@ import org.eclipse.stardust.model.xpdl.carnot.LinkEndStyle;
 import org.eclipse.stardust.model.xpdl.carnot.LinkLineStyle;
 import org.eclipse.stardust.model.xpdl.carnot.LinkTypeType;
 import org.eclipse.stardust.model.xpdl.carnot.LoopType;
-import org.eclipse.stardust.model.xpdl.carnot.ModelMessages;
 import org.eclipse.stardust.model.xpdl.carnot.ModelType;
+import org.eclipse.stardust.model.xpdl.carnot.Model_Messages;
 import org.eclipse.stardust.model.xpdl.carnot.ModelerSymbolType;
 import org.eclipse.stardust.model.xpdl.carnot.ModelerType;
 import org.eclipse.stardust.model.xpdl.carnot.OrganizationSymbolType;
@@ -116,11 +117,11 @@ import org.eclipse.stardust.model.xpdl.carnot.XmlTextNode;
 public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
       implements CarnotWorkflowModelFactory
 {
-   public static final String MSG_DATATYPE_NO_VALID_CLASSIFIER = ModelMessages.MSG_DATATYPE_NOT_VALID; //$NON-NLS-1$
+   public static final String MSG_DATATYPE_NO_VALID_CLASSIFIER = Model_Messages.MSG_DATATYPE_NOT_VALID; //$NON-NLS-1$
 
-   private static final String MSG_CLASS_NO_VALID_CLASSIFIER = ModelMessages.MSG_CLASS_NOT_VALID; //$NON-NLS-1$
+   private static final String MSG_CLASS_NO_VALID_CLASSIFIER = Model_Messages.MSG_CLASS_NOT_VALID; //$NON-NLS-1$
 
-   private static final String MSG_NO_VALID_ENUM = ModelMessages.MSG_NO_VALID_ENUMERATION; //$NON-NLS-1$
+   private static final String MSG_NO_VALID_ENUM = Model_Messages.MSG_NO_VALID_ENUMERATION; //$NON-NLS-1$
 
    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -138,7 +139,7 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
    {
       try
       {
-         CarnotWorkflowModelFactory theCarnotWorkflowModelFactory = (CarnotWorkflowModelFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.carnot.ag/workflowmodel/3.1"); 
+         CarnotWorkflowModelFactory theCarnotWorkflowModelFactory = (CarnotWorkflowModelFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.carnot.ag/workflowmodel/3.1");  //$NON-NLS-1$
          if (theCarnotWorkflowModelFactory != null)
          {
             return theCarnotWorkflowModelFactory;
@@ -242,7 +243,8 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
          case CarnotWorkflowModelPackage.WORKS_FOR_CONNECTION_TYPE: return createWorksForConnectionType();
          case CarnotWorkflowModelPackage.XML_TEXT_NODE: return createXmlTextNode();
          default:
-            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+        	 
+            throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_CLASS_NULL_IS_NOT_A_VALID_CLASSIFIER, new Object[]{eClass.getName()}));
       }
    }
 
@@ -316,7 +318,8 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
          case CarnotWorkflowModelPackage.DIAGRAM_MODE_TYPE_OBJECT:
             return createDiagramModeTypeObjectFromString(eDataType, initialValue);
          default:
-            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+        	 
+            throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_DATATYPE_NULL_IS_NOT_VALID_CLASSIFIER, new Object[]{eDataType.getName()}));
       }
    }
 
@@ -390,7 +393,7 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
          case CarnotWorkflowModelPackage.DIAGRAM_MODE_TYPE_OBJECT:
             return convertDiagramModeTypeObjectToString(eDataType, instanceValue);
          default:
-            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+        	 throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_DATATYPE_NULL_IS_NOT_VALID_CLASSIFIER, new Object[]{eDataType.getName()}));
       }
    }
 
@@ -1118,7 +1121,8 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
    public ActivityImplementationType createActivityImplementationTypeFromString(EDataType eDataType, String initialValue)
    {
       ActivityImplementationType result = ActivityImplementationType.get(initialValue);
-      if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+      // throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+      if (result == null) throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_VALUE_NULL_IS_NOT_VALID_ENUMERATION_OF_ONE , new Object[]{initialValue ,eDataType.getName()}));
       return result;
    }
 
@@ -1140,7 +1144,7 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
    public DirectionType createDirectionTypeFromString(EDataType eDataType, String initialValue)
    {
       DirectionType result = DirectionType.get(initialValue);
-      if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+      if (result == null) throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_VALUE_NULL_IS_NOT_VALID_ENUMERATION_OF_ONE , new Object[]{initialValue ,eDataType.getName()}));
       return result;
    }
 
@@ -1162,7 +1166,7 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
    public FlowControlType createFlowControlTypeFromString(EDataType eDataType, String initialValue)
    {
       FlowControlType result = FlowControlType.get(initialValue);
-      if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+      if (result == null) throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_VALUE_NULL_IS_NOT_VALID_ENUMERATION_OF_ONE , new Object[]{initialValue ,eDataType.getName()}));
       return result;
    }
 
@@ -1184,7 +1188,7 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
    public ImplementationType createImplementationTypeFromString(EDataType eDataType, String initialValue)
    {
       ImplementationType result = ImplementationType.get(initialValue);
-      if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+      if (result == null) throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_VALUE_NULL_IS_NOT_VALID_ENUMERATION_OF_ONE , new Object[]{initialValue ,eDataType.getName()}));
       return result;
    }
 
@@ -1206,7 +1210,7 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
    public JoinSplitType createJoinSplitTypeFromString(EDataType eDataType, String initialValue)
    {
       JoinSplitType result = JoinSplitType.get(initialValue);
-      if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+      if (result == null) throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_VALUE_NULL_IS_NOT_VALID_ENUMERATION_OF_ONE , new Object[]{initialValue ,eDataType.getName()}));
       return result;
    }
 
@@ -1228,7 +1232,7 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
    public LinkCardinality createLinkCardinalityFromString(EDataType eDataType, String initialValue)
    {
       LinkCardinality result = LinkCardinality.get(initialValue);
-      if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+      if (result == null) throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_VALUE_NULL_IS_NOT_VALID_ENUMERATION_OF_ONE , new Object[]{initialValue , eDataType.getName()}));
       return result;
    }
 
@@ -1250,7 +1254,7 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
    public LinkColor createLinkColorFromString(EDataType eDataType, String initialValue)
    {
       LinkColor result = LinkColor.get(initialValue);
-      if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+      if (result == null) throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_VALUE_NULL_IS_NOT_VALID_ENUMERATION_OF_ONE , new Object[]{initialValue ,eDataType.getName()}));
       return result;
    }
 
@@ -1272,7 +1276,7 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
    public LinkLineStyle createLinkLineStyleFromString(EDataType eDataType, String initialValue)
    {
       LinkLineStyle result = LinkLineStyle.get(initialValue);
-      if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+      if (result == null) throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_VALUE_NULL_IS_NOT_VALID_ENUMERATION_OF_ONE , new Object[]{initialValue ,eDataType.getName()}));
       return result;
    }
 
@@ -1294,7 +1298,7 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
    public LinkEndStyle createLinkEndStyleFromString(EDataType eDataType, String initialValue)
    {
       LinkEndStyle result = LinkEndStyle.get(initialValue);
-      if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+      if (result == null) throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_VALUE_NULL_IS_NOT_VALID_ENUMERATION_OF_ONE , new Object[]{initialValue ,eDataType.getName()}));
       return result;
    }
 
@@ -1316,7 +1320,7 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
    public LoopType createLoopTypeFromString(EDataType eDataType, String initialValue)
    {
       LoopType result = LoopType.get(initialValue);
-      if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+      if (result == null) throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_VALUE_NULL_IS_NOT_VALID_ENUMERATION_OF_ONE , new Object[]{initialValue ,eDataType.getName()}));
       return result;
    }
 
@@ -1338,7 +1342,7 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
    public OrientationType createOrientationTypeFromString(EDataType eDataType, String initialValue)
    {
       OrientationType result = OrientationType.get(initialValue);
-      if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+      if (result == null) throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_VALUE_NULL_IS_NOT_VALID_ENUMERATION_OF_ONE , new Object[]{initialValue ,eDataType.getName()}));
       return result;
    }
 
@@ -1360,7 +1364,7 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
    public RoutingType createRoutingTypeFromString(EDataType eDataType, String initialValue)
    {
       RoutingType result = RoutingType.get(initialValue);
-      if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+      if (result == null) throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_VALUE_NULL_IS_NOT_VALID_ENUMERATION_OF_ONE , new Object[]{initialValue ,eDataType.getName()}));
       return result;
    }
 
@@ -1382,7 +1386,7 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
    public SubProcessModeType createSubProcessModeTypeFromString(EDataType eDataType, String initialValue)
    {
       SubProcessModeType result = SubProcessModeType.getByName(initialValue);
-      if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+      if (result == null) throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_VALUE_NULL_IS_NOT_VALID_ENUMERATION_OF_ONE , new Object[]{initialValue ,eDataType.getName()}));
       return result;
    }
 
@@ -1404,7 +1408,7 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
    public DiagramModeType createDiagramModeTypeFromString(EDataType eDataType, String initialValue)
    {
       DiagramModeType result = DiagramModeType.get(initialValue);
-      if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+      if (result == null) throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_VALUE_NULL_IS_NOT_VALID_ENUMERATION_OF_ONE , new Object[]{initialValue ,eDataType.getName()}));
       return result;
    }
 
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/CarnotWorkflowModelPackageImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/CarnotWorkflowModelPackageImpl.java
index 8329930..f7618f5 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/CarnotWorkflowModelPackageImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/CarnotWorkflowModelPackageImpl.java
@@ -12,6 +12,7 @@ package org.eclipse.stardust.model.xpdl.carnot.impl;
 
 import java.io.IOException;
 import java.net.URL;
+import java.text.MessageFormat;
 
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.common.util.WrappedException;
@@ -28,6 +29,7 @@ import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl;
 import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
 import org.eclipse.stardust.model.xpdl.carnot.CarnotWorkflowModelFactory;
 import org.eclipse.stardust.model.xpdl.carnot.CarnotWorkflowModelPackage;
+import org.eclipse.stardust.model.xpdl.carnot.Model_Messages;
 import org.eclipse.stardust.model.xpdl.carnot.extensions.ExtensionsPackage;
 import org.eclipse.stardust.model.xpdl.carnot.extensions.impl.ExtensionsPackageImpl;
 import org.eclipse.stardust.model.xpdl.xpdl2.XpdlPackage;
@@ -5031,7 +5033,7 @@ public class CarnotWorkflowModelPackageImpl extends EPackageImpl
       URL url = getClass().getResource(packageFilename);
       if (url == null)
       {
-         throw new RuntimeException("Missing serialized package: " + packageFilename);
+         throw new RuntimeException( MessageFormat.format(Model_Messages.EXC_MISSING_SERIALIZED_PACKAGE_NULL, new Object[]{packageFilename}));
       }
       URI uri = URI.createURI(url.toString());
       Resource resource = new EcoreResourceFactoryImpl().createResource(uri);
@@ -5077,7 +5079,7 @@ public class CarnotWorkflowModelPackageImpl extends EPackageImpl
    protected void fixInstanceClass(EClassifier eClassifier) {
       if (eClassifier.getInstanceClassName() == null)
       {
-         eClassifier.setInstanceClassName("org.eclipse.stardust.model.xpdl.carnot." + eClassifier.getName());
+         eClassifier.setInstanceClassName("org.eclipse.stardust.model.xpdl.carnot." + eClassifier.getName()); //$NON-NLS-1$
          setGeneratedClassName(eClassifier);
       }
    }
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/CodeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/CodeImpl.java
index 12b9145..4622830 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/CodeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/CodeImpl.java
@@ -39,7 +39,7 @@ public class CodeImpl extends EObjectImpl implements Code
     * <!-- end-user-doc -->
     * @generated
     */
-   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
 
    /**
     * The default value of the '{@link #getCode() <em>Code</em>}' attribute.
@@ -235,9 +235,9 @@ public class CodeImpl extends EObjectImpl implements Code
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (code: ");
+      result.append(" (code: "); //$NON-NLS-1$
       result.append(code);
-      result.append(", value: ");
+      result.append(", value: "); //$NON-NLS-1$
       result.append(value);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ConditionalPerformerTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ConditionalPerformerTypeImpl.java
index 4f772c3..d68b647 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ConditionalPerformerTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ConditionalPerformerTypeImpl.java
@@ -991,16 +991,16 @@ public class ConditionalPerformerTypeImpl extends EObjectImpl implements Conditi
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", id: ");
-      if (idESet) result.append(id); else result.append("<unset>");
-      result.append(", name: ");
-      if (nameESet) result.append(name); else result.append("<unset>");
-      result.append(", dataPath: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", id: "); //$NON-NLS-1$
+      if (idESet) result.append(id); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", name: "); //$NON-NLS-1$
+      if (nameESet) result.append(name); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", dataPath: "); //$NON-NLS-1$
       result.append(dataPath);
-      result.append(", isUser: ");
-      if (isUserESet) result.append(isUser); else result.append("<unset>");
+      result.append(", isUser: "); //$NON-NLS-1$
+      if (isUserESet) result.append(isUser); else result.append("<unset>"); //$NON-NLS-1$
       result.append(')');
       return result.toString();
    }
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ContextTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ContextTypeImpl.java
index d36c76d..f4d9ef1 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ContextTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ContextTypeImpl.java
@@ -561,8 +561,8 @@ public class ContextTypeImpl extends EObjectImpl implements ContextType
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
       result.append(')');
       return result.toString();
    }
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/CoordinatesImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/CoordinatesImpl.java
index 3c2abbd..ddd03cf 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/CoordinatesImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/CoordinatesImpl.java
@@ -308,10 +308,10 @@ public class CoordinatesImpl extends EObjectImpl implements Coordinates
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (xPos: ");
-      if (xPosESet) result.append(xPos); else result.append("<unset>");
-      result.append(", yPos: ");
-      if (yPosESet) result.append(yPos); else result.append("<unset>");
+      result.append(" (xPos: "); //$NON-NLS-1$
+      if (xPosESet) result.append(xPos); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", yPos: "); //$NON-NLS-1$
+      if (yPosESet) result.append(yPos); else result.append("<unset>"); //$NON-NLS-1$
       result.append(')');
       return result.toString();
    }
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/DataMappingConnectionTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/DataMappingConnectionTypeImpl.java
index 59765f6..6f30791 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/DataMappingConnectionTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/DataMappingConnectionTypeImpl.java
@@ -1001,20 +1001,20 @@ public class DataMappingConnectionTypeImpl extends EObjectImpl implements DataMa
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", borderColor: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", borderColor: "); //$NON-NLS-1$
       result.append(borderColor);
-      result.append(", fillColor: ");
+      result.append(", fillColor: "); //$NON-NLS-1$
       result.append(fillColor);
-      result.append(", style: ");
+      result.append(", style: "); //$NON-NLS-1$
       result.append(style);
-      result.append(", sourceAnchor: ");
-      if (sourceAnchorESet) result.append(sourceAnchor); else result.append("<unset>");
-      result.append(", targetAnchor: ");
-      if (targetAnchorESet) result.append(targetAnchor); else result.append("<unset>");
-      result.append(", routing: ");
-      if (routingESet) result.append(routing); else result.append("<unset>");
+      result.append(", sourceAnchor: "); //$NON-NLS-1$
+      if (sourceAnchorESet) result.append(sourceAnchor); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", targetAnchor: "); //$NON-NLS-1$
+      if (targetAnchorESet) result.append(targetAnchor); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", routing: "); //$NON-NLS-1$
+      if (routingESet) result.append(routing); else result.append("<unset>"); //$NON-NLS-1$
       result.append(')');
       return result.toString();
    }
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/DataMappingTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/DataMappingTypeImpl.java
index 73a7dba..3d7d8b5 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/DataMappingTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/DataMappingTypeImpl.java
@@ -815,21 +815,21 @@ public class DataMappingTypeImpl extends EObjectImpl implements DataMappingType
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", id: ");
-      if (idESet) result.append(id); else result.append("<unset>");
-      result.append(", name: ");
-      if (nameESet) result.append(name); else result.append("<unset>");
-      result.append(", applicationAccessPoint: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", id: "); //$NON-NLS-1$
+      if (idESet) result.append(id); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", name: "); //$NON-NLS-1$
+      if (nameESet) result.append(name); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", applicationAccessPoint: "); //$NON-NLS-1$
       result.append(applicationAccessPoint);
-      result.append(", applicationPath: ");
+      result.append(", applicationPath: "); //$NON-NLS-1$
       result.append(applicationPath);
-      result.append(", context: ");
+      result.append(", context: "); //$NON-NLS-1$
       result.append(context);
-      result.append(", dataPath: ");
+      result.append(", dataPath: "); //$NON-NLS-1$
       result.append(dataPath);
-      result.append(", direction: ");
+      result.append(", direction: "); //$NON-NLS-1$
       result.append(direction);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/DataPathTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/DataPathTypeImpl.java
index 793f627..94f00b4 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/DataPathTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/DataPathTypeImpl.java
@@ -980,19 +980,19 @@ public class DataPathTypeImpl extends EObjectImpl implements DataPathType
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", id: ");
-      if (idESet) result.append(id); else result.append("<unset>");
-      result.append(", name: ");
-      if (nameESet) result.append(name); else result.append("<unset>");
-      result.append(", dataPath: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", id: "); //$NON-NLS-1$
+      if (idESet) result.append(id); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", name: "); //$NON-NLS-1$
+      if (nameESet) result.append(name); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", dataPath: "); //$NON-NLS-1$
       result.append(dataPath);
-      result.append(", descriptor: ");
-      if (descriptorESet) result.append(descriptor); else result.append("<unset>");
-      result.append(", key: ");
-      if (keyESet) result.append(key); else result.append("<unset>");
-      result.append(", direction: ");
+      result.append(", descriptor: "); //$NON-NLS-1$
+      if (descriptorESet) result.append(descriptor); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", key: "); //$NON-NLS-1$
+      if (keyESet) result.append(key); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", direction: "); //$NON-NLS-1$
       result.append(direction);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/DataTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/DataTypeImpl.java
index ff15f88..53642cb 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/DataTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/DataTypeImpl.java
@@ -1083,14 +1083,14 @@ public class DataTypeImpl extends EObjectImpl implements DataType
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", id: ");
-      if (idESet) result.append(id); else result.append("<unset>");
-      result.append(", name: ");
-      if (nameESet) result.append(name); else result.append("<unset>");
-      result.append(", predefined: ");
-      if (predefinedESet) result.append(predefined); else result.append("<unset>");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", id: "); //$NON-NLS-1$
+      if (idESet) result.append(id); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", name: "); //$NON-NLS-1$
+      if (nameESet) result.append(name); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", predefined: "); //$NON-NLS-1$
+      if (predefinedESet) result.append(predefined); else result.append("<unset>"); //$NON-NLS-1$
       result.append(')');
       return result.toString();
    }
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/DataTypeTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/DataTypeTypeImpl.java
index dc54131..ac58ef6 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/DataTypeTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/DataTypeTypeImpl.java
@@ -1327,32 +1327,32 @@ public class DataTypeTypeImpl extends EObjectImpl implements DataTypeType
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", id: ");
-      if (idESet) result.append(id); else result.append("<unset>");
-      result.append(", name: ");
-      if (nameESet) result.append(name); else result.append("<unset>");
-      result.append(", isPredefined: ");
-      if (isPredefinedESet) result.append(isPredefined); else result.append("<unset>");
-      result.append(", accessPathEditor: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", id: "); //$NON-NLS-1$
+      if (idESet) result.append(id); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", name: "); //$NON-NLS-1$
+      if (nameESet) result.append(name); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", isPredefined: "); //$NON-NLS-1$
+      if (isPredefinedESet) result.append(isPredefined); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", accessPathEditor: "); //$NON-NLS-1$
       result.append(accessPathEditor);
-      result.append(", evaluator: ");
+      result.append(", evaluator: "); //$NON-NLS-1$
       result.append(evaluator);
-      result.append(", instanceClass: ");
+      result.append(", instanceClass: "); //$NON-NLS-1$
       result.append(instanceClass);
-      result.append(", panelClass: ");
+      result.append(", panelClass: "); //$NON-NLS-1$
       result.append(panelClass);
-      result.append(", readable: ");
-      if (readableESet) result.append(readable); else result.append("<unset>");
-      result.append(", storageStrategy: ");
+      result.append(", readable: "); //$NON-NLS-1$
+      if (readableESet) result.append(readable); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", storageStrategy: "); //$NON-NLS-1$
       result.append(storageStrategy);
-      result.append(", validatorClass: ");
+      result.append(", validatorClass: "); //$NON-NLS-1$
       result.append(validatorClass);
-      result.append(", valueCreator: ");
+      result.append(", valueCreator: "); //$NON-NLS-1$
       result.append(valueCreator);
-      result.append(", writable: ");
-      if (writableESet) result.append(writable); else result.append("<unset>");
+      result.append(", writable: "); //$NON-NLS-1$
+      if (writableESet) result.append(writable); else result.append("<unset>"); //$NON-NLS-1$
       result.append(')');
       return result.toString();
    }
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/DescriptionTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/DescriptionTypeImpl.java
index d8664b0..5a42638 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/DescriptionTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/DescriptionTypeImpl.java
@@ -182,7 +182,7 @@ public class DescriptionTypeImpl extends EObjectImpl implements DescriptionType
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (mixed: ");
+      result.append(" (mixed: "); //$NON-NLS-1$
       result.append(mixed);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/DiagramTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/DiagramTypeImpl.java
index 17fdc7c..09985a0 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/DiagramTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/DiagramTypeImpl.java
@@ -656,14 +656,14 @@ public class DiagramTypeImpl extends ISymbolContainerImpl implements DiagramType
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", name: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", name: "); //$NON-NLS-1$
       result.append(name);
-      result.append(", orientation: ");
-      if (orientationESet) result.append(orientation); else result.append("<unset>");
-      result.append(", mode: ");
-      if (modeESet) result.append(mode); else result.append("<unset>");
+      result.append(", orientation: "); //$NON-NLS-1$
+      if (orientationESet) result.append(orientation); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", mode: "); //$NON-NLS-1$
+      if (modeESet) result.append(mode); else result.append("<unset>"); //$NON-NLS-1$
       result.append(')');
       return result.toString();
    }
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/DocumentRootImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/DocumentRootImpl.java
index 89679c1..521f65a 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/DocumentRootImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/DocumentRootImpl.java
@@ -307,7 +307,7 @@ public class DocumentRootImpl extends EObjectImpl implements DocumentRoot
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (mixed: ");
+      result.append(" (mixed: "); //$NON-NLS-1$
       result.append(mixed);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/EventActionTypeTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/EventActionTypeTypeImpl.java
index 5d812e0..7f141c2 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/EventActionTypeTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/EventActionTypeTypeImpl.java
@@ -1165,25 +1165,25 @@ public class EventActionTypeTypeImpl extends EObjectImpl implements EventActionT
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", id: ");
-      if (idESet) result.append(id); else result.append("<unset>");
-      result.append(", name: ");
-      if (nameESet) result.append(name); else result.append("<unset>");
-      result.append(", isPredefined: ");
-      if (isPredefinedESet) result.append(isPredefined); else result.append("<unset>");
-      result.append(", actionClass: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", id: "); //$NON-NLS-1$
+      if (idESet) result.append(id); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", name: "); //$NON-NLS-1$
+      if (nameESet) result.append(name); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", isPredefined: "); //$NON-NLS-1$
+      if (isPredefinedESet) result.append(isPredefined); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", actionClass: "); //$NON-NLS-1$
       result.append(actionClass);
-      result.append(", activityAction: ");
-      if (activityActionESet) result.append(activityAction); else result.append("<unset>");
-      result.append(", panelClass: ");
+      result.append(", activityAction: "); //$NON-NLS-1$
+      if (activityActionESet) result.append(activityAction); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", panelClass: "); //$NON-NLS-1$
       result.append(panelClass);
-      result.append(", processAction: ");
-      if (processActionESet) result.append(processAction); else result.append("<unset>");
-      result.append(", supportedConditionTypes: ");
+      result.append(", processAction: "); //$NON-NLS-1$
+      if (processActionESet) result.append(processAction); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", supportedConditionTypes: "); //$NON-NLS-1$
       result.append(supportedConditionTypes);
-      result.append(", unsupportedContexts: ");
+      result.append(", unsupportedContexts: "); //$NON-NLS-1$
       result.append(unsupportedContexts);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/EventConditionTypeTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/EventConditionTypeTypeImpl.java
index c1af625..3973e72 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/EventConditionTypeTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/EventConditionTypeTypeImpl.java
@@ -1256,27 +1256,27 @@ public class EventConditionTypeTypeImpl extends EObjectImpl implements EventCond
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", id: ");
-      if (idESet) result.append(id); else result.append("<unset>");
-      result.append(", name: ");
-      if (nameESet) result.append(name); else result.append("<unset>");
-      result.append(", isPredefined: ");
-      if (isPredefinedESet) result.append(isPredefined); else result.append("<unset>");
-      result.append(", activityCondition: ");
-      if (activityConditionESet) result.append(activityCondition); else result.append("<unset>");
-      result.append(", binderClass: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", id: "); //$NON-NLS-1$
+      if (idESet) result.append(id); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", name: "); //$NON-NLS-1$
+      if (nameESet) result.append(name); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", isPredefined: "); //$NON-NLS-1$
+      if (isPredefinedESet) result.append(isPredefined); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", activityCondition: "); //$NON-NLS-1$
+      if (activityConditionESet) result.append(activityCondition); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", binderClass: "); //$NON-NLS-1$
       result.append(binderClass);
-      result.append(", implementation: ");
-      if (implementationESet) result.append(implementation); else result.append("<unset>");
-      result.append(", panelClass: ");
+      result.append(", implementation: "); //$NON-NLS-1$
+      if (implementationESet) result.append(implementation); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", panelClass: "); //$NON-NLS-1$
       result.append(panelClass);
-      result.append(", processCondition: ");
-      if (processConditionESet) result.append(processCondition); else result.append("<unset>");
-      result.append(", pullEventEmitterClass: ");
+      result.append(", processCondition: "); //$NON-NLS-1$
+      if (processConditionESet) result.append(processCondition); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", pullEventEmitterClass: "); //$NON-NLS-1$
       result.append(pullEventEmitterClass);
-      result.append(", rule: ");
+      result.append(", rule: "); //$NON-NLS-1$
       result.append(rule);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/EventHandlerTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/EventHandlerTypeImpl.java
index 82d3774..2a7c6ae 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/EventHandlerTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/EventHandlerTypeImpl.java
@@ -1250,20 +1250,20 @@ public class EventHandlerTypeImpl extends EObjectImpl implements EventHandlerTyp
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", id: ");
-      if (idESet) result.append(id); else result.append("<unset>");
-      result.append(", name: ");
-      if (nameESet) result.append(name); else result.append("<unset>");
-      result.append(", autoBind: ");
-      if (autoBindESet) result.append(autoBind); else result.append("<unset>");
-      result.append(", consumeOnMatch: ");
-      if (consumeOnMatchESet) result.append(consumeOnMatch); else result.append("<unset>");
-      result.append(", logHandler: ");
-      if (logHandlerESet) result.append(logHandler); else result.append("<unset>");
-      result.append(", unbindOnMatch: ");
-      if (unbindOnMatchESet) result.append(unbindOnMatch); else result.append("<unset>");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", id: "); //$NON-NLS-1$
+      if (idESet) result.append(id); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", name: "); //$NON-NLS-1$
+      if (nameESet) result.append(name); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", autoBind: "); //$NON-NLS-1$
+      if (autoBindESet) result.append(autoBind); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", consumeOnMatch: "); //$NON-NLS-1$
+      if (consumeOnMatchESet) result.append(consumeOnMatch); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", logHandler: "); //$NON-NLS-1$
+      if (logHandlerESet) result.append(logHandler); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", unbindOnMatch: "); //$NON-NLS-1$
+      if (unbindOnMatchESet) result.append(unbindOnMatch); else result.append("<unset>"); //$NON-NLS-1$
       result.append(')');
       return result.toString();
    }
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ExecutedByConnectionTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ExecutedByConnectionTypeImpl.java
index ffec16d..8fa903c 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ExecutedByConnectionTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ExecutedByConnectionTypeImpl.java
@@ -1001,20 +1001,20 @@ public class ExecutedByConnectionTypeImpl extends EObjectImpl implements Execute
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", borderColor: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", borderColor: "); //$NON-NLS-1$
       result.append(borderColor);
-      result.append(", fillColor: ");
+      result.append(", fillColor: "); //$NON-NLS-1$
       result.append(fillColor);
-      result.append(", style: ");
+      result.append(", style: "); //$NON-NLS-1$
       result.append(style);
-      result.append(", sourceAnchor: ");
-      if (sourceAnchorESet) result.append(sourceAnchor); else result.append("<unset>");
-      result.append(", targetAnchor: ");
-      if (targetAnchorESet) result.append(targetAnchor); else result.append("<unset>");
-      result.append(", routing: ");
-      if (routingESet) result.append(routing); else result.append("<unset>");
+      result.append(", sourceAnchor: "); //$NON-NLS-1$
+      if (sourceAnchorESet) result.append(sourceAnchor); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", targetAnchor: "); //$NON-NLS-1$
+      if (targetAnchorESet) result.append(targetAnchor); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", routing: "); //$NON-NLS-1$
+      if (routingESet) result.append(routing); else result.append("<unset>"); //$NON-NLS-1$
       result.append(')');
       return result.toString();
    }
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/GatewaySymbolImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/GatewaySymbolImpl.java
index 168910e..b09153a 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/GatewaySymbolImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/GatewaySymbolImpl.java
@@ -352,8 +352,8 @@ public class GatewaySymbolImpl extends IFlowObjectSymbolImpl implements GatewayS
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (flowKind: ");
-      if (flowKindESet) result.append(flowKind); else result.append("<unset>");
+      result.append(" (flowKind: "); //$NON-NLS-1$
+      if (flowKindESet) result.append(flowKind); else result.append("<unset>"); //$NON-NLS-1$
       result.append(')');
       return result.toString();
    }
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/GenericLinkConnectionTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/GenericLinkConnectionTypeImpl.java
index 7da45d4..0e02bc2 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/GenericLinkConnectionTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/GenericLinkConnectionTypeImpl.java
@@ -1222,20 +1222,20 @@ public class GenericLinkConnectionTypeImpl extends EObjectImpl implements Generi
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", borderColor: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", borderColor: "); //$NON-NLS-1$
       result.append(borderColor);
-      result.append(", fillColor: ");
+      result.append(", fillColor: "); //$NON-NLS-1$
       result.append(fillColor);
-      result.append(", style: ");
+      result.append(", style: "); //$NON-NLS-1$
       result.append(style);
-      result.append(", sourceAnchor: ");
-      if (sourceAnchorESet) result.append(sourceAnchor); else result.append("<unset>");
-      result.append(", targetAnchor: ");
-      if (targetAnchorESet) result.append(targetAnchor); else result.append("<unset>");
-      result.append(", routing: ");
-      if (routingESet) result.append(routing); else result.append("<unset>");
+      result.append(", sourceAnchor: "); //$NON-NLS-1$
+      if (sourceAnchorESet) result.append(sourceAnchor); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", targetAnchor: "); //$NON-NLS-1$
+      if (targetAnchorESet) result.append(targetAnchor); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", routing: "); //$NON-NLS-1$
+      if (routingESet) result.append(routing); else result.append("<unset>"); //$NON-NLS-1$
       result.append(')');
       return result.toString();
    }
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/GroupSymbolTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/GroupSymbolTypeImpl.java
index 8592a60..c0fdba4 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/GroupSymbolTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/GroupSymbolTypeImpl.java
@@ -1065,23 +1065,23 @@ public class GroupSymbolTypeImpl extends ISymbolContainerImpl implements GroupSy
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", borderColor: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", borderColor: "); //$NON-NLS-1$
       result.append(borderColor);
-      result.append(", fillColor: ");
+      result.append(", fillColor: "); //$NON-NLS-1$
       result.append(fillColor);
-      result.append(", style: ");
+      result.append(", style: "); //$NON-NLS-1$
       result.append(style);
-      result.append(", xPos: ");
-      if (xPosESet) result.append(xPos); else result.append("<unset>");
-      result.append(", yPos: ");
-      if (yPosESet) result.append(yPos); else result.append("<unset>");
-      result.append(", width: ");
-      if (widthESet) result.append(width); else result.append("<unset>");
-      result.append(", height: ");
-      if (heightESet) result.append(height); else result.append("<unset>");
-      result.append(", shape: ");
+      result.append(", xPos: "); //$NON-NLS-1$
+      if (xPosESet) result.append(xPos); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", yPos: "); //$NON-NLS-1$
+      if (yPosESet) result.append(yPos); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", width: "); //$NON-NLS-1$
+      if (widthESet) result.append(width); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", height: "); //$NON-NLS-1$
+      if (heightESet) result.append(height); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", shape: "); //$NON-NLS-1$
       result.append(shape);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/IFlowObjectSymbolImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/IFlowObjectSymbolImpl.java
index f1c2043..71f9962 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/IFlowObjectSymbolImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/IFlowObjectSymbolImpl.java
@@ -1098,23 +1098,23 @@ public abstract class IFlowObjectSymbolImpl extends EObjectImpl implements IFlow
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", borderColor: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", borderColor: "); //$NON-NLS-1$
       result.append(borderColor);
-      result.append(", fillColor: ");
+      result.append(", fillColor: "); //$NON-NLS-1$
       result.append(fillColor);
-      result.append(", style: ");
+      result.append(", style: "); //$NON-NLS-1$
       result.append(style);
-      result.append(", xPos: ");
-      if (xPosESet) result.append(xPos); else result.append("<unset>");
-      result.append(", yPos: ");
-      if (yPosESet) result.append(yPos); else result.append("<unset>");
-      result.append(", width: ");
-      if (widthESet) result.append(width); else result.append("<unset>");
-      result.append(", height: ");
-      if (heightESet) result.append(height); else result.append("<unset>");
-      result.append(", shape: ");
+      result.append(", xPos: "); //$NON-NLS-1$
+      if (xPosESet) result.append(xPos); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", yPos: "); //$NON-NLS-1$
+      if (yPosESet) result.append(yPos); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", width: "); //$NON-NLS-1$
+      if (widthESet) result.append(width); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", height: "); //$NON-NLS-1$
+      if (heightESet) result.append(height); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", shape: "); //$NON-NLS-1$
       result.append(shape);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/IModelElementNodeSymbolImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/IModelElementNodeSymbolImpl.java
index 3144484..f947062 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/IModelElementNodeSymbolImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/IModelElementNodeSymbolImpl.java
@@ -1032,23 +1032,23 @@ public abstract class IModelElementNodeSymbolImpl extends EObjectImpl implements
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", borderColor: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", borderColor: "); //$NON-NLS-1$
       result.append(borderColor);
-      result.append(", fillColor: ");
+      result.append(", fillColor: "); //$NON-NLS-1$
       result.append(fillColor);
-      result.append(", style: ");
+      result.append(", style: "); //$NON-NLS-1$
       result.append(style);
-      result.append(", xPos: ");
-      if (xPosESet) result.append(xPos); else result.append("<unset>");
-      result.append(", yPos: ");
-      if (yPosESet) result.append(yPos); else result.append("<unset>");
-      result.append(", width: ");
-      if (widthESet) result.append(width); else result.append("<unset>");
-      result.append(", height: ");
-      if (heightESet) result.append(height); else result.append("<unset>");
-      result.append(", shape: ");
+      result.append(", xPos: "); //$NON-NLS-1$
+      if (xPosESet) result.append(xPos); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", yPos: "); //$NON-NLS-1$
+      if (yPosESet) result.append(yPos); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", width: "); //$NON-NLS-1$
+      if (widthESet) result.append(width); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", height: "); //$NON-NLS-1$
+      if (heightESet) result.append(height); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", shape: "); //$NON-NLS-1$
       result.append(shape);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ISymbolContainerImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ISymbolContainerImpl.java
index 4543abb..55908f9 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ISymbolContainerImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ISymbolContainerImpl.java
@@ -981,9 +981,9 @@ public abstract class ISymbolContainerImpl extends EObjectImpl implements ISymbo
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (nodes: ");
+      result.append(" (nodes: "); //$NON-NLS-1$
       result.append(nodes);
-      result.append(", connections: ");
+      result.append(", connections: "); //$NON-NLS-1$
       result.append(connections);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/IdRefImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/IdRefImpl.java
index 2045181..feb30a4 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/IdRefImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/IdRefImpl.java
@@ -48,7 +48,7 @@ public class IdRefImpl extends EObjectImpl implements IdRef
     * <!-- end-user-doc -->
     * @generated
     */
-   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
 
    /**
     * The cached value of the '{@link #getPackageRef() <em>Package Ref</em>}' reference.
@@ -234,7 +234,7 @@ public class IdRefImpl extends EObjectImpl implements IdRef
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (ref: ");
+      result.append(" (ref: "); //$NON-NLS-1$
       result.append(ref);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/IdentifiableReferenceImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/IdentifiableReferenceImpl.java
index 460f558..c095cf9 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/IdentifiableReferenceImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/IdentifiableReferenceImpl.java
@@ -48,7 +48,7 @@ public class IdentifiableReferenceImpl extends EObjectImpl
     * <!-- begin-user-doc --> <!-- end-user-doc -->
     * @generated
     */
-   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
 
    /**
     * generated
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/LaneSymbolImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/LaneSymbolImpl.java
index 90a6bfd..2ac22c5 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/LaneSymbolImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/LaneSymbolImpl.java
@@ -1749,31 +1749,31 @@ public class LaneSymbolImpl extends ISymbolContainerImpl implements LaneSymbol
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", borderColor: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", borderColor: "); //$NON-NLS-1$
       result.append(borderColor);
-      result.append(", fillColor: ");
+      result.append(", fillColor: "); //$NON-NLS-1$
       result.append(fillColor);
-      result.append(", style: ");
+      result.append(", style: "); //$NON-NLS-1$
       result.append(style);
-      result.append(", xPos: ");
-      if (xPosESet) result.append(xPos); else result.append("<unset>");
-      result.append(", yPos: ");
-      if (yPosESet) result.append(yPos); else result.append("<unset>");
-      result.append(", width: ");
-      if (widthESet) result.append(width); else result.append("<unset>");
-      result.append(", height: ");
-      if (heightESet) result.append(height); else result.append("<unset>");
-      result.append(", shape: ");
+      result.append(", xPos: "); //$NON-NLS-1$
+      if (xPosESet) result.append(xPos); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", yPos: "); //$NON-NLS-1$
+      if (yPosESet) result.append(yPos); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", width: "); //$NON-NLS-1$
+      if (widthESet) result.append(width); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", height: "); //$NON-NLS-1$
+      if (heightESet) result.append(height); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", shape: "); //$NON-NLS-1$
       result.append(shape);
-      result.append(", id: ");
-      if (idESet) result.append(id); else result.append("<unset>");
-      result.append(", name: ");
-      if (nameESet) result.append(name); else result.append("<unset>");
-      result.append(", orientation: ");
-      if (orientationESet) result.append(orientation); else result.append("<unset>");
-      result.append(", collapsed: ");
+      result.append(", id: "); //$NON-NLS-1$
+      if (idESet) result.append(id); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", name: "); //$NON-NLS-1$
+      if (nameESet) result.append(name); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", orientation: "); //$NON-NLS-1$
+      if (orientationESet) result.append(orientation); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", collapsed: "); //$NON-NLS-1$
       result.append(collapsed);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/LinkTypeTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/LinkTypeTypeImpl.java
index feac3f3..a22e3b0 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/LinkTypeTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/LinkTypeTypeImpl.java
@@ -1491,38 +1491,38 @@ public class LinkTypeTypeImpl extends EObjectImpl implements LinkTypeType
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", id: ");
-      if (idESet) result.append(id); else result.append("<unset>");
-      result.append(", name: ");
-      if (nameESet) result.append(name); else result.append("<unset>");
-      result.append(", isPredefined: ");
-      if (isPredefinedESet) result.append(isPredefined); else result.append("<unset>");
-      result.append(", sourceRole: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", id: "); //$NON-NLS-1$
+      if (idESet) result.append(id); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", name: "); //$NON-NLS-1$
+      if (nameESet) result.append(name); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", isPredefined: "); //$NON-NLS-1$
+      if (isPredefinedESet) result.append(isPredefined); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", sourceRole: "); //$NON-NLS-1$
       result.append(sourceRole);
-      result.append(", sourceClass: ");
+      result.append(", sourceClass: "); //$NON-NLS-1$
       result.append(sourceClass);
-      result.append(", sourceCardinality: ");
+      result.append(", sourceCardinality: "); //$NON-NLS-1$
       result.append(sourceCardinality);
-      result.append(", targetRole: ");
+      result.append(", targetRole: "); //$NON-NLS-1$
       result.append(targetRole);
-      result.append(", targetClass: ");
+      result.append(", targetClass: "); //$NON-NLS-1$
       result.append(targetClass);
-      result.append(", targetCardinality: ");
+      result.append(", targetCardinality: "); //$NON-NLS-1$
       result.append(targetCardinality);
-      result.append(", lineStyle: ");
+      result.append(", lineStyle: "); //$NON-NLS-1$
       result.append(lineStyle);
-      result.append(", lineColor: ");
+      result.append(", lineColor: "); //$NON-NLS-1$
       result.append(lineColor);
-      result.append(", sourceSymbol: ");
+      result.append(", sourceSymbol: "); //$NON-NLS-1$
       result.append(sourceSymbol);
-      result.append(", targetSymbol: ");
+      result.append(", targetSymbol: "); //$NON-NLS-1$
       result.append(targetSymbol);
-      result.append(", showRoleNames: ");
-      if (showRoleNamesESet) result.append(showRoleNames); else result.append("<unset>");
-      result.append(", showLinkTypeName: ");
-      if (showLinkTypeNameESet) result.append(showLinkTypeName); else result.append("<unset>");
+      result.append(", showRoleNames: "); //$NON-NLS-1$
+      if (showRoleNamesESet) result.append(showRoleNames); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", showLinkTypeName: "); //$NON-NLS-1$
+      if (showLinkTypeNameESet) result.append(showLinkTypeName); else result.append("<unset>"); //$NON-NLS-1$
       result.append(')');
       return result.toString();
    }
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ModelTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ModelTypeImpl.java
index 28e7c78..646c8f6 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ModelTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ModelTypeImpl.java
@@ -1733,21 +1733,21 @@ public class ModelTypeImpl extends EObjectImpl implements ModelType
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (id: ");
-      if (idESet) result.append(id); else result.append("<unset>");
-      result.append(", name: ");
-      if (nameESet) result.append(name); else result.append("<unset>");
-      result.append(", author: ");
+      result.append(" (id: "); //$NON-NLS-1$
+      if (idESet) result.append(id); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", name: "); //$NON-NLS-1$
+      if (nameESet) result.append(name); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", author: "); //$NON-NLS-1$
       result.append(author);
-      result.append(", carnotVersion: ");
+      result.append(", carnotVersion: "); //$NON-NLS-1$
       result.append(carnotVersion);
-      result.append(", created: ");
+      result.append(", created: "); //$NON-NLS-1$
       result.append(created);
-      result.append(", modelOID: ");
-      if (modelOIDESet) result.append(modelOID); else result.append("<unset>");
-      result.append(", oid: ");
-      if (oidESet) result.append(oid); else result.append("<unset>");
-      result.append(", vendor: ");
+      result.append(", modelOID: "); //$NON-NLS-1$
+      if (modelOIDESet) result.append(modelOID); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", oid: "); //$NON-NLS-1$
+      if (oidESet) result.append(oid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", vendor: "); //$NON-NLS-1$
       result.append(vendor);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ModelerTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ModelerTypeImpl.java
index bd6db94..11ea133 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ModelerTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ModelerTypeImpl.java
@@ -763,15 +763,15 @@ public class ModelerTypeImpl extends EObjectImpl implements ModelerType
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", id: ");
-      if (idESet) result.append(id); else result.append("<unset>");
-      result.append(", name: ");
-      if (nameESet) result.append(name); else result.append("<unset>");
-      result.append(", email: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", id: "); //$NON-NLS-1$
+      if (idESet) result.append(id); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", name: "); //$NON-NLS-1$
+      if (nameESet) result.append(name); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", email: "); //$NON-NLS-1$
       result.append(email);
-      result.append(", password: ");
+      result.append(", password: "); //$NON-NLS-1$
       result.append(password);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/OrganizationTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/OrganizationTypeImpl.java
index 2a254cd..42919da 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/OrganizationTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/OrganizationTypeImpl.java
@@ -885,12 +885,12 @@ public class OrganizationTypeImpl extends EObjectImpl implements OrganizationTyp
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", id: ");
-      if (idESet) result.append(id); else result.append("<unset>");
-      result.append(", name: ");
-      if (nameESet) result.append(name); else result.append("<unset>");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", id: "); //$NON-NLS-1$
+      if (idESet) result.append(id); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", name: "); //$NON-NLS-1$
+      if (nameESet) result.append(name); else result.append("<unset>"); //$NON-NLS-1$
       result.append(')');
       return result.toString();
    }
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ParameterMappingTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ParameterMappingTypeImpl.java
index 293e347..0258a89 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ParameterMappingTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ParameterMappingTypeImpl.java
@@ -485,13 +485,13 @@ public class ParameterMappingTypeImpl extends EObjectImpl implements ParameterMa
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", dataPath: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", dataPath: "); //$NON-NLS-1$
       result.append(dataPath);
-      result.append(", parameter: ");
+      result.append(", parameter: "); //$NON-NLS-1$
       result.append(parameter);
-      result.append(", parameterPath: ");
+      result.append(", parameterPath: "); //$NON-NLS-1$
       result.append(parameterPath);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/PartOfConnectionTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/PartOfConnectionTypeImpl.java
index 369d2ee..fb73fe1 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/PartOfConnectionTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/PartOfConnectionTypeImpl.java
@@ -1000,20 +1000,20 @@ public class PartOfConnectionTypeImpl extends EObjectImpl implements PartOfConne
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", borderColor: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", borderColor: "); //$NON-NLS-1$
       result.append(borderColor);
-      result.append(", fillColor: ");
+      result.append(", fillColor: "); //$NON-NLS-1$
       result.append(fillColor);
-      result.append(", style: ");
+      result.append(", style: "); //$NON-NLS-1$
       result.append(style);
-      result.append(", sourceAnchor: ");
-      if (sourceAnchorESet) result.append(sourceAnchor); else result.append("<unset>");
-      result.append(", targetAnchor: ");
-      if (targetAnchorESet) result.append(targetAnchor); else result.append("<unset>");
-      result.append(", routing: ");
-      if (routingESet) result.append(routing); else result.append("<unset>");
+      result.append(", sourceAnchor: "); //$NON-NLS-1$
+      if (sourceAnchorESet) result.append(sourceAnchor); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", targetAnchor: "); //$NON-NLS-1$
+      if (targetAnchorESet) result.append(targetAnchor); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", routing: "); //$NON-NLS-1$
+      if (routingESet) result.append(routing); else result.append("<unset>"); //$NON-NLS-1$
       result.append(')');
       return result.toString();
    }
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/PerformsConnectionTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/PerformsConnectionTypeImpl.java
index 0ebcbd4..043e2cb 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/PerformsConnectionTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/PerformsConnectionTypeImpl.java
@@ -1001,20 +1001,20 @@ public class PerformsConnectionTypeImpl extends EObjectImpl implements PerformsC
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", borderColor: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", borderColor: "); //$NON-NLS-1$
       result.append(borderColor);
-      result.append(", fillColor: ");
+      result.append(", fillColor: "); //$NON-NLS-1$
       result.append(fillColor);
-      result.append(", style: ");
+      result.append(", style: "); //$NON-NLS-1$
       result.append(style);
-      result.append(", sourceAnchor: ");
-      if (sourceAnchorESet) result.append(sourceAnchor); else result.append("<unset>");
-      result.append(", targetAnchor: ");
-      if (targetAnchorESet) result.append(targetAnchor); else result.append("<unset>");
-      result.append(", routing: ");
-      if (routingESet) result.append(routing); else result.append("<unset>");
+      result.append(", sourceAnchor: "); //$NON-NLS-1$
+      if (sourceAnchorESet) result.append(sourceAnchor); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", targetAnchor: "); //$NON-NLS-1$
+      if (targetAnchorESet) result.append(targetAnchor); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", routing: "); //$NON-NLS-1$
+      if (routingESet) result.append(routing); else result.append("<unset>"); //$NON-NLS-1$
       result.append(')');
       return result.toString();
    }
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/PoolSymbolImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/PoolSymbolImpl.java
index 0093ede..4f55b6d 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/PoolSymbolImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/PoolSymbolImpl.java
@@ -1801,33 +1801,33 @@ public class PoolSymbolImpl extends ISymbolContainerImpl implements PoolSymbol
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", borderColor: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", borderColor: "); //$NON-NLS-1$
       result.append(borderColor);
-      result.append(", fillColor: ");
+      result.append(", fillColor: "); //$NON-NLS-1$
       result.append(fillColor);
-      result.append(", style: ");
+      result.append(", style: "); //$NON-NLS-1$
       result.append(style);
-      result.append(", xPos: ");
-      if (xPosESet) result.append(xPos); else result.append("<unset>");
-      result.append(", yPos: ");
-      if (yPosESet) result.append(yPos); else result.append("<unset>");
-      result.append(", width: ");
-      if (widthESet) result.append(width); else result.append("<unset>");
-      result.append(", height: ");
-      if (heightESet) result.append(height); else result.append("<unset>");
-      result.append(", shape: ");
+      result.append(", xPos: "); //$NON-NLS-1$
+      if (xPosESet) result.append(xPos); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", yPos: "); //$NON-NLS-1$
+      if (yPosESet) result.append(yPos); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", width: "); //$NON-NLS-1$
+      if (widthESet) result.append(width); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", height: "); //$NON-NLS-1$
+      if (heightESet) result.append(height); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", shape: "); //$NON-NLS-1$
       result.append(shape);
-      result.append(", id: ");
-      if (idESet) result.append(id); else result.append("<unset>");
-      result.append(", name: ");
-      if (nameESet) result.append(name); else result.append("<unset>");
-      result.append(", orientation: ");
-      if (orientationESet) result.append(orientation); else result.append("<unset>");
-      result.append(", collapsed: ");
+      result.append(", id: "); //$NON-NLS-1$
+      if (idESet) result.append(id); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", name: "); //$NON-NLS-1$
+      if (nameESet) result.append(name); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", orientation: "); //$NON-NLS-1$
+      if (orientationESet) result.append(orientation); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", collapsed: "); //$NON-NLS-1$
       result.append(collapsed);
-      result.append(", boundaryVisible: ");
+      result.append(", boundaryVisible: "); //$NON-NLS-1$
       result.append(boundaryVisible);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ProcessDefinitionTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ProcessDefinitionTypeImpl.java
index b35bd5e..1386c54 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ProcessDefinitionTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ProcessDefinitionTypeImpl.java
@@ -1215,13 +1215,13 @@ public class ProcessDefinitionTypeImpl extends EObjectImpl implements ProcessDef
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", id: ");
-      if (idESet) result.append(id); else result.append("<unset>");
-      result.append(", name: ");
-      if (nameESet) result.append(name); else result.append("<unset>");
-      result.append(", defaultPriority: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", id: "); //$NON-NLS-1$
+      if (idESet) result.append(id); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", name: "); //$NON-NLS-1$
+      if (nameESet) result.append(name); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", defaultPriority: "); //$NON-NLS-1$
       result.append(defaultPriority);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/PublicInterfaceSymbolImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/PublicInterfaceSymbolImpl.java
index 2efc508..1f0b706 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/PublicInterfaceSymbolImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/PublicInterfaceSymbolImpl.java
@@ -32,7 +32,7 @@ public class PublicInterfaceSymbolImpl extends AbstractEventSymbolImpl implement
     * <!-- end-user-doc -->
     * @generated
     */
-   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
 
    /**
     * <!-- begin-user-doc -->
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/QualityControlTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/QualityControlTypeImpl.java
index c1c0378..a226031 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/QualityControlTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/QualityControlTypeImpl.java
@@ -44,7 +44,7 @@ public class QualityControlTypeImpl extends EObjectImpl implements QualityContro
     * <!-- end-user-doc -->
     * @generated
     */
-   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
 
    /**
     * The cached value of the '{@link #getCode() <em>Code</em>}' containment reference list.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/RefersToConnectionTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/RefersToConnectionTypeImpl.java
index 0d47126..139fff2 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/RefersToConnectionTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/RefersToConnectionTypeImpl.java
@@ -1089,20 +1089,20 @@ public class RefersToConnectionTypeImpl extends EObjectImpl
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", borderColor: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", borderColor: "); //$NON-NLS-1$
       result.append(borderColor);
-      result.append(", fillColor: ");
+      result.append(", fillColor: "); //$NON-NLS-1$
       result.append(fillColor);
-      result.append(", style: ");
+      result.append(", style: "); //$NON-NLS-1$
       result.append(style);
-      result.append(", sourceAnchor: ");
-      if (sourceAnchorESet) result.append(sourceAnchor); else result.append("<unset>");
-      result.append(", targetAnchor: ");
-      if (targetAnchorESet) result.append(targetAnchor); else result.append("<unset>");
-      result.append(", routing: ");
-      if (routingESet) result.append(routing); else result.append("<unset>");
+      result.append(", sourceAnchor: "); //$NON-NLS-1$
+      if (sourceAnchorESet) result.append(sourceAnchor); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", targetAnchor: "); //$NON-NLS-1$
+      if (targetAnchorESet) result.append(targetAnchor); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", routing: "); //$NON-NLS-1$
+      if (routingESet) result.append(routing); else result.append("<unset>"); //$NON-NLS-1$
       result.append(')');
       return result.toString();
    }
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/RoleTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/RoleTypeImpl.java
index a687e5d..6a71d4e 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/RoleTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/RoleTypeImpl.java
@@ -866,13 +866,13 @@ public class RoleTypeImpl extends EObjectImpl implements RoleType
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", id: ");
-      if (idESet) result.append(id); else result.append("<unset>");
-      result.append(", name: ");
-      if (nameESet) result.append(name); else result.append("<unset>");
-      result.append(", cardinality: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", id: "); //$NON-NLS-1$
+      if (idESet) result.append(id); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", name: "); //$NON-NLS-1$
+      if (nameESet) result.append(name); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", cardinality: "); //$NON-NLS-1$
       result.append(cardinality);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/SubProcessOfConnectionTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/SubProcessOfConnectionTypeImpl.java
index 0e16a07..d7b8f5a 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/SubProcessOfConnectionTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/SubProcessOfConnectionTypeImpl.java
@@ -1000,20 +1000,20 @@ public class SubProcessOfConnectionTypeImpl extends EObjectImpl implements SubPr
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", borderColor: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", borderColor: "); //$NON-NLS-1$
       result.append(borderColor);
-      result.append(", fillColor: ");
+      result.append(", fillColor: "); //$NON-NLS-1$
       result.append(fillColor);
-      result.append(", style: ");
+      result.append(", style: "); //$NON-NLS-1$
       result.append(style);
-      result.append(", sourceAnchor: ");
-      if (sourceAnchorESet) result.append(sourceAnchor); else result.append("<unset>");
-      result.append(", targetAnchor: ");
-      if (targetAnchorESet) result.append(targetAnchor); else result.append("<unset>");
-      result.append(", routing: ");
-      if (routingESet) result.append(routing); else result.append("<unset>");
+      result.append(", sourceAnchor: "); //$NON-NLS-1$
+      if (sourceAnchorESet) result.append(sourceAnchor); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", targetAnchor: "); //$NON-NLS-1$
+      if (targetAnchorESet) result.append(targetAnchor); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", routing: "); //$NON-NLS-1$
+      if (routingESet) result.append(routing); else result.append("<unset>"); //$NON-NLS-1$
       result.append(')');
       return result.toString();
    }
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/TeamLeadConnectionTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/TeamLeadConnectionTypeImpl.java
index 578f8df..6e8588b 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/TeamLeadConnectionTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/TeamLeadConnectionTypeImpl.java
@@ -63,7 +63,7 @@ public class TeamLeadConnectionTypeImpl extends EObjectImpl implements TeamLeadC
     * <!-- end-user-doc -->
     * @generated
     */
-   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
 
    /**
     * The default value of the '{@link #getElementOid() <em>Element Oid</em>}' attribute.
@@ -182,7 +182,7 @@ public class TeamLeadConnectionTypeImpl extends EObjectImpl implements TeamLeadC
     * @generated
     * @ordered
     */
-   protected static final String SOURCE_ANCHOR_EDEFAULT = "center";
+   protected static final String SOURCE_ANCHOR_EDEFAULT = "center"; //$NON-NLS-1$
 
    /**
     * The cached value of the '{@link #getSourceAnchor() <em>Source Anchor</em>}' attribute.
@@ -211,7 +211,7 @@ public class TeamLeadConnectionTypeImpl extends EObjectImpl implements TeamLeadC
     * @generated
     * @ordered
     */
-   protected static final String TARGET_ANCHOR_EDEFAULT = "center";
+   protected static final String TARGET_ANCHOR_EDEFAULT = "center"; //$NON-NLS-1$
 
    /**
     * The cached value of the '{@link #getTargetAnchor() <em>Target Anchor</em>}' attribute.
@@ -1001,20 +1001,20 @@ public class TeamLeadConnectionTypeImpl extends EObjectImpl implements TeamLeadC
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", borderColor: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", borderColor: "); //$NON-NLS-1$
       result.append(borderColor);
-      result.append(", fillColor: ");
+      result.append(", fillColor: "); //$NON-NLS-1$
       result.append(fillColor);
-      result.append(", style: ");
+      result.append(", style: "); //$NON-NLS-1$
       result.append(style);
-      result.append(", sourceAnchor: ");
-      if (sourceAnchorESet) result.append(sourceAnchor); else result.append("<unset>");
-      result.append(", targetAnchor: ");
-      if (targetAnchorESet) result.append(targetAnchor); else result.append("<unset>");
-      result.append(", routing: ");
-      if (routingESet) result.append(routing); else result.append("<unset>");
+      result.append(", sourceAnchor: "); //$NON-NLS-1$
+      if (sourceAnchorESet) result.append(sourceAnchor); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", targetAnchor: "); //$NON-NLS-1$
+      if (targetAnchorESet) result.append(targetAnchor); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", routing: "); //$NON-NLS-1$
+      if (routingESet) result.append(routing); else result.append("<unset>"); //$NON-NLS-1$
       result.append(')');
       return result.toString();
    }
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/TextSymbolTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/TextSymbolTypeImpl.java
index 9c2f01f..ebe7f92 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/TextSymbolTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/TextSymbolTypeImpl.java
@@ -1067,25 +1067,25 @@ public class TextSymbolTypeImpl extends EObjectImpl implements TextSymbolType
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", borderColor: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", borderColor: "); //$NON-NLS-1$
       result.append(borderColor);
-      result.append(", fillColor: ");
+      result.append(", fillColor: "); //$NON-NLS-1$
       result.append(fillColor);
-      result.append(", style: ");
+      result.append(", style: "); //$NON-NLS-1$
       result.append(style);
-      result.append(", xPos: ");
-      if (xPosESet) result.append(xPos); else result.append("<unset>");
-      result.append(", yPos: ");
-      if (yPosESet) result.append(yPos); else result.append("<unset>");
-      result.append(", width: ");
-      if (widthESet) result.append(width); else result.append("<unset>");
-      result.append(", height: ");
-      if (heightESet) result.append(height); else result.append("<unset>");
-      result.append(", shape: ");
+      result.append(", xPos: "); //$NON-NLS-1$
+      if (xPosESet) result.append(xPos); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", yPos: "); //$NON-NLS-1$
+      if (yPosESet) result.append(yPos); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", width: "); //$NON-NLS-1$
+      if (widthESet) result.append(width); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", height: "); //$NON-NLS-1$
+      if (heightESet) result.append(height); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", shape: "); //$NON-NLS-1$
       result.append(shape);
-      result.append(", text: ");
+      result.append(", text: "); //$NON-NLS-1$
       result.append(text);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/TextTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/TextTypeImpl.java
index 73852ab..606f999 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/TextTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/TextTypeImpl.java
@@ -182,7 +182,7 @@ public class TextTypeImpl extends EObjectImpl implements TextType
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (mixed: ");
+      result.append(" (mixed: "); //$NON-NLS-1$
       result.append(mixed);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/TransitionConnectionTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/TransitionConnectionTypeImpl.java
index 4cd9529..b70f2a9 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/TransitionConnectionTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/TransitionConnectionTypeImpl.java
@@ -1130,21 +1130,21 @@ public class TransitionConnectionTypeImpl extends EObjectImpl implements Transit
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", borderColor: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", borderColor: "); //$NON-NLS-1$
       result.append(borderColor);
-      result.append(", fillColor: ");
+      result.append(", fillColor: "); //$NON-NLS-1$
       result.append(fillColor);
-      result.append(", style: ");
+      result.append(", style: "); //$NON-NLS-1$
       result.append(style);
-      result.append(", sourceAnchor: ");
-      if (sourceAnchorESet) result.append(sourceAnchor); else result.append("<unset>");
-      result.append(", targetAnchor: ");
-      if (targetAnchorESet) result.append(targetAnchor); else result.append("<unset>");
-      result.append(", routing: ");
-      if (routingESet) result.append(routing); else result.append("<unset>");
-      result.append(", points: ");
+      result.append(", sourceAnchor: "); //$NON-NLS-1$
+      if (sourceAnchorESet) result.append(sourceAnchor); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", targetAnchor: "); //$NON-NLS-1$
+      if (targetAnchorESet) result.append(targetAnchor); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", routing: "); //$NON-NLS-1$
+      if (routingESet) result.append(routing); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", points: "); //$NON-NLS-1$
       result.append(points);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/TransitionTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/TransitionTypeImpl.java
index 228bf54..87099a2 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/TransitionTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/TransitionTypeImpl.java
@@ -1022,16 +1022,16 @@ public class TransitionTypeImpl extends EObjectImpl implements TransitionType
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", id: ");
-      if (idESet) result.append(id); else result.append("<unset>");
-      result.append(", name: ");
-      if (nameESet) result.append(name); else result.append("<unset>");
-      result.append(", condition: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", id: "); //$NON-NLS-1$
+      if (idESet) result.append(id); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", name: "); //$NON-NLS-1$
+      if (nameESet) result.append(name); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", condition: "); //$NON-NLS-1$
       result.append(condition);
-      result.append(", forkOnTraversal: ");
-      if (forkOnTraversalESet) result.append(forkOnTraversal); else result.append("<unset>");
+      result.append(", forkOnTraversal: "); //$NON-NLS-1$
+      if (forkOnTraversalESet) result.append(forkOnTraversal); else result.append("<unset>"); //$NON-NLS-1$
       result.append(')');
       return result.toString();
    }
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/TriggerTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/TriggerTypeImpl.java
index 9863f08..a16b8f0 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/TriggerTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/TriggerTypeImpl.java
@@ -852,12 +852,12 @@ public class TriggerTypeImpl extends EObjectImpl implements TriggerType
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", id: ");
-      if (idESet) result.append(id); else result.append("<unset>");
-      result.append(", name: ");
-      if (nameESet) result.append(name); else result.append("<unset>");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", id: "); //$NON-NLS-1$
+      if (idESet) result.append(id); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", name: "); //$NON-NLS-1$
+      if (nameESet) result.append(name); else result.append("<unset>"); //$NON-NLS-1$
       result.append(')');
       return result.toString();
    }
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/TriggerTypeTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/TriggerTypeTypeImpl.java
index 9e504b6..c208a78 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/TriggerTypeTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/TriggerTypeTypeImpl.java
@@ -1021,21 +1021,21 @@ public class TriggerTypeTypeImpl extends EObjectImpl implements TriggerTypeType
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", id: ");
-      if (idESet) result.append(id); else result.append("<unset>");
-      result.append(", name: ");
-      if (nameESet) result.append(name); else result.append("<unset>");
-      result.append(", isPredefined: ");
-      if (isPredefinedESet) result.append(isPredefined); else result.append("<unset>");
-      result.append(", panelClass: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", id: "); //$NON-NLS-1$
+      if (idESet) result.append(id); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", name: "); //$NON-NLS-1$
+      if (nameESet) result.append(name); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", isPredefined: "); //$NON-NLS-1$
+      if (isPredefinedESet) result.append(isPredefined); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", panelClass: "); //$NON-NLS-1$
       result.append(panelClass);
-      result.append(", pullTrigger: ");
-      if (pullTriggerESet) result.append(pullTrigger); else result.append("<unset>");
-      result.append(", pullTriggerEvaluator: ");
+      result.append(", pullTrigger: "); //$NON-NLS-1$
+      if (pullTriggerESet) result.append(pullTrigger); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", pullTriggerEvaluator: "); //$NON-NLS-1$
       result.append(pullTriggerEvaluator);
-      result.append(", rule: ");
+      result.append(", rule: "); //$NON-NLS-1$
       result.append(rule);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/TriggersConnectionTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/TriggersConnectionTypeImpl.java
index 22c7c57..8dd0280 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/TriggersConnectionTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/TriggersConnectionTypeImpl.java
@@ -63,7 +63,7 @@ public class TriggersConnectionTypeImpl extends EObjectImpl implements TriggersC
     * <!-- end-user-doc -->
     * @generated
     */
-   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
 
    /**
     * The default value of the '{@link #getElementOid() <em>Element Oid</em>}' attribute.
@@ -182,7 +182,7 @@ public class TriggersConnectionTypeImpl extends EObjectImpl implements TriggersC
     * @generated
     * @ordered
     */
-   protected static final String SOURCE_ANCHOR_EDEFAULT = "center";
+   protected static final String SOURCE_ANCHOR_EDEFAULT = "center"; //$NON-NLS-1$
 
    /**
     * The cached value of the '{@link #getSourceAnchor() <em>Source Anchor</em>}' attribute.
@@ -211,7 +211,7 @@ public class TriggersConnectionTypeImpl extends EObjectImpl implements TriggersC
     * @generated
     * @ordered
     */
-   protected static final String TARGET_ANCHOR_EDEFAULT = "center";
+   protected static final String TARGET_ANCHOR_EDEFAULT = "center"; //$NON-NLS-1$
 
    /**
     * The cached value of the '{@link #getTargetAnchor() <em>Target Anchor</em>}' attribute.
@@ -1001,20 +1001,20 @@ public class TriggersConnectionTypeImpl extends EObjectImpl implements TriggersC
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", borderColor: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", borderColor: "); //$NON-NLS-1$
       result.append(borderColor);
-      result.append(", fillColor: ");
+      result.append(", fillColor: "); //$NON-NLS-1$
       result.append(fillColor);
-      result.append(", style: ");
+      result.append(", style: "); //$NON-NLS-1$
       result.append(style);
-      result.append(", sourceAnchor: ");
-      if (sourceAnchorESet) result.append(sourceAnchor); else result.append("<unset>");
-      result.append(", targetAnchor: ");
-      if (targetAnchorESet) result.append(targetAnchor); else result.append("<unset>");
-      result.append(", routing: ");
-      if (routingESet) result.append(routing); else result.append("<unset>");
+      result.append(", sourceAnchor: "); //$NON-NLS-1$
+      if (sourceAnchorESet) result.append(sourceAnchor); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", targetAnchor: "); //$NON-NLS-1$
+      if (targetAnchorESet) result.append(targetAnchor); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", routing: "); //$NON-NLS-1$
+      if (routingESet) result.append(routing); else result.append("<unset>"); //$NON-NLS-1$
       result.append(')');
       return result.toString();
    }
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ViewTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ViewTypeImpl.java
index 8f1a59a..8874202 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ViewTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/ViewTypeImpl.java
@@ -520,9 +520,9 @@ public class ViewTypeImpl extends EObjectImpl implements ViewType
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", name: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", name: "); //$NON-NLS-1$
       result.append(name);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/WorksForConnectionTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/WorksForConnectionTypeImpl.java
index d7b5126..19187c6 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/WorksForConnectionTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/WorksForConnectionTypeImpl.java
@@ -1001,20 +1001,20 @@ public class WorksForConnectionTypeImpl extends EObjectImpl implements WorksForC
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (elementOid: ");
-      if (elementOidESet) result.append(elementOid); else result.append("<unset>");
-      result.append(", borderColor: ");
+      result.append(" (elementOid: "); //$NON-NLS-1$
+      if (elementOidESet) result.append(elementOid); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", borderColor: "); //$NON-NLS-1$
       result.append(borderColor);
-      result.append(", fillColor: ");
+      result.append(", fillColor: "); //$NON-NLS-1$
       result.append(fillColor);
-      result.append(", style: ");
+      result.append(", style: "); //$NON-NLS-1$
       result.append(style);
-      result.append(", sourceAnchor: ");
-      if (sourceAnchorESet) result.append(sourceAnchor); else result.append("<unset>");
-      result.append(", targetAnchor: ");
-      if (targetAnchorESet) result.append(targetAnchor); else result.append("<unset>");
-      result.append(", routing: ");
-      if (routingESet) result.append(routing); else result.append("<unset>");
+      result.append(", sourceAnchor: "); //$NON-NLS-1$
+      if (sourceAnchorESet) result.append(sourceAnchor); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", targetAnchor: "); //$NON-NLS-1$
+      if (targetAnchorESet) result.append(targetAnchor); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", routing: "); //$NON-NLS-1$
+      if (routingESet) result.append(routing); else result.append("<unset>"); //$NON-NLS-1$
       result.append(')');
       return result.toString();
    }
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/XmlTextNodeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/XmlTextNodeImpl.java
index 40a3def..9c9457d 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/XmlTextNodeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/XmlTextNodeImpl.java
@@ -182,7 +182,7 @@ public class XmlTextNodeImpl extends EObjectImpl implements XmlTextNode
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (mixed: ");
+      result.append(" (mixed: "); //$NON-NLS-1$
       result.append(mixed);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/model-messages.properties b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/model-messages.properties
index 973465f..3931f81 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/model-messages.properties
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/model-messages.properties
@@ -38,3 +38,4 @@ SYNC_SHARED=Synchronous / Shared Data
 SYNC_SEPARATE=Synchronous / Separate Data
 ASYNC_SEPARATE=Asynchronous / Separate Data
 NEW_ENTRY=<New Entry>
+EXC_FAILED_INSTANTIATING_EXTENSION=Failed instantiating extension:
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/model_messages.properties b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/model_messages.properties
deleted file mode 100644
index 0183479..0000000
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/model_messages.properties
+++ b/dev/null
@@ -1,22 +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_DATATYPE_NOT_VALID=The datatype '{0}' is not a valid classifier
-MSG_FAILED_LOADING_MODEL=Failed loading workflow model.
-MSG_INVALID_JAXP_SETUP=Invalid JAXP setup
-MSG_ATTRIBUTE_EXISTS=Attribute with id {0} already exists.
-MSG_CLASS_NOT_VALID=The class '{0}' is not a valid classifier
-MSG_NO_VALID_ENUMERATION=The value '{0}' is not a valid enumerator of '{1}'
-MSG_UNABLE_TO_FIND_XPDL_IMPORT=Unable to find XPDL import stylesheet.
-MSG_UNABLE_TO_LOAD_XPDL_IMPORT=Unable to load XPDL import stylesheet
-MSG_ATTRIBUTE_CATEGORY_EXISTS=AttributeCategory with id {0} already exists.
-MSG_WARN=Warning
-MSG_ERR=Error
-MSG_FATAL_ERR=Fatal Error
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/spi/SpiExtensionRegistry.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/spi/SpiExtensionRegistry.java
index ecc2377..4060805 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/spi/SpiExtensionRegistry.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/spi/SpiExtensionRegistry.java
@@ -40,7 +40,7 @@ import org.osgi.framework.Bundle;
  */
 public class SpiExtensionRegistry
 {
-   public static final String FEATURE_PREFIX = "feature:";
+   public static final String FEATURE_PREFIX = "feature:"; //$NON-NLS-1$
 
    private static SpiExtensionRegistry instance;
 
@@ -64,7 +64,7 @@ public class SpiExtensionRegistry
 
    public Map<String, IConfigurationElement> getExtensions(String packageName, String extensionPointId)
    {
-      String expandedId = packageName + "." + extensionPointId;
+      String expandedId = packageName + "." + extensionPointId; //$NON-NLS-1$
       Map<String, IConfigurationElement> extensions = registry.get(expandedId);
       if (extensions == null)
       {
@@ -82,7 +82,7 @@ public class SpiExtensionRegistry
    
    public List<IConfigurationElement> getExtensionList(String packageName, String extensionPointId)
    {
-      String expandedId = packageName + "." + extensionPointId;
+      String expandedId = packageName + "." + extensionPointId; //$NON-NLS-1$
       List<IConfigurationElement> extensions = CollectionUtils.newList();
       try
       {
@@ -157,8 +157,8 @@ public class SpiExtensionRegistry
     */
    public static Object createPropertyPage(String pageId, String metaType)
    {
-      return createExecutableExtension("org.eclipse.ui.propertyPages", "class", pageId,
-            "filter", "metaType", metaType);
+      return createExecutableExtension("org.eclipse.ui.propertyPages", "class", pageId, //$NON-NLS-1$ //$NON-NLS-2$
+            "filter", "metaType", metaType); //$NON-NLS-1$ //$NON-NLS-2$
    }
 
    public static Object createExecutableExtension(String extensionId,
@@ -411,7 +411,7 @@ public class SpiExtensionRegistry
 
    private static Object getFeatureValue(EObject element, String featureName)
    {
-      String[] featureNames = featureName.split("\\.");
+      String[] featureNames = featureName.split("\\."); //$NON-NLS-1$
       if(featureNames.length > 1)
       {
          String first = featureNames[0];
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/ActionTypeUtil.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/ActionTypeUtil.java
index e5d3bf7..03d9c3c 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/ActionTypeUtil.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/ActionTypeUtil.java
@@ -162,7 +162,7 @@ public class ActionTypeUtil
 
    private static boolean getBoolean(IConfigurationElement action, String attName)
    {
-	  return "true".equalsIgnoreCase(action.getAttribute(attName));
+	  return "true".equalsIgnoreCase(action.getAttribute(attName)); //$NON-NLS-1$
    }
 
    public static boolean isAction(Object selection)
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/AttributeUtil.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/AttributeUtil.java
index b4a78c3..c2f20d7 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/AttributeUtil.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/AttributeUtil.java
@@ -299,10 +299,10 @@ public class AttributeUtil
       IConfigurationElement config = SpiExtensionRegistry.getConfiguration(element);
       if (config != null)
       {
-         IConfigurationElement[] refs = config.getChildren("reference");
+         IConfigurationElement[] refs = config.getChildren("reference"); //$NON-NLS-1$
          for (int k = 0; k < refs.length; k++)
          {
-            if (feature.equals(refs[k].getAttribute("attributeName")))
+            if (feature.equals(refs[k].getAttribute("attributeName"))) //$NON-NLS-1$
             {
                return true;
             }
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/CarnotConstants.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/CarnotConstants.java
index f170bdb..bc98ec7 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/CarnotConstants.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/CarnotConstants.java
@@ -114,9 +114,9 @@ public interface CarnotConstants
    String SEND_MAIL_ACTION_ID = PredefinedConstants.MAIL_ACTION;
    String EXCLUDE_USER_ACTION_ID = PredefinedConstants.EXCLUDE_USER_ACTION;
    String DATA_TYPE_HINT_ATT = ENGINE_SCOPE + "typeHint"; //$NON-NLS-1$
-   String NUMERIC_HINT = "numeric";
-   String COMPLEX_HINT = "complex";
-   String TEXT_HINT = "text";
+   String NUMERIC_HINT = "numeric"; //$NON-NLS-1$
+   String COMPLEX_HINT = "complex"; //$NON-NLS-1$
+   String TEXT_HINT = "text"; //$NON-NLS-1$
    
    String AUTO_ID_GENERATION = "auto_id_generation"; //$NON-NLS-1$   
 }
 \ No newline at end of file
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/CarnotWorkflowModelXMLProcessor.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/CarnotWorkflowModelXMLProcessor.java
index c08e019..e7efe9c 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/CarnotWorkflowModelXMLProcessor.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/CarnotWorkflowModelXMLProcessor.java
@@ -31,7 +31,7 @@ public class CarnotWorkflowModelXMLProcessor extends XMLProcessor
     * <!-- end-user-doc -->
     * @generated
     */
-   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH";
+   public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
 
 
    /**
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/CwmXmlHandler.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/CwmXmlHandler.java
index a52e732..4393833 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/CwmXmlHandler.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/CwmXmlHandler.java
@@ -59,15 +59,15 @@ import org.xml.sax.SAXException;
 
 public class CwmXmlHandler extends SAXXMLHandler
 {
-   private static final String STOPPER = "__stopper__";
+   private static final String STOPPER = "__stopper__"; //$NON-NLS-1$
 
    private static final CarnotWorkflowModelPackage CWM_PKG = CarnotWorkflowModelPackage.eINSTANCE;
    private static final XpdlPackage XPDL_PKG = XpdlPackage.eINSTANCE;
    
    // MUST be kept in ascending order
    private static final String[] SCHEMA_KEYWORDS_45 = {
-      "complexType", "element", "enumeration",
-      "restriction", "schema", "sequence", "simpleType"};
+      "complexType", "element", "enumeration", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+      "restriction", "schema", "sequence", "simpleType"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
    
    private boolean isSchemaKeyword45(String name)
    {
@@ -415,7 +415,7 @@ public class CwmXmlHandler extends SAXXMLHandler
    private String getPrefix(String name)
    {
       int ix = name.indexOf(':');
-      return ix < 0 ? "" : name.substring(0, ix);
+      return ix < 0 ? "" : name.substring(0, ix); //$NON-NLS-1$
    }
 
    private boolean isSchemaElement(String uri, String prefix)
@@ -448,7 +448,7 @@ public class CwmXmlHandler extends SAXXMLHandler
          return null;
       }
       String uri = helper.getURI(prefix);
-      return uri == null ? "" : uri;
+      return uri == null ? "" : uri; //$NON-NLS-1$
    }
 
    private void handleNamespaces()
@@ -457,10 +457,10 @@ public class CwmXmlHandler extends SAXXMLHandler
       for (int i = 0, size = attribs.getLength(); i < size; ++i)
       {
         String attrib = attribs.getQName(i);
-        if (attrib.equals(XMLResource.XML_NS) || attrib.startsWith(XMLResource.XML_NS + ":"))
+        if (attrib.equals(XMLResource.XML_NS) || attrib.startsWith(XMLResource.XML_NS + ":")) //$NON-NLS-1$
         {
            int ix = attrib.indexOf(':');
-           String prefix = ix < 0 ? "" : attrib.substring(ix + 1);
+           String prefix = ix < 0 ? "" : attrib.substring(ix + 1); //$NON-NLS-1$
            current.put(prefix, attribs.getValue(i));
         }
       }
@@ -595,7 +595,7 @@ public class CwmXmlHandler extends SAXXMLHandler
                || systemId.endsWith(XMLConstants.DTD_NAME))
          {
             // strip old DTD (not doing so would include the DTD inline on save)
-            return new InputSource(new StringReader(""));
+            return new InputSource(new StringReader("")); //$NON-NLS-1$
          }
          else if (XMLConstants.WORKFLOWMODEL_31_XSD_URL.equals(systemId)
                || systemId.endsWith(XMLConstants.WORKFLOWMODEL_XSD))
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/CwmXmlSave.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/CwmXmlSave.java
index 89f7774..0d653ef 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/CwmXmlSave.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/CwmXmlSave.java
@@ -147,7 +147,7 @@ public class CwmXmlSave extends XMLSaveImpl
       {
          if (helper.getResource() != null)
          {
-            if (helper.getResource().getURI().toString().endsWith(".cwm"))
+            if (helper.getResource().getURI().toString().endsWith(".cwm")) //$NON-NLS-1$
             {
                if (eObjectToExtensionMap != null)
                {
@@ -161,9 +161,9 @@ public class CwmXmlSave extends XMLSaveImpl
                         if (o instanceof SimpleFeatureMapEntry)
                         {
                            SimpleFeatureMapEntry s = (SimpleFeatureMapEntry) o;
-                           if (s.getEStructuralFeature().getName().equalsIgnoreCase("xmlns"))
+                           if (s.getEStructuralFeature().getName().equalsIgnoreCase("xmlns")) //$NON-NLS-1$
                            {
-                              if (s.getValue().equals("http://www.carnot.ag/workflowmodel/3.1"))
+                              if (s.getValue().equals("http://www.carnot.ag/workflowmodel/3.1")) //$NON-NLS-1$
                               {
                                  toBeRemoved = s;
                               }
@@ -272,7 +272,7 @@ public class CwmXmlSave extends XMLSaveImpl
       }
       if (end < 0)
       {
-         return "";
+         return ""; //$NON-NLS-1$
       }
       while (begin < end && Character.isWhitespace(value.charAt(begin)))
       {
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/DiagramUtil.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/DiagramUtil.java
index af72f3d..816284a 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/DiagramUtil.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/DiagramUtil.java
@@ -149,15 +149,15 @@ public class DiagramUtil
 
    public static boolean isDefaultPool(ISwimlaneSymbol pool)
    {
-      return pool instanceof PoolSymbol && "_default_pool__1".equals(pool.getId())
+      return pool instanceof PoolSymbol && "_default_pool__1".equals(pool.getId()) //$NON-NLS-1$
          && pool.eContainer().eContainer() instanceof ProcessDefinitionType;
    }
 
    public static PoolSymbol createDefaultPool(DiagramType diagram)
    {
       PoolSymbol pool = CarnotWorkflowModelFactory.eINSTANCE.createPoolSymbol();
-      pool.setId("_default_pool__1");
-      pool.setName("Default Pool");
+      pool.setId("_default_pool__1"); //$NON-NLS-1$
+      pool.setName("Default Pool"); //$NON-NLS-1$
       pool.setXPos(0);
       pool.setYPos(0);
       pool.setWidth(-1);
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/ElUtils.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/ElUtils.java
index 0d7f979..ef7061a 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/ElUtils.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/ElUtils.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.stardust.model.xpdl.carnot.util;
 
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -29,6 +30,7 @@ import org.eclipse.stardust.engine.core.compatibility.el.SyntaxError;
 import org.eclipse.stardust.engine.core.compatibility.el.ValueExpression;
 import org.eclipse.stardust.model.xpdl.carnot.DataType;
 import org.eclipse.stardust.model.xpdl.carnot.ModelType;
+import org.eclipse.stardust.model.xpdl.carnot.Model_Messages;
 import org.eclipse.stardust.model.xpdl.carnot.ProcessDefinitionType;
 import org.eclipse.stardust.model.xpdl.carnot.TransitionType;
 
@@ -66,32 +68,32 @@ public class ElUtils
 
    public static BooleanExpression getLhsExpression(CombineOperation term)
    {
-      return (BooleanExpression) Reflect.getFieldValue(term, "lhsExpression");
+      return (BooleanExpression) Reflect.getFieldValue(term, "lhsExpression"); //$NON-NLS-1$
    }
 
    public static BooleanExpression getRhsExpression(CombineOperation term)
    {
-      return (BooleanExpression) Reflect.getFieldValue(term, "rhsExpression");
+      return (BooleanExpression) Reflect.getFieldValue(term, "rhsExpression"); //$NON-NLS-1$
    }
 
    public static ValueExpression getLhsOperand(ComparisonOperation term)
    {
-      return (ValueExpression) Reflect.getFieldValue(term, "lhsValue");
+      return (ValueExpression) Reflect.getFieldValue(term, "lhsValue"); //$NON-NLS-1$
    }
 
    public static ValueExpression getRhsOperand(ComparisonOperation term)
    {
-      return (ValueExpression) Reflect.getFieldValue(term, "rhsValue");
+      return (ValueExpression) Reflect.getFieldValue(term, "rhsValue"); //$NON-NLS-1$
    }
 
    public static String getDataId(DereferencePath derefExpression)
    {
-      return (String) Reflect.getFieldValue(derefExpression, "baseReference");
+      return (String) Reflect.getFieldValue(derefExpression, "baseReference"); //$NON-NLS-1$
    }
 
    public static String getDerefExpression(DereferencePath derefExpression)
    {
-      return (String) Reflect.getFieldValue(derefExpression, "accessPath");
+      return (String) Reflect.getFieldValue(derefExpression, "accessPath"); //$NON-NLS-1$
    }
 
    private static void xrefData(BooleanExpression expression,
@@ -113,7 +115,7 @@ public class ElUtils
       }
       else
       {
-         throw new InternalException("Unsupported boolean expression: " + expression);
+         throw new InternalException(MessageFormat.format(Model_Messages.EXC_UNSUPPORTED_BOOLEAN_EXPRESSION_NULL, new Object[]{expression}));
       }
    }
 
@@ -138,7 +140,7 @@ public class ElUtils
       }
       else
       {
-         throw new InternalException("Unsupported boolean expression: " + expression);
+    	  throw new InternalException(MessageFormat.format(Model_Messages.EXC_UNSUPPORTED_BOOLEAN_EXPRESSION_NULL, new Object[]{expression}));
       }
    }
    
@@ -158,7 +160,7 @@ public class ElUtils
 
          Parser p = new Parser(compilerEnv, compilationErrorReporter);
 
-         return p.parse(expression, "expression", 1);
+         return p.parse(expression, "expression", 1); //$NON-NLS-1$
       }
       finally
       {
@@ -181,7 +183,7 @@ public class ElUtils
          {
             if (Token.ENTERWITH == astNode.getType())
             {
-               throw new UnsupportedElSyntaxException("'with (..)' is not supported.");
+               throw new UnsupportedElSyntaxException(Model_Messages.EXC_WITH_IS_NOT_SUPPORTED);
             }
             else if (Token.NAME == astNode.getType())
             {
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/StructuredTypeUtils.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/StructuredTypeUtils.java
index 214f022..96a6a80 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/StructuredTypeUtils.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/StructuredTypeUtils.java
@@ -11,6 +11,7 @@
 package org.eclipse.stardust.model.xpdl.carnot.util;
 
 import java.io.IOException;
+import java.text.MessageFormat;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -40,6 +41,7 @@ import org.eclipse.stardust.engine.extensions.dms.data.emfxsd.DmsSchemaProvider;
 import org.eclipse.stardust.model.xpdl.carnot.DataType;
 import org.eclipse.stardust.model.xpdl.carnot.IExtensibleElement;
 import org.eclipse.stardust.model.xpdl.carnot.ModelType;
+import org.eclipse.stardust.model.xpdl.carnot.Model_Messages;
 import org.eclipse.stardust.model.xpdl.util.IConnectionManager;
 import org.eclipse.stardust.model.xpdl.xpdl2.ExternalPackage;
 import org.eclipse.stardust.model.xpdl.xpdl2.ExternalPackages;
@@ -58,7 +60,7 @@ import org.eclipse.xsd.XSDSchema;
  */
 public class StructuredTypeUtils
 {
-   public static final Pattern TRANSFORMATION_PATTERN = Pattern.compile("(DOM) *\\((.*)\\)");
+   public static final Pattern TRANSFORMATION_PATTERN = Pattern.compile("(DOM) *\\((.*)\\)"); //$NON-NLS-1$
    
    public static IXPathMap getXPathMap(DataType data)
    {
@@ -69,8 +71,8 @@ public class StructuredTypeUtils
          TypeDeclarationType typeDeclarationType = getTypeDeclaration(data);
          if (typeDeclarationType == null)
          {
-            throw new PublicException("No type declaration specified for data '"
-               + data.getId() + "'.");
+        	 String message = Model_Messages.EXC_NO_TYPE_DECLARATION_SPECIFIED_FOR_DATA_NULL;
+            throw new PublicException( MessageFormat.format(message, new Object[]{data.getId()}));
          }
          return getXPathMap(typeDeclarationType);
       }
@@ -104,9 +106,8 @@ public class StructuredTypeUtils
                }
             }
          }
-         throw new InternalException("Could not find predefined XPaths for data type '"
-               + dataTypeId
-               + "'. Check if schema providers are configured correctly.");
+         String message = Model_Messages.EXC_COULD_NOT_FIND_PREDEFINED_XPATHS_FOR_DATA_TYPE_NULL;
+         throw new InternalException(MessageFormat.format(message, new Object[]{dataTypeId}));
       }
    }
 
@@ -169,10 +170,10 @@ public class StructuredTypeUtils
          allXPaths = XPathFinder.findAllXPaths(schema, component);
       }
       else
-      {
-         throw new RuntimeException(
-               "Neither external reference not schema type is set in the type declaration for '"
-                     + typeDeclaration.getId() + "'.");
+      {	
+    	  String message = Model_Messages.EXC_NEITHER_EXTERNAL_REFERENCE_NOR_SCHEME_TYPE_IS_SET_FOR_NULL;
+         throw new RuntimeException(MessageFormat.format(message, new Object[]{typeDeclaration.getId()}));
+         
       }
       return new ClientXPathMap(allXPaths);
    }
@@ -185,7 +186,7 @@ public class StructuredTypeUtils
       options.put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
        
       resourceSet.setURIConverter(new ClasspathUriConverter());
-      Resource resource = resourceSet.createResource(URI.createURI(ClasspathUriConverter.CLASSPATH_SCHEME+":/"+schemaLocation));
+      Resource resource = resourceSet.createResource(URI.createURI(ClasspathUriConverter.CLASSPATH_SCHEME+":/"+schemaLocation)); //$NON-NLS-1$
       try
       {
          resource.load(options);
@@ -211,8 +212,8 @@ public class StructuredTypeUtils
       {
          AttributeUtil.setAttribute(accessPoint, StructuredDataConstants.TRANSFORMATION_ATT, transformationType);
       }
-      AttributeUtil.setAttribute(accessPoint, "carnot:engine:path:separator", StructuredDataConstants.ACCESS_PATH_SEGMENT_SEPARATOR); 
-      AttributeUtil.setBooleanAttribute(accessPoint, "carnot:engine:data:bidirectional", true);
+      AttributeUtil.setAttribute(accessPoint, "carnot:engine:path:separator", StructuredDataConstants.ACCESS_PATH_SEGMENT_SEPARATOR);  //$NON-NLS-1$
+      AttributeUtil.setBooleanAttribute(accessPoint, "carnot:engine:data:bidirectional", true); //$NON-NLS-1$
    }
    
    public static boolean isValidDomAccessPath(DataType dataType, String accessPath)
@@ -229,7 +230,7 @@ public class StructuredTypeUtils
    {
       TypeDeclarationType typeDeclaration = XpdlFactory.eINSTANCE
             .createTypeDeclarationType();
-      typeDeclaration.setName("<default>");
+      typeDeclaration.setName("<default>"); //$NON-NLS-1$
       typeDeclaration.setId(DmsSchemaProvider.RESOURCE_PROPERTY_COMPLEX_TYPE_NAME);
       SchemaTypeType schemaType = XpdlFactory.eINSTANCE.createSchemaTypeType();
       schemaType.setSchema(StructuredTypeUtils
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/VariableContext.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/VariableContext.java
index e432d9d..377dac6 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/VariableContext.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/VariableContext.java
@@ -39,7 +39,7 @@ public class VariableContext
 
    private Map<String, Map<EObject, String>> elementReferences = new HashMap<String, Map<EObject, String>>();
 
-   private Pattern pattern = Pattern.compile("(\\$\\{[^{}]+\\})");
+   private Pattern pattern = Pattern.compile("(\\$\\{[^{}]+\\})"); //$NON-NLS-1$
    
    private ModelType model;
    
@@ -63,7 +63,7 @@ public class VariableContext
          while (i <= attributes.size() - 1)
          {
             AttributeType attribute = attributes.get(i);
-            if (attribute.getName().startsWith("ipp:variables"))
+            if (attribute.getName().startsWith("ipp:variables")) //$NON-NLS-1$
             {
                int variableIndex = getIndex(attribute.getName());
                ModelVariable modelVariable = createModelVariable(attribute);
@@ -121,25 +121,25 @@ public class VariableContext
       if (!modelVariable.isRemoved())
       {
          String saveName = modelVariable.getName().substring(2, modelVariable.getName().length() - 1);
-         AttributeUtil.setAttribute((IExtensibleElement) model, "ipp:variables[" + j
-               + "]:name", "String", saveName);
+         AttributeUtil.setAttribute((IExtensibleElement) model, "ipp:variables[" + j //$NON-NLS-1$
+               + "]:name", "String", saveName); //$NON-NLS-1$ //$NON-NLS-2$
 
-         AttributeUtil.setAttribute((IExtensibleElement) model, "ipp:variables[" + j
-               + "]:defaultValue", "String", modelVariable.getDefaultValue());
+         AttributeUtil.setAttribute((IExtensibleElement) model, "ipp:variables[" + j //$NON-NLS-1$
+               + "]:defaultValue", "String", modelVariable.getDefaultValue()); //$NON-NLS-1$ //$NON-NLS-2$
 
-         AttributeUtil.setAttribute((IExtensibleElement) model, "ipp:variables[" + j
-               + "]:description", "String", modelVariable.getDescription());
+         AttributeUtil.setAttribute((IExtensibleElement) model, "ipp:variables[" + j //$NON-NLS-1$
+               + "]:description", "String", modelVariable.getDescription()); //$NON-NLS-1$ //$NON-NLS-2$
       }
    }
    
    private void removeAttributeSet(ModelVariable modelVariable, int j)
    {
-      AttributeUtil.setAttribute((IExtensibleElement) model, "ipp:variables[" + j
-            + "]:name", "String", null);
-      AttributeUtil.setAttribute((IExtensibleElement) model, "ipp:variables[" + j
-            + "]:defaultValue", "String", null);
-      AttributeUtil.setAttribute((IExtensibleElement) model, "ipp:variables[" + j
-            + "]:description", "String", null);
+      AttributeUtil.setAttribute((IExtensibleElement) model, "ipp:variables[" + j //$NON-NLS-1$
+            + "]:name", "String", null); //$NON-NLS-1$ //$NON-NLS-2$
+      AttributeUtil.setAttribute((IExtensibleElement) model, "ipp:variables[" + j //$NON-NLS-1$
+            + "]:defaultValue", "String", null); //$NON-NLS-1$ //$NON-NLS-2$
+      AttributeUtil.setAttribute((IExtensibleElement) model, "ipp:variables[" + j //$NON-NLS-1$
+            + "]:description", "String", null); //$NON-NLS-1$ //$NON-NLS-2$
    }
    
    private ModelVariable createModelVariable(AttributeType attribute)
@@ -148,21 +148,21 @@ public class VariableContext
       int index = getIndex(attribute.getName());
       if (index + 1 > variables.size())
       {
-         modelVariable = new ModelVariable("", "", "");
+         modelVariable = new ModelVariable("", "", ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
          variables.add(modelVariable);
       }
       modelVariable = variables.get(index);
       String feature = attribute.getName()
-            .substring(attribute.getName().indexOf("]") + 2);
-      if (feature.equals("name"))
+            .substring(attribute.getName().indexOf("]") + 2); //$NON-NLS-1$
+      if (feature.equals("name")) //$NON-NLS-1$
       {
-         modelVariable.setName("${" + attribute.getValue() + "}");
+         modelVariable.setName("${" + attribute.getValue() + "}"); //$NON-NLS-1$ //$NON-NLS-2$
       }
-      if (feature.equals("defaultValue"))
+      if (feature.equals("defaultValue")) //$NON-NLS-1$
       {
          modelVariable.setDefaultValue(attribute.getValue());
       }
-      if (feature.equals("description"))
+      if (feature.equals("description")) //$NON-NLS-1$
       {
          modelVariable.setDescription(attribute.getValue());
       }
@@ -171,8 +171,8 @@ public class VariableContext
 
    private int getIndex(String name)
    {
-      int startIndex = name.indexOf("[");
-      int endIndex = name.indexOf("]");
+      int startIndex = name.indexOf("["); //$NON-NLS-1$
+      int endIndex = name.indexOf("]"); //$NON-NLS-1$
       String index = name.substring(startIndex + 1, endIndex);
       return Integer.parseInt(index);
    }
@@ -225,7 +225,7 @@ public class VariableContext
             for (Iterator<EObject> j = refList.iterator(); j.hasNext();)
             {
                EObject modelElement = j.next();
-               if (modelElement.eContainer().toString().indexOf("ChangeDescriptionImpl") > -1)
+               if (modelElement.eContainer().toString().indexOf("ChangeDescriptionImpl") > -1) //$NON-NLS-1$
                {
                   invalidReferences.add(modelElement);
                }
@@ -266,7 +266,7 @@ public class VariableContext
                   {
                      refList = new ArrayList<EObject>();
                      variableReferences.put(ref, refList);
-                     ModelVariable modelVariable = new ModelVariable(ref, "", "");
+                     ModelVariable modelVariable = new ModelVariable(ref, "", ""); //$NON-NLS-1$ //$NON-NLS-2$
                      variables.add(modelVariable);
                   }
                   if (!containedReference(modelElement, refList))
@@ -387,7 +387,7 @@ public class VariableContext
          result = replace(modelVariable, modelVariable.getDefaultValue(), result);
       }
       //Additionally deal with escaped variables
-      result = result.replaceAll("\\\\\\$\\{", "\\$\\{");
+      result = result.replaceAll("\\\\\\$\\{", "\\$\\{"); //$NON-NLS-1$ //$NON-NLS-2$
       return result;
    }
 
@@ -400,7 +400,7 @@ public class VariableContext
          value = replace(modelVariable, newValue, value);
          attribute.setValue(value);
          // CRNT-22739
-         if (attribute.getName().equalsIgnoreCase("ipp:criticalityFormula"))
+         if (attribute.getName().equalsIgnoreCase("ipp:criticalityFormula")) //$NON-NLS-1$
          {
             setCriticalityFormulaChanged(true);
          }
@@ -464,46 +464,46 @@ public class VariableContext
    {
       List<String> list1 = new ArrayList<String>();
       String n = modelVariable.getName();
-      String tobeReplaced = "";
-      String replacement = "";
-      if (!newValue.startsWith("${"))
+      String tobeReplaced = ""; //$NON-NLS-1$
+      String replacement = ""; //$NON-NLS-1$
+      if (!newValue.startsWith("${")) //$NON-NLS-1$
       {
          tobeReplaced = n.substring(2, n.length() - 1);
          replacement = newValue;
-         if (replacement.indexOf("$") > -1)
+         if (replacement.indexOf("$") > -1) //$NON-NLS-1$
          {
-            replacement = replacement.replace("$", "\\$");
+            replacement = replacement.replace("$", "\\$"); //$NON-NLS-1$ //$NON-NLS-2$
          }
-         while (value.indexOf("${" + tobeReplaced + "}") > -1)
+         while (value.indexOf("${" + tobeReplaced + "}") > -1) //$NON-NLS-1$ //$NON-NLS-2$
          {
-            int idx = value.indexOf("${" + tobeReplaced + "}");
+            int idx = value.indexOf("${" + tobeReplaced + "}"); //$NON-NLS-1$ //$NON-NLS-2$
             if (idx == 0 || (idx > 0 && value.charAt(idx - 1) != '\\'))
             {
-               value = value.replaceFirst("(\\$\\{" + tobeReplaced + "\\})", replacement);
+               value = value.replaceFirst("(\\$\\{" + tobeReplaced + "\\})", replacement); //$NON-NLS-1$ //$NON-NLS-2$
             }
             else
             {
-               list1.add("\\$\\{" + tobeReplaced + "\\}");
-               value = value.replaceFirst("(\\$\\{" + tobeReplaced + "\\})", "*0*0*0*0*");
+               list1.add("\\$\\{" + tobeReplaced + "\\}"); //$NON-NLS-1$ //$NON-NLS-2$
+               value = value.replaceFirst("(\\$\\{" + tobeReplaced + "\\})", "*0*0*0*0*"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
             }
          }
          for (Iterator<String> i = list1.iterator(); i.hasNext();)
          {
             String string = i.next();
-            value = value.replaceFirst("(\\*0\\*0\\*0\\*0\\*)", string);
+            value = value.replaceFirst("(\\*0\\*0\\*0\\*0\\*)", string); //$NON-NLS-1$
          }
       }
       else
       {
          tobeReplaced = n.substring(2, n.length() - 1);
          replacement = newValue.substring(2, newValue.length() - 1);
-         if (replacement.indexOf("$") > -1)
+         if (replacement.indexOf("$") > -1) //$NON-NLS-1$
          {
-            replacement = replacement.replace("$", "\\$");
+            replacement = replacement.replace("$", "\\$"); //$NON-NLS-1$ //$NON-NLS-2$
          }
          tobeReplaced = RegEx.REUtil.quoteMeta(tobeReplaced);
-         value = value.replaceAll("(\\$\\{" + tobeReplaced + "\\})", "\\$\\{"
-               + replacement + "\\}");
+         value = value.replaceAll("(\\$\\{" + tobeReplaced + "\\})", "\\$\\{" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+               + replacement + "\\}"); //$NON-NLS-1$
       }
       return value;
    }
@@ -514,11 +514,11 @@ public class VariableContext
       {
          return false;
       }
-      if (name.startsWith("${"))
+      if (name.startsWith("${")) //$NON-NLS-1$
       {
          name = name.substring(2, name.length() - 1);
       }
-      if (name == "" || StringUtils.isEmpty(name))
+      if (name == "" || StringUtils.isEmpty(name)) //$NON-NLS-1$
       {
          return false;
       }
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/WorkflowModelManager.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/WorkflowModelManager.java
index 73d6bb5..163876c 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/WorkflowModelManager.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/WorkflowModelManager.java
@@ -48,6 +48,7 @@ import org.eclipse.stardust.model.xpdl.carnot.CarnotWorkflowModelFactory;
 import org.eclipse.stardust.model.xpdl.carnot.CarnotWorkflowModelPackage;
 import org.eclipse.stardust.model.xpdl.carnot.DocumentRoot;
 import org.eclipse.stardust.model.xpdl.carnot.ModelType;
+import org.eclipse.stardust.model.xpdl.carnot.Model_Messages;
 import org.eclipse.stardust.model.xpdl.carnot.impl.CarnotWorkflowModelPackageImpl;
 import org.eclipse.stardust.model.xpdl.xpdl2.XpdlPackage;
 import org.w3c.dom.Document;
@@ -227,7 +228,7 @@ public class WorkflowModelManager
          Set<String> keySet = map.keySet();
          for (String nsKey : keySet)
          {
-            if (!nsKey.startsWith("_"))
+            if (!nsKey.startsWith("_")) //$NON-NLS-1$
             {
                if (checkNamespace(map, namespaces, duplicatedNSKeys, nsKey) && xpdlKey == null)
                {
@@ -238,7 +239,7 @@ public class WorkflowModelManager
          // get namespaces for all keys with underscore, find duplicate namespaces
          for (String nsKey : keySet)
          {
-            if (nsKey.startsWith("_"))
+            if (nsKey.startsWith("_")) //$NON-NLS-1$
             {
                if (checkNamespace(map, namespaces, duplicatedNSKeys, nsKey) && xpdlKey == null)
                {
@@ -318,13 +319,13 @@ public class WorkflowModelManager
                final URL xsltURL = XpdlUtils.getCarnot2XpdlStylesheet();
                if (xsltURL == null)
                {
-                  throw new InternalException("Unable to find XPDL export stylesheet.");
+                  throw new InternalException("Unable to find XPDL export stylesheet."); //$NON-NLS-1$
                }
                xsltSource = new StreamSource(xsltURL.openStream());
             }
             catch (IOException e)
             {
-               throw new PublicException("Invalid JAXP setup", e);
+               throw new PublicException(Model_Messages.EXC_INVALID_JAXP_SETUP, e);
             }
 
             // need to override context class loader so XpdlUtils extension class is
@@ -345,7 +346,7 @@ public class WorkflowModelManager
             }
             catch (TransformerConfigurationException e)
             {
-               throw new PublicException("Invalid JAXP setup", e);
+               throw new PublicException(Model_Messages.EXC_INVALID_JAXP_SETUP, e);
             }
             finally
             {
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/xpdl/XpdlSaxParser.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/xpdl/XpdlSaxParser.java
index 1899060..ed75954 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/xpdl/XpdlSaxParser.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/xpdl/XpdlSaxParser.java
@@ -32,7 +32,7 @@ import org.eclipse.stardust.common.log.LogManager;
 import org.eclipse.stardust.common.log.Logger;
 import org.eclipse.stardust.common.utils.xml.XmlUtils;
 import org.eclipse.stardust.engine.core.model.xpdl.XpdlUtils;
-import org.eclipse.stardust.model.xpdl.carnot.ModelMessages;
+import org.eclipse.stardust.model.xpdl.carnot.Model_Messages;
 import org.xml.sax.EntityResolver;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.HandlerBase;
@@ -108,7 +108,7 @@ public class XpdlSaxParser extends SAXParser
       final URL xsdURL = XpdlUtils.getXpdl_10_Schema();
       if (null == xsdURL)
       {
-         throw new InternalException(ModelMessages.MSG_UNABLE_TO_FIND_XPDL_IMPORT + XpdlUtils.XPDL_1_0_XSD); //$NON-NLS-1$
+         throw new InternalException(Model_Messages.MSG_UNABLE_TO_FIND_XPDL_IMPORT + XpdlUtils.XPDL_1_0_XSD); //$NON-NLS-1$
       }
 
       // by default, this will return Aelfred
@@ -144,7 +144,7 @@ public class XpdlSaxParser extends SAXParser
       }
       catch (TransformerException e)
       {
-         throw new PublicException(ModelMessages.MSG_FAILED_LOADING_MODEL, e); //$NON-NLS-1$
+         throw new PublicException(Model_Messages.MSG_FAILED_LOADING_MODEL, e); //$NON-NLS-1$
       }
       finally
       {
@@ -202,17 +202,17 @@ public class XpdlSaxParser extends SAXParser
 
 	public void warning(SAXParseException exception) throws SAXException
       {
-         trace.warn(formatParseException(ModelMessages.MSG_WARN, exception)); //$NON-NLS-1$
+         trace.warn(formatParseException(Model_Messages.MSG_WARN, exception)); //$NON-NLS-1$
       }
 
       public void error(SAXParseException exception) throws SAXException
       {
-         trace.error(formatParseException(ModelMessages.MSG_ERR, exception)); //$NON-NLS-1$
+         trace.error(formatParseException(Model_Messages.MSG_ERR, exception)); //$NON-NLS-1$
       }
 
       public void fatalError(SAXParseException exception) throws SAXException
       {
-         trace.error(formatParseException(ModelMessages.MSG_FATAL_ERR, exception)); //$NON-NLS-1$
+         trace.error(formatParseException(Model_Messages.MSG_FATAL_ERR, exception)); //$NON-NLS-1$
       }
 
       private String formatParseException(String label, SAXParseException e)
@@ -235,7 +235,7 @@ public class XpdlSaxParser extends SAXParser
          final URL xsltURL = XpdlUtils.getXpdl2CarnotStylesheet();
          if (null == xsltURL)
          {
-            throw new InternalException(ModelMessages.MSG_UNABLE_TO_FIND_XPDL_IMPORT); //$NON-NLS-1$
+            throw new InternalException(Model_Messages.MSG_UNABLE_TO_FIND_XPDL_IMPORT); //$NON-NLS-1$
          }
 
          try
@@ -248,7 +248,7 @@ public class XpdlSaxParser extends SAXParser
             }
             catch (IOException e)
             {
-               throw new PublicException(ModelMessages.MSG_UNABLE_TO_LOAD_XPDL_IMPORT, e); //$NON-NLS-1$
+               throw new PublicException(Model_Messages.MSG_UNABLE_TO_LOAD_XPDL_IMPORT, e); //$NON-NLS-1$
             }
 
             xpdl2cwmTransformer.setOutputProperty(OutputKeys.INDENT, "yes"); //$NON-NLS-1$
@@ -262,7 +262,7 @@ public class XpdlSaxParser extends SAXParser
          }
          catch (TransformerConfigurationException e)
          {
-            throw new PublicException(ModelMessages.MSG_INVALID_JAXP_SETUP, e); //$NON-NLS-1$
+            throw new PublicException(Model_Messages.MSG_INVALID_JAXP_SETUP, e); //$NON-NLS-1$
          }
       }
       
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/spi/ModelAdapterUtils.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/spi/ModelAdapterUtils.java
index 1b7f0cf..0df3d00 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/spi/ModelAdapterUtils.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/spi/ModelAdapterUtils.java
@@ -15,6 +15,7 @@ import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.stardust.model.xpdl.carnot.CwmPlugin;
+import org.eclipse.stardust.model.xpdl.carnot.Model_Messages;
 
 public class ModelAdapterUtils
 {
@@ -29,12 +30,12 @@ public class ModelAdapterUtils
       {
          try
          {
-            adapterFactory = (IModelAdapterFactory) configElement.createExecutableExtension("implementation");
+            adapterFactory = (IModelAdapterFactory) configElement.createExecutableExtension("implementation"); //$NON-NLS-1$
             break;
          }
          catch (CoreException ce)
          {
-            System.out.println("Failed instantiating extension: " + ce.getMessage());
+            System.out.println(Model_Messages.EXC_FAILED_INSTANTIATING_EXTENSION + ce.getMessage());
          }
       }
 
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/util/IConnectionManager.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/util/IConnectionManager.java
index 2fcc8a7..16ba548 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/util/IConnectionManager.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/util/IConnectionManager.java
@@ -18,12 +18,12 @@ import org.eclipse.stardust.model.xpdl.xpdl2.ExternalPackage;
 
 public interface IConnectionManager
 {
-   public static final String BY_REFERENCE = "importByReference";
-   public static final String CONNECTION_MANAGER_CREATED = "ConnectionManager.CREATED";
-   public static final String CONNECTION_MANAGER = "ConnectionManager";
-   public static final String SCHEME = "cnx";
-   public static final String CONNECTION_SCOPE = "carnot:connection:";
-   public static final String URI_ATTRIBUTE_NAME = CONNECTION_SCOPE + "uri";
+   public static final String BY_REFERENCE = "importByReference"; //$NON-NLS-1$
+   public static final String CONNECTION_MANAGER_CREATED = "ConnectionManager.CREATED"; //$NON-NLS-1$
+   public static final String CONNECTION_MANAGER = "ConnectionManager"; //$NON-NLS-1$
+   public static final String SCHEME = "cnx"; //$NON-NLS-1$
+   public static final String CONNECTION_SCOPE = "carnot:connection:"; //$NON-NLS-1$
+   public static final String URI_ATTRIBUTE_NAME = CONNECTION_SCOPE + "uri"; //$NON-NLS-1$
 
    EObject find(String uri);
    EObject find(URI uri);
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/BasicTypeType.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/BasicTypeType.java
index 1899335..1b32943 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/BasicTypeType.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/BasicTypeType.java
@@ -33,7 +33,7 @@ public interface BasicTypeType extends XpdlTypeType {
 	 * <!-- end-user-doc -->
     * @generated
     */
-	String copyright = "Copyright 2008 by SunGard";
+   public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
 	/**
     * Returns the value of the '<em><b>Type</b></em>' attribute.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/DataTypeType.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/DataTypeType.java
index 858c00d..4fc5ce0 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/DataTypeType.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/DataTypeType.java
@@ -39,7 +39,7 @@ public interface DataTypeType extends EObject
     * <!-- end-user-doc -->
     * @generated
     */
-   String copyright = "Copyright 2008 by SunGard";
+   public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
    /**
     * Returns the value of the '<em><b>Basic Type</b></em>' containment reference.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/DeclaredTypeType.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/DeclaredTypeType.java
index 33f67d4..6bc1445 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/DeclaredTypeType.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/DeclaredTypeType.java
@@ -33,7 +33,7 @@ public interface DeclaredTypeType extends XpdlTypeType {
 	 * <!-- end-user-doc -->
     * @generated
     */
-	String copyright = "Copyright 2008 by SunGard";
+	String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
 	/**
     * Returns the value of the '<em><b>Id</b></em>' attribute.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/ExtendedAttributeType.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/ExtendedAttributeType.java
index cbccf6f..3a14f0d 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/ExtendedAttributeType.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/ExtendedAttributeType.java
@@ -42,14 +42,14 @@ public interface ExtendedAttributeType extends EObject {
      * <!-- end-user-doc -->
      * @generated NOT
      */
-    public static final String EXTERNAL_ANNOTATIONS_NAME = "carnot:engine:resource:mapping:annotations";
+    public static final String EXTERNAL_ANNOTATIONS_NAME = "carnot:engine:resource:mapping:annotations"; //$NON-NLS-1$
 
 	/**
     * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
     * @generated
     */
-	String copyright = "Copyright 2008 by SunGard";
+	String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
 	/**
     * Returns the value of the '<em><b>Extended Annotation</b></em>' containment reference.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/ExtendedAttributesType.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/ExtendedAttributesType.java
index c65b92f..8a6de90 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/ExtendedAttributesType.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/ExtendedAttributesType.java
@@ -35,7 +35,7 @@ public interface ExtendedAttributesType extends EObject {
 	 * <!-- end-user-doc -->
     * @generated
     */
-	String copyright = "Copyright 2008 by SunGard";
+	String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
 	/**
     * Returns the value of the '<em><b>Extended Attribute</b></em>' containment reference list.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/Extensible.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/Extensible.java
index e51a4c4..41ac333 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/Extensible.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/Extensible.java
@@ -35,7 +35,7 @@ public interface Extensible extends EObject
     * <!-- end-user-doc -->
     * @generated
     */
-   String copyright = "Copyright 2008 by SunGard";
+   String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
    /**
     * Returns the value of the '<em><b>Extended Attributes</b></em>' containment reference.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/ExternalPackage.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/ExternalPackage.java
index fb387cc..c47647f 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/ExternalPackage.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/ExternalPackage.java
@@ -35,7 +35,7 @@ public interface ExternalPackage extends Extensible
     * <!-- end-user-doc -->
     * @generated
     */
-   String copyright = "Copyright 2008 by SunGard";
+   String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
    /**
     * Returns the value of the '<em><b>Href</b></em>' attribute.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/ExternalPackages.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/ExternalPackages.java
index c86af3f..2de459d 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/ExternalPackages.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/ExternalPackages.java
@@ -36,7 +36,7 @@ public interface ExternalPackages extends EObject
     * <!-- end-user-doc -->
     * @generated
     */
-   String copyright = "Copyright 2008 by SunGard";
+   String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
    /**
     * Returns the value of the '<em><b>External Package</b></em>' containment reference list.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/ExternalReferenceType.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/ExternalReferenceType.java
index 3108fe5..0ea1e1f 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/ExternalReferenceType.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/ExternalReferenceType.java
@@ -37,7 +37,7 @@ public interface ExternalReferenceType extends XpdlTypeType {
 	 * <!-- end-user-doc -->
     * @generated
     */
-	String copyright = "Copyright 2008 by SunGard";
+	String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
 	/**
     * Returns the value of the '<em><b>Location</b></em>' attribute.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/FormalParameterType.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/FormalParameterType.java
index d3a5d57..adcdba0 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/FormalParameterType.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/FormalParameterType.java
@@ -39,7 +39,7 @@ public interface FormalParameterType extends EObject
     * <!-- end-user-doc -->
     * @generated
     */
-   String copyright = "Copyright 2008 by SunGard";
+   String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
    /**
     * Returns the value of the '<em><b>Data Type</b></em>' containment reference.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/FormalParametersType.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/FormalParametersType.java
index 99ce17f..e35a34e 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/FormalParametersType.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/FormalParametersType.java
@@ -36,7 +36,7 @@ public interface FormalParametersType extends EObject
     * <!-- end-user-doc -->
     * @generated
     */
-   String copyright = "Copyright 2008 by SunGard";
+   String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
    /**
     * Returns the value of the '<em><b>Formal Parameter</b></em>' containment reference list.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/ModeType.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/ModeType.java
index 439fa92..1e0adb6 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/ModeType.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/ModeType.java
@@ -35,7 +35,7 @@ public enum ModeType implements Enumerator
     * @generated
     * @ordered
     */
-   IN(0, "IN", "IN"),
+   IN(0, "IN", "IN"), //$NON-NLS-1$ //$NON-NLS-2$
 
    /**
     * The '<em><b>OUT</b></em>' literal object.
@@ -45,7 +45,7 @@ public enum ModeType implements Enumerator
     * @generated
     * @ordered
     */
-   OUT(1, "OUT", "OUT"),
+   OUT(1, "OUT", "OUT"), //$NON-NLS-1$ //$NON-NLS-2$
 
    /**
     * The '<em><b>INOUT</b></em>' literal object.
@@ -55,14 +55,14 @@ public enum ModeType implements Enumerator
     * @generated
     * @ordered
     */
-   INOUT(2, "INOUT", "INOUT");
+   INOUT(2, "INOUT", "INOUT"); //$NON-NLS-1$ //$NON-NLS-2$
 
    /**
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
     * @generated
     */
-   public static final String copyright = "Copyright 2008 by SunGard";
+   public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
    /**
     * The '<em><b>IN</b></em>' literal value.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/SchemaTypeType.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/SchemaTypeType.java
index 0c0ebe3..fc33a51 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/SchemaTypeType.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/SchemaTypeType.java
@@ -34,7 +34,7 @@ public interface SchemaTypeType extends XpdlTypeType {
 	 * <!-- end-user-doc -->
     * @generated
     */
-	String copyright = "Copyright 2008 by SunGard";
+	String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
 	/**
     * Returns the value of the '<em><b>Schema</b></em>' containment reference.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/ScriptType.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/ScriptType.java
index d095f7e..960c603 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/ScriptType.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/ScriptType.java
@@ -37,7 +37,7 @@ public interface ScriptType extends EObject
 	 * <!-- end-user-doc -->
     * @generated
     */
-	String copyright = "Copyright 2008 by SunGard";
+	String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
    /**
     * Returns the value of the '<em><b>Grammar</b></em>' attribute.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/TypeDeclarationType.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/TypeDeclarationType.java
index 74fd874..f5a1df0 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/TypeDeclarationType.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/TypeDeclarationType.java
@@ -40,7 +40,7 @@ public interface TypeDeclarationType extends Extensible {
 	 * <!-- end-user-doc -->
     * @generated
     */
-	String copyright = "Copyright 2008 by SunGard";
+	String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
 	/**
     * Returns the value of the '<em><b>Basic Type</b></em>' containment reference.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/TypeDeclarationsType.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/TypeDeclarationsType.java
index c3573dd..3ed6e7b 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/TypeDeclarationsType.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/TypeDeclarationsType.java
@@ -35,7 +35,7 @@ public interface TypeDeclarationsType extends EObject {
 	 * <!-- end-user-doc -->
     * @generated
     */
-	String copyright = "Copyright 2008 by SunGard";
+	String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
 	/**
     * Returns the value of the '<em><b>Type Declaration</b></em>' containment reference list.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/TypeType.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/TypeType.java
index 874fdd5..d96bf89 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/TypeType.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/TypeType.java
@@ -35,7 +35,7 @@ public enum TypeType implements Enumerator
     * @generated
     * @ordered
     */
-   STRING_LITERAL(0, "STRING", "STRING"),
+   STRING_LITERAL(0, "STRING", "STRING"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>FLOAT</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -44,7 +44,7 @@ public enum TypeType implements Enumerator
     * @generated
     * @ordered
     */
-   FLOAT_LITERAL(1, "FLOAT", "FLOAT"),
+   FLOAT_LITERAL(1, "FLOAT", "FLOAT"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>INTEGER</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -53,7 +53,7 @@ public enum TypeType implements Enumerator
     * @generated
     * @ordered
     */
-   INTEGER_LITERAL(2, "INTEGER", "INTEGER"),
+   INTEGER_LITERAL(2, "INTEGER", "INTEGER"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>REFERENCE</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -62,7 +62,7 @@ public enum TypeType implements Enumerator
     * @generated
     * @ordered
     */
-   REFERENCE_LITERAL(3, "REFERENCE", "REFERENCE"),
+   REFERENCE_LITERAL(3, "REFERENCE", "REFERENCE"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>DATETIME</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -71,7 +71,7 @@ public enum TypeType implements Enumerator
     * @generated
     * @ordered
     */
-   DATETIME_LITERAL(4, "DATETIME", "DATETIME"),
+   DATETIME_LITERAL(4, "DATETIME", "DATETIME"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>BOOLEAN</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -80,7 +80,7 @@ public enum TypeType implements Enumerator
     * @generated
     * @ordered
     */
-   BOOLEAN_LITERAL(5, "BOOLEAN", "BOOLEAN"),
+   BOOLEAN_LITERAL(5, "BOOLEAN", "BOOLEAN"), //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * The '<em><b>PERFORMER</b></em>' literal object.
     * <!-- begin-user-doc -->
@@ -89,13 +89,13 @@ public enum TypeType implements Enumerator
     * @generated
     * @ordered
     */
-   PERFORMER_LITERAL(6, "PERFORMER", "PERFORMER");
+   PERFORMER_LITERAL(6, "PERFORMER", "PERFORMER"); //$NON-NLS-1$ //$NON-NLS-2$
    /**
     * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
     * @generated
     */
-	public static final String copyright = "Copyright 2008 by SunGard";
+	public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
    /**
     * The '<em><b>STRING</b></em>' literal value.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/XpdlFactory.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/XpdlFactory.java
index 47cdd45..ad0fc21 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/XpdlFactory.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/XpdlFactory.java
@@ -27,7 +27,7 @@ public interface XpdlFactory extends EFactory
 	 * <!-- end-user-doc -->
     * @generated
     */
-	String copyright = "Copyright 2008 by SunGard";
+	String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
    /**
     * The singleton instance of the factory.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/XpdlPackage.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/XpdlPackage.java
index cd67826..f951ed7 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/XpdlPackage.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/XpdlPackage.java
@@ -39,7 +39,7 @@ public interface XpdlPackage extends EPackage
 	 * <!-- end-user-doc -->
     * @generated
     */
-	String copyright = "Copyright 2008 by SunGard";
+	String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
    /**
     * The package name.
@@ -47,7 +47,7 @@ public interface XpdlPackage extends EPackage
 	 * <!-- end-user-doc -->
     * @generated
     */
-	String eNAME = "xpdl";
+	String eNAME = "xpdl"; //$NON-NLS-1$
 
    /**
     * The package namespace URI.
@@ -55,21 +55,21 @@ public interface XpdlPackage extends EPackage
 	 * <!-- end-user-doc -->
     * @generated
     */
-	String eNS_URI = "http://www.wfmc.org/2008/XPDL2.1";
+	String eNS_URI = "http://www.wfmc.org/2008/XPDL2.1"; //$NON-NLS-1$
 
    /**
     * The XPDL 1.0 namespace URI.
     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
     */
-    String eNS_URI1 = "http://www.wfmc.org/2002/XPDL1.0";
+    String eNS_URI1 = "http://www.wfmc.org/2002/XPDL1.0"; //$NON-NLS-1$
 
    /**
     * The XPDL 2.0 namespace URI.
     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
     */
-    String eNS_URI2 = "http://www.wfmc.org/2004/XPDL2.0alpha";
+    String eNS_URI2 = "http://www.wfmc.org/2004/XPDL2.0alpha"; //$NON-NLS-1$
 
    /**
     * The package namespace name.
@@ -77,7 +77,7 @@ public interface XpdlPackage extends EPackage
 	 * <!-- end-user-doc -->
     * @generated
     */
-	String eNS_PREFIX = "xpdl";
+	String eNS_PREFIX = "xpdl"; //$NON-NLS-1$
 
    /**
     * The singleton instance of the package.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/XpdlTypeType.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/XpdlTypeType.java
index 72d61a7..f6f53ff 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/XpdlTypeType.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/XpdlTypeType.java
@@ -28,6 +28,6 @@ public interface XpdlTypeType extends EObject {
 	 * <!-- end-user-doc -->
     * @generated
     */
-	String copyright = "Copyright 2008 by SunGard";
+	String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
 } // XpdlTypeType
 \ No newline at end of file
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/ExtendedAnnotationType.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/ExtendedAnnotationType.java
index 084ae62..3f1c1d8 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/ExtendedAnnotationType.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/ExtendedAnnotationType.java
@@ -28,6 +28,6 @@ public interface ExtendedAnnotationType extends XSDAnnotation {
 	 * <!-- end-user-doc -->
     * @generated
     */
-	String copyright = "Copyright 2008 by SunGard";
+	String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
 } // ExtendedAnnotationType
 \ No newline at end of file
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/ExtensionFactory.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/ExtensionFactory.java
index 2b35ac1..51790e8 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/ExtensionFactory.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/ExtensionFactory.java
@@ -26,7 +26,7 @@ public interface ExtensionFactory extends EFactory {
 	 * <!-- end-user-doc -->
     * @generated
     */
-	String copyright = "Copyright 2008 by SunGard";
+	String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
 	/**
     * The singleton instance of the factory.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/ExtensionPackage.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/ExtensionPackage.java
index 80568a1..1f122f3 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/ExtensionPackage.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/ExtensionPackage.java
@@ -35,7 +35,7 @@ public interface ExtensionPackage extends EPackage {
 	 * <!-- end-user-doc -->
     * @generated
     */
-	String copyright = "Copyright 2008 by SunGard";
+	String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
 	/**
     * The package name.
@@ -43,7 +43,7 @@ public interface ExtensionPackage extends EPackage {
 	 * <!-- end-user-doc -->
     * @generated
     */
-	String eNAME = "extensions";
+	String eNAME = "extensions"; //$NON-NLS-1$
 
 	/**
     * The package namespace URI.
@@ -51,7 +51,7 @@ public interface ExtensionPackage extends EPackage {
 	 * <!-- end-user-doc -->
     * @generated
     */
-	String eNS_URI = "http://www.carnot.ag/workflowmodel/3.1/xpdl/extensions";
+	String eNS_URI = "http://www.carnot.ag/workflowmodel/3.1/xpdl/extensions"; //$NON-NLS-1$
 
 	/**
     * The package namespace name.
@@ -59,7 +59,7 @@ public interface ExtensionPackage extends EPackage {
 	 * <!-- end-user-doc -->
     * @generated
     */
-	String eNS_PREFIX = "ext";
+	String eNS_PREFIX = "ext"; //$NON-NLS-1$
 
 	/**
     * The singleton instance of the package.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/impl/ExtendedAnnotationTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/impl/ExtendedAnnotationTypeImpl.java
index 95f48ab..0fea629 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/impl/ExtendedAnnotationTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/impl/ExtendedAnnotationTypeImpl.java
@@ -37,7 +37,7 @@ public class ExtendedAnnotationTypeImpl extends XSDAnnotationImpl implements Ext
 	 * <!-- end-user-doc -->
     * @generated
     */
-	public static final String copyright = "Copyright 2008 by SunGard";
+	public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 	
     /**
      * <!-- begin-user-doc -->
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/impl/ExtensionFactoryImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/impl/ExtensionFactoryImpl.java
index 6570e6d..280cb0f 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/impl/ExtensionFactoryImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/impl/ExtensionFactoryImpl.java
@@ -11,11 +11,14 @@
 package org.eclipse.stardust.model.xpdl.xpdl2.extensions.impl;
 
 
+import java.text.MessageFormat;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.stardust.model.xpdl.carnot.Model_Messages;
 import org.eclipse.stardust.model.xpdl.xpdl2.extensions.ExtendedAnnotationType;
 import org.eclipse.stardust.model.xpdl.xpdl2.extensions.ExtensionFactory;
 import org.eclipse.stardust.model.xpdl.xpdl2.extensions.ExtensionPackage;
@@ -32,7 +35,7 @@ public class ExtensionFactoryImpl extends EFactoryImpl implements ExtensionFacto
 	 * <!-- end-user-doc -->
     * @generated
     */
-	public static final String copyright = "Copyright 2008 by SunGard";
+	public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
 	/**
     * Creates the default factory implementation.
@@ -43,7 +46,7 @@ public class ExtensionFactoryImpl extends EFactoryImpl implements ExtensionFacto
 	public static ExtensionFactory init() {
       try
       {
-         ExtensionFactory theExtensionFactory = (ExtensionFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.carnot.ag/workflowmodel/3.1/xpdl/extensions"); 
+         ExtensionFactory theExtensionFactory = (ExtensionFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.carnot.ag/workflowmodel/3.1/xpdl/extensions");  //$NON-NLS-1$
          if (theExtensionFactory != null)
          {
             return theExtensionFactory;
@@ -77,7 +80,7 @@ public class ExtensionFactoryImpl extends EFactoryImpl implements ExtensionFacto
       {
          case ExtensionPackage.EXTENDED_ANNOTATION_TYPE: return createExtendedAnnotationType();
          default:
-            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_CLASS_NULL_IS_NOT_A_VALID_CLASSIFIER, new Object[]{eClass.getName()}));
       }
    }
 
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/impl/ExtensionPackageImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/impl/ExtensionPackageImpl.java
index 868b257..4dab86f 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/impl/ExtensionPackageImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/impl/ExtensionPackageImpl.java
@@ -35,7 +35,7 @@ public class ExtensionPackageImpl extends EPackageImpl implements ExtensionPacka
 	 * <!-- end-user-doc -->
     * @generated
     */
-	public static final String copyright = "Copyright 2008 by SunGard";
+	public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
 	/**
     * <!-- begin-user-doc -->
@@ -194,7 +194,7 @@ public class ExtensionPackageImpl extends EPackageImpl implements ExtensionPacka
       extendedAnnotationTypeEClass.getESuperTypes().add(theXSDPackage.getXSDAnnotation());
 
       // Initialize classes and features; add operations and parameters
-      initEClass(extendedAnnotationTypeEClass, ExtendedAnnotationType.class, "ExtendedAnnotationType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+      initEClass(extendedAnnotationTypeEClass, ExtendedAnnotationType.class, "ExtendedAnnotationType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
       // Create annotations
       // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
@@ -208,14 +208,14 @@ public class ExtensionPackageImpl extends EPackageImpl implements ExtensionPacka
     * @generated
     */
 	protected void createExtendedMetaDataAnnotations() {
-      String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";		
+      String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";		 //$NON-NLS-1$
       addAnnotation
         (extendedAnnotationTypeEClass, 
          source, 
          new String[] 
          {
-          "name", "ExternalAnnotation_._type",
-          "kind", "empty"
+          "name", "ExternalAnnotation_._type", //$NON-NLS-1$ //$NON-NLS-2$
+          "kind", "empty" //$NON-NLS-1$ //$NON-NLS-2$
          });
    }
 
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/util/ExtensionAdapterFactory.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/util/ExtensionAdapterFactory.java
index 3624aec..737386b 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/util/ExtensionAdapterFactory.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/util/ExtensionAdapterFactory.java
@@ -37,7 +37,7 @@ public class ExtensionAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- end-user-doc -->
     * @generated
     */
-	public static final String copyright = "Copyright 2008 by SunGard";
+	public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
 	/**
     * The cached model package.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/util/ExtensionResourceFactoryImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/util/ExtensionResourceFactoryImpl.java
index ab991b6..666575f 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/util/ExtensionResourceFactoryImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/util/ExtensionResourceFactoryImpl.java
@@ -28,7 +28,7 @@ public class ExtensionResourceFactoryImpl extends ResourceFactoryImpl {
 	 * <!-- end-user-doc -->
     * @generated
     */
-	public static final String copyright = "Copyright 2008 by SunGard";
+	public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
 	/**
     * Creates an instance of the resource factory.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/util/ExtensionResourceImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/util/ExtensionResourceImpl.java
index 265ae2c..9865cc7 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/util/ExtensionResourceImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/util/ExtensionResourceImpl.java
@@ -26,7 +26,7 @@ public class ExtensionResourceImpl extends XMLResourceImpl {
 	 * <!-- end-user-doc -->
     * @generated
     */
-	public static final String copyright = "Copyright 2008 by SunGard";
+   public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
 	/**
     * Creates an instance of the resource.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/util/ExtensionSwitch.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/util/ExtensionSwitch.java
index 7222086..17e827e 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/util/ExtensionSwitch.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/util/ExtensionSwitch.java
@@ -42,7 +42,7 @@ public class ExtensionSwitch<T> {
 	 * <!-- end-user-doc -->
     * @generated
     */
-	public static final String copyright = "Copyright 2008 by SunGard";
+	public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
 	/**
     * The cached model package
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/util/ExtensionXMLProcessor.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/util/ExtensionXMLProcessor.java
index 3f52e00..3b06e05 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/util/ExtensionXMLProcessor.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/extensions/util/ExtensionXMLProcessor.java
@@ -30,7 +30,7 @@ public class ExtensionXMLProcessor extends XMLProcessor {
 	 * <!-- end-user-doc -->
     * @generated
     */
-	public static final String copyright = "Copyright 2008 by SunGard";
+	public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
 
 	/**
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/BasicTypeTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/BasicTypeTypeImpl.java
index 1d8580c..4fb834d 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/BasicTypeTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/BasicTypeTypeImpl.java
@@ -38,7 +38,7 @@ public class BasicTypeTypeImpl extends EObjectImpl implements BasicTypeType {
 	 * <!-- end-user-doc -->
     * @generated
     */
-	public static final String copyright = "Copyright 2008 by SunGard";
+	public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
 	/**
     * The default value of the '{@link #getType() <em>Type</em>}' attribute.
@@ -206,8 +206,8 @@ public class BasicTypeTypeImpl extends EObjectImpl implements BasicTypeType {
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (type: ");
-      if (typeESet) result.append(type); else result.append("<unset>");
+      result.append(" (type: "); //$NON-NLS-1$
+      if (typeESet) result.append(type); else result.append("<unset>"); //$NON-NLS-1$
       result.append(')');
       return result.toString();
    }
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/DataTypeTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/DataTypeTypeImpl.java
index d522aab..71abbfd 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/DataTypeTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/DataTypeTypeImpl.java
@@ -49,7 +49,7 @@ public class DataTypeTypeImpl extends EObjectImpl implements DataTypeType
     * <!-- end-user-doc -->
     * @generated
     */
-   public static final String copyright = "Copyright 2008 by SunGard";
+   public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
    /**
     * The cached value of the '{@link #getBasicType() <em>Basic Type</em>}' containment reference.
@@ -498,7 +498,7 @@ public class DataTypeTypeImpl extends EObjectImpl implements DataTypeType
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (carnotType: ");
+      result.append(" (carnotType: "); //$NON-NLS-1$
       result.append(carnotType);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/DeclaredTypeTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/DeclaredTypeTypeImpl.java
index 6ae5b11..b370c10 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/DeclaredTypeTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/DeclaredTypeTypeImpl.java
@@ -37,7 +37,7 @@ public class DeclaredTypeTypeImpl extends EObjectImpl implements DeclaredTypeTyp
 	 * <!-- end-user-doc -->
     * @generated
     */
-	public static final String copyright = "Copyright 2008 by SunGard";
+	public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
 	/**
     * The default value of the '{@link #getId() <em>Id</em>}' attribute.
@@ -171,7 +171,7 @@ public class DeclaredTypeTypeImpl extends EObjectImpl implements DeclaredTypeTyp
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (id: ");
+      result.append(" (id: "); //$NON-NLS-1$
       result.append(id);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/ExtendedAttributeTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/ExtendedAttributeTypeImpl.java
index 9eb093c..3579f9c 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/ExtendedAttributeTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/ExtendedAttributeTypeImpl.java
@@ -49,7 +49,7 @@ public class ExtendedAttributeTypeImpl extends EObjectImpl implements ExtendedAt
 	 * <!-- end-user-doc -->
     * @generated
     */
-	public static final String copyright = "Copyright 2008 by SunGard";
+	public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
 	/**
     * The cached value of the '{@link #getExtendedAnnotation() <em>Extended Annotation</em>}' containment reference.
@@ -394,11 +394,11 @@ public class ExtendedAttributeTypeImpl extends EObjectImpl implements ExtendedAt
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (mixed: ");
+      result.append(" (mixed: "); //$NON-NLS-1$
       result.append(mixed);
-      result.append(", name: ");
+      result.append(", name: "); //$NON-NLS-1$
       result.append(name);
-      result.append(", value: ");
+      result.append(", value: "); //$NON-NLS-1$
       result.append(value);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/ExtendedAttributesTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/ExtendedAttributesTypeImpl.java
index 72c2052..bd7a43c 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/ExtendedAttributesTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/ExtendedAttributesTypeImpl.java
@@ -43,7 +43,7 @@ public class ExtendedAttributesTypeImpl extends EObjectImpl implements ExtendedA
 	 * <!-- end-user-doc -->
     * @generated
     */
-	public static final String copyright = "Copyright 2008 by SunGard";
+	public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
 	/**
     * The cached value of the '{@link #getExtendedAttribute() <em>Extended Attribute</em>}' containment reference list.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/ExternalPackageImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/ExternalPackageImpl.java
index 5b52854..449094a 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/ExternalPackageImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/ExternalPackageImpl.java
@@ -44,7 +44,7 @@ public class ExternalPackageImpl extends EObjectImpl implements ExternalPackage
     * <!-- end-user-doc -->
     * @generated
     */
-   public static final String copyright = "Copyright 2008 by SunGard";
+   public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
    /**
     * The cached value of the '{@link #getExtendedAttributes() <em>Extended Attributes</em>}' containment reference.
@@ -377,11 +377,11 @@ public class ExternalPackageImpl extends EObjectImpl implements ExternalPackage
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (href: ");
+      result.append(" (href: "); //$NON-NLS-1$
       result.append(href);
-      result.append(", id: ");
+      result.append(", id: "); //$NON-NLS-1$
       result.append(id);
-      result.append(", name: ");
+      result.append(", name: "); //$NON-NLS-1$
       result.append(name);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/ExternalPackagesImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/ExternalPackagesImpl.java
index 1430d76..bbaa057 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/ExternalPackagesImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/ExternalPackagesImpl.java
@@ -44,7 +44,7 @@ public class ExternalPackagesImpl extends EObjectImpl implements ExternalPackage
     * <!-- end-user-doc -->
     * @generated
     */
-   public static final String copyright = "Copyright 2008 by SunGard";
+   public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
    /**
     * The cached value of the '{@link #getExternalPackage() <em>External Package</em>}' containment reference list.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/ExternalReferenceTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/ExternalReferenceTypeImpl.java
index db5001f..6f07432 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/ExternalReferenceTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/ExternalReferenceTypeImpl.java
@@ -57,7 +57,7 @@ public class ExternalReferenceTypeImpl extends EObjectImpl implements ExternalRe
 	 * <!-- end-user-doc -->
     * @generated
     */
-	public static final String copyright = "Copyright 2008 by SunGard";
+	public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getSchema() <em>Schema</em>}' reference.
@@ -299,7 +299,7 @@ public class ExternalReferenceTypeImpl extends EObjectImpl implements ExternalRe
        {
           url = location;
        }
-       if (!url.toLowerCase().startsWith("http://"))
+       if (!url.toLowerCase().startsWith("http://")) //$NON-NLS-1$
       {
          IProject project = ModelUtils.getProjectFromEObject(declaration);
          if (project != null)
@@ -443,11 +443,11 @@ public class ExternalReferenceTypeImpl extends EObjectImpl implements ExternalRe
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (location: ");
+      result.append(" (location: "); //$NON-NLS-1$
       result.append(location);
-      result.append(", namespace: ");
+      result.append(", namespace: "); //$NON-NLS-1$
       result.append(namespace);
-      result.append(", xref: ");
+      result.append(", xref: "); //$NON-NLS-1$
       result.append(xref);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/FormalParameterTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/FormalParameterTypeImpl.java
index 43cba62..5f503c9 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/FormalParameterTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/FormalParameterTypeImpl.java
@@ -46,7 +46,7 @@ public class FormalParameterTypeImpl extends EObjectImpl implements FormalParame
     * <!-- end-user-doc -->
     * @generated
     */
-   public static final String copyright = "Copyright 2008 by SunGard";
+   public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
    /**
     * The cached value of the '{@link #getDataType() <em>Data Type</em>}' containment reference.
@@ -468,13 +468,13 @@ public class FormalParameterTypeImpl extends EObjectImpl implements FormalParame
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (description: ");
+      result.append(" (description: "); //$NON-NLS-1$
       result.append(description);
-      result.append(", id: ");
+      result.append(", id: "); //$NON-NLS-1$
       result.append(id);
-      result.append(", mode: ");
-      if (modeESet) result.append(mode); else result.append("<unset>");
-      result.append(", name: ");
+      result.append(", mode: "); //$NON-NLS-1$
+      if (modeESet) result.append(mode); else result.append("<unset>"); //$NON-NLS-1$
+      result.append(", name: "); //$NON-NLS-1$
       result.append(name);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/FormalParametersTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/FormalParametersTypeImpl.java
index 3363d79..773cf5c 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/FormalParametersTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/FormalParametersTypeImpl.java
@@ -44,7 +44,7 @@ public class FormalParametersTypeImpl extends EObjectImpl implements FormalParam
     * <!-- end-user-doc -->
     * @generated
     */
-   public static final String copyright = "Copyright 2008 by SunGard";
+   public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
    /**
     * The cached value of the '{@link #getFormalParameter() <em>Formal Parameter</em>}' containment reference list.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/SchemaTypeTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/SchemaTypeTypeImpl.java
index bf98437..03e4c3b 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/SchemaTypeTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/SchemaTypeTypeImpl.java
@@ -40,7 +40,7 @@ public class SchemaTypeTypeImpl extends EObjectImpl implements SchemaTypeType {
 	 * <!-- end-user-doc -->
     * @generated
     */
-	public static final String copyright = "Copyright 2008 by SunGard";
+	public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
 	/**
     * The cached value of the '{@link #getSchema() <em>Schema</em>}' containment reference.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/ScriptTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/ScriptTypeImpl.java
index e40a67b..dbba913 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/ScriptTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/ScriptTypeImpl.java
@@ -40,7 +40,7 @@ public class ScriptTypeImpl extends EObjectImpl implements ScriptType
 	 * <!-- end-user-doc -->
     * @generated
     */
-	public static final String copyright = "Copyright 2008 by SunGard";
+	public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
    /**
     * The default value of the '{@link #getGrammar() <em>Grammar</em>}' attribute.
@@ -289,11 +289,11 @@ public class ScriptTypeImpl extends EObjectImpl implements ScriptType
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (grammar: ");
+      result.append(" (grammar: "); //$NON-NLS-1$
       result.append(grammar);
-      result.append(", type: ");
+      result.append(", type: "); //$NON-NLS-1$
       result.append(type);
-      result.append(", version: ");
+      result.append(", version: "); //$NON-NLS-1$
       result.append(version);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/TypeDeclarationTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/TypeDeclarationTypeImpl.java
index 10c28a8..77ae0bf 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/TypeDeclarationTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/TypeDeclarationTypeImpl.java
@@ -53,7 +53,7 @@ public class TypeDeclarationTypeImpl extends EObjectImpl implements TypeDeclarat
 	 * <!-- end-user-doc -->
     * @generated
     */
-	public static final String copyright = "Copyright 2008 by SunGard";
+	public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
 	/**
     * The cached value of the '{@link #getExtendedAttributes() <em>Extended Attributes</em>}' containment reference.
@@ -676,11 +676,11 @@ public class TypeDeclarationTypeImpl extends EObjectImpl implements TypeDeclarat
       if (eIsProxy()) return super.toString();
 
       StringBuffer result = new StringBuffer(super.toString());
-      result.append(" (description: ");
+      result.append(" (description: "); //$NON-NLS-1$
       result.append(description);
-      result.append(", id: ");
+      result.append(", id: "); //$NON-NLS-1$
       result.append(id);
-      result.append(", name: ");
+      result.append(", name: "); //$NON-NLS-1$
       result.append(name);
       result.append(')');
       return result.toString();
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/TypeDeclarationsTypeImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/TypeDeclarationsTypeImpl.java
index 9d6e1c7..06e086b 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/TypeDeclarationsTypeImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/TypeDeclarationsTypeImpl.java
@@ -43,7 +43,7 @@ public class TypeDeclarationsTypeImpl extends EObjectImpl implements TypeDeclara
 	 * <!-- end-user-doc -->
     * @generated
     */
-	public static final String copyright = "Copyright 2008 by SunGard";
+	public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
 	/**
     * The cached value of the '{@link #getTypeDeclaration() <em>Type Declaration</em>}' containment reference list.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/XpdlFactoryImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/XpdlFactoryImpl.java
index 84f6f9a..b8883c4 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/XpdlFactoryImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/XpdlFactoryImpl.java
@@ -11,12 +11,15 @@
 package org.eclipse.stardust.model.xpdl.xpdl2.impl;
 
 
+import java.text.MessageFormat;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.stardust.model.xpdl.carnot.Model_Messages;
 import org.eclipse.stardust.model.xpdl.xpdl2.BasicTypeType;
 import org.eclipse.stardust.model.xpdl.xpdl2.DataTypeType;
 import org.eclipse.stardust.model.xpdl.xpdl2.DeclaredTypeType;
@@ -49,7 +52,7 @@ public class XpdlFactoryImpl extends EFactoryImpl implements XpdlFactory
 	 * <!-- end-user-doc -->
     * @generated
     */
-	public static final String copyright = "Copyright 2008 by SunGard";
+	public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
    /**
     * Creates the default factory implementation.
@@ -61,7 +64,7 @@ public class XpdlFactoryImpl extends EFactoryImpl implements XpdlFactory
    {
       try
       {
-         XpdlFactory theXpdlFactory = (XpdlFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.wfmc.org/2008/XPDL2.1"); 
+         XpdlFactory theXpdlFactory = (XpdlFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.wfmc.org/2008/XPDL2.1");  //$NON-NLS-1$
          if (theXpdlFactory != null)
          {
             return theXpdlFactory;
@@ -110,7 +113,7 @@ public class XpdlFactoryImpl extends EFactoryImpl implements XpdlFactory
          case XpdlPackage.TYPE_DECLARATIONS_TYPE: return createTypeDeclarationsType();
          case XpdlPackage.TYPE_DECLARATION_TYPE: return createTypeDeclarationType();
          default:
-            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_CLASS_NULL_IS_NOT_A_VALID_CLASSIFIER, new Object[]{eClass.getName()}));
       }
    }
 
@@ -133,7 +136,8 @@ public class XpdlFactoryImpl extends EFactoryImpl implements XpdlFactory
          case XpdlPackage.TYPE_TYPE_OBJECT:
             return createTypeTypeObjectFromString(eDataType, initialValue);
          default:
-            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+        	 
+            throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_DATATYPE_NULL_IS_NOT_VALID_CLASSIFIER, new Object[]{eDataType.getName()}));
       }
    }
 
@@ -156,7 +160,7 @@ public class XpdlFactoryImpl extends EFactoryImpl implements XpdlFactory
          case XpdlPackage.TYPE_TYPE_OBJECT:
             return convertTypeTypeObjectToString(eDataType, instanceValue);
          default:
-            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_DATATYPE_NULL_IS_NOT_VALID_CLASSIFIER, new Object[]{eDataType.getName()}));
       }
    }
 
@@ -322,7 +326,7 @@ public class XpdlFactoryImpl extends EFactoryImpl implements XpdlFactory
    public ModeType createModeTypeFromString(EDataType eDataType, String initialValue)
    {
       ModeType result = ModeType.get(initialValue);
-      if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+      if (result == null) throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_VALUE_NULL_IS_NOT_VALID_ENUMERATION_OF_ONE, new Object[]{initialValue, eDataType.getName()}));
       return result;
    }
 
@@ -344,7 +348,7 @@ public class XpdlFactoryImpl extends EFactoryImpl implements XpdlFactory
 	public TypeType createTypeTypeFromString(EDataType eDataType, String initialValue)
    {
       TypeType result = TypeType.get(initialValue);
-      if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+      if (result == null) throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_VALUE_NULL_IS_NOT_VALID_ENUMERATION_OF_ONE, new Object[]{initialValue, eDataType.getName()}));
       return result;
    }
 
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/XpdlPackageImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/XpdlPackageImpl.java
index d50d729..451cf3f 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/XpdlPackageImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/impl/XpdlPackageImpl.java
@@ -59,7 +59,7 @@ public class XpdlPackageImpl extends EPackageImpl implements XpdlPackage
 	 * <!-- end-user-doc -->
     * @generated
     */
-	public static final String copyright = "Copyright 2008 by SunGard";
+	public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
    /**
     * <!-- begin-user-doc -->
@@ -1036,105 +1036,105 @@ public class XpdlPackageImpl extends EPackageImpl implements XpdlPackage
       typeDeclarationTypeEClass.getESuperTypes().add(this.getExtensible());
 
       // Initialize classes and features; add operations and parameters
-      initEClass(basicTypeTypeEClass, BasicTypeType.class, "BasicTypeType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-      initEAttribute(getBasicTypeType_Type(), this.getTypeType(), "type", "STRING", 1, 1, BasicTypeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+      initEClass(basicTypeTypeEClass, BasicTypeType.class, "BasicTypeType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+      initEAttribute(getBasicTypeType_Type(), this.getTypeType(), "type", "STRING", 1, 1, BasicTypeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
 
-      initEClass(dataTypeTypeEClass, DataTypeType.class, "DataTypeType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-      initEReference(getDataTypeType_BasicType(), this.getBasicTypeType(), null, "basicType", null, 0, 1, DataTypeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-      initEReference(getDataTypeType_DeclaredType(), this.getDeclaredTypeType(), null, "declaredType", null, 0, 1, DataTypeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-      initEReference(getDataTypeType_SchemaType(), this.getSchemaTypeType(), null, "schemaType", null, 0, 1, DataTypeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-      initEReference(getDataTypeType_ExternalReference(), this.getExternalReferenceType(), null, "externalReference", null, 0, 1, DataTypeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-      initEAttribute(getDataTypeType_CarnotType(), theXMLTypePackage.getString(), "carnotType", null, 0, 1, DataTypeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+      initEClass(dataTypeTypeEClass, DataTypeType.class, "DataTypeType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+      initEReference(getDataTypeType_BasicType(), this.getBasicTypeType(), null, "basicType", null, 0, 1, DataTypeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+      initEReference(getDataTypeType_DeclaredType(), this.getDeclaredTypeType(), null, "declaredType", null, 0, 1, DataTypeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+      initEReference(getDataTypeType_SchemaType(), this.getSchemaTypeType(), null, "schemaType", null, 0, 1, DataTypeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+      initEReference(getDataTypeType_ExternalReference(), this.getExternalReferenceType(), null, "externalReference", null, 0, 1, DataTypeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+      initEAttribute(getDataTypeType_CarnotType(), theXMLTypePackage.getString(), "carnotType", null, 0, 1, DataTypeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-      addEOperation(dataTypeTypeEClass, this.getXpdlTypeType(), "getDataType", 0, 1, IS_UNIQUE, IS_ORDERED);
+      addEOperation(dataTypeTypeEClass, this.getXpdlTypeType(), "getDataType", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
 
-      initEClass(declaredTypeTypeEClass, DeclaredTypeType.class, "DeclaredTypeType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-      initEAttribute(getDeclaredTypeType_Id(), theXMLTypePackage.getIDREF(), "id", null, 1, 1, DeclaredTypeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+      initEClass(declaredTypeTypeEClass, DeclaredTypeType.class, "DeclaredTypeType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+      initEAttribute(getDeclaredTypeType_Id(), theXMLTypePackage.getIDREF(), "id", null, 1, 1, DeclaredTypeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-      initEClass(extendedAttributesTypeEClass, ExtendedAttributesType.class, "ExtendedAttributesType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-      initEReference(getExtendedAttributesType_ExtendedAttribute(), this.getExtendedAttributeType(), null, "extendedAttribute", null, 0, -1, ExtendedAttributesType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+      initEClass(extendedAttributesTypeEClass, ExtendedAttributesType.class, "ExtendedAttributesType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+      initEReference(getExtendedAttributesType_ExtendedAttribute(), this.getExtendedAttributeType(), null, "extendedAttribute", null, 0, -1, ExtendedAttributesType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-      initEClass(extendedAttributeTypeEClass, ExtendedAttributeType.class, "ExtendedAttributeType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-      initEReference(getExtendedAttributeType_ExtendedAnnotation(), theExtensionPackage.getExtendedAnnotationType(), null, "extendedAnnotation", null, 0, 1, ExtendedAttributeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-      initEAttribute(getExtendedAttributeType_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, ExtendedAttributeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-      initEAttribute(getExtendedAttributeType_Group(), ecorePackage.getEFeatureMapEntry(), "group", null, 0, -1, ExtendedAttributeType.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-      initEAttribute(getExtendedAttributeType_Any(), ecorePackage.getEFeatureMapEntry(), "any", null, 0, -1, ExtendedAttributeType.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-      initEAttribute(getExtendedAttributeType_Name(), theXMLTypePackage.getNMTOKEN(), "name", null, 1, 1, ExtendedAttributeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-      initEAttribute(getExtendedAttributeType_Value(), theXMLTypePackage.getString(), "value", null, 0, 1, ExtendedAttributeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+      initEClass(extendedAttributeTypeEClass, ExtendedAttributeType.class, "ExtendedAttributeType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+      initEReference(getExtendedAttributeType_ExtendedAnnotation(), theExtensionPackage.getExtendedAnnotationType(), null, "extendedAnnotation", null, 0, 1, ExtendedAttributeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+      initEAttribute(getExtendedAttributeType_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, ExtendedAttributeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+      initEAttribute(getExtendedAttributeType_Group(), ecorePackage.getEFeatureMapEntry(), "group", null, 0, -1, ExtendedAttributeType.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+      initEAttribute(getExtendedAttributeType_Any(), ecorePackage.getEFeatureMapEntry(), "any", null, 0, -1, ExtendedAttributeType.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+      initEAttribute(getExtendedAttributeType_Name(), theXMLTypePackage.getNMTOKEN(), "name", null, 1, 1, ExtendedAttributeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+      initEAttribute(getExtendedAttributeType_Value(), theXMLTypePackage.getString(), "value", null, 0, 1, ExtendedAttributeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-      initEClass(extensibleEClass, Extensible.class, "Extensible", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-      initEReference(getExtensible_ExtendedAttributes(), this.getExtendedAttributesType(), null, "extendedAttributes", null, 0, 1, Extensible.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+      initEClass(extensibleEClass, Extensible.class, "Extensible", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+      initEReference(getExtensible_ExtendedAttributes(), this.getExtendedAttributesType(), null, "extendedAttributes", null, 0, 1, Extensible.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-      initEClass(externalPackagesEClass, ExternalPackages.class, "ExternalPackages", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-      initEReference(getExternalPackages_ExternalPackage(), this.getExternalPackage(), null, "externalPackage", null, 0, -1, ExternalPackages.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+      initEClass(externalPackagesEClass, ExternalPackages.class, "ExternalPackages", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+      initEReference(getExternalPackages_ExternalPackage(), this.getExternalPackage(), null, "externalPackage", null, 0, -1, ExternalPackages.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-      EOperation op = addEOperation(externalPackagesEClass, this.getExternalPackage(), "getExternalPackage", 0, 1, IS_UNIQUE, IS_ORDERED);
-      addEParameter(op, theXMLTypePackage.getString(), "packageId", 0, 1, IS_UNIQUE, IS_ORDERED);
+      EOperation op = addEOperation(externalPackagesEClass, this.getExternalPackage(), "getExternalPackage", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+      addEParameter(op, theXMLTypePackage.getString(), "packageId", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
 
-      initEClass(externalPackageEClass, ExternalPackage.class, "ExternalPackage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-      initEAttribute(getExternalPackage_Href(), theXMLTypePackage.getString(), "href", null, 1, 1, ExternalPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-      initEAttribute(getExternalPackage_Id(), theXMLTypePackage.getID(), "id", null, 1, 1, ExternalPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-      initEAttribute(getExternalPackage_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, ExternalPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+      initEClass(externalPackageEClass, ExternalPackage.class, "ExternalPackage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+      initEAttribute(getExternalPackage_Href(), theXMLTypePackage.getString(), "href", null, 1, 1, ExternalPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+      initEAttribute(getExternalPackage_Id(), theXMLTypePackage.getID(), "id", null, 1, 1, ExternalPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+      initEAttribute(getExternalPackage_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, ExternalPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-      initEClass(externalReferenceTypeEClass, ExternalReferenceType.class, "ExternalReferenceType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-      initEAttribute(getExternalReferenceType_Location(), theXMLTypePackage.getAnyURI(), "location", null, 1, 1, ExternalReferenceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-      initEAttribute(getExternalReferenceType_Namespace(), theXMLTypePackage.getAnyURI(), "namespace", null, 0, 1, ExternalReferenceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-      initEAttribute(getExternalReferenceType_Xref(), theXMLTypePackage.getNMTOKEN(), "xref", null, 0, 1, ExternalReferenceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+      initEClass(externalReferenceTypeEClass, ExternalReferenceType.class, "ExternalReferenceType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+      initEAttribute(getExternalReferenceType_Location(), theXMLTypePackage.getAnyURI(), "location", null, 1, 1, ExternalReferenceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+      initEAttribute(getExternalReferenceType_Namespace(), theXMLTypePackage.getAnyURI(), "namespace", null, 0, 1, ExternalReferenceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+      initEAttribute(getExternalReferenceType_Xref(), theXMLTypePackage.getNMTOKEN(), "xref", null, 0, 1, ExternalReferenceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-      addEOperation(externalReferenceTypeEClass, theXSDPackage.getXSDSchema(), "getSchema", 0, 1, IS_UNIQUE, IS_ORDERED);
+      addEOperation(externalReferenceTypeEClass, theXSDPackage.getXSDSchema(), "getSchema", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
 
-      initEClass(formalParametersTypeEClass, FormalParametersType.class, "FormalParametersType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-      initEReference(getFormalParametersType_FormalParameter(), this.getFormalParameterType(), null, "formalParameter", null, 0, -1, FormalParametersType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+      initEClass(formalParametersTypeEClass, FormalParametersType.class, "FormalParametersType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+      initEReference(getFormalParametersType_FormalParameter(), this.getFormalParameterType(), null, "formalParameter", null, 0, -1, FormalParametersType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-      op = addEOperation(formalParametersTypeEClass, null, "addFormalParameter", 0, 1, IS_UNIQUE, IS_ORDERED);
-      addEParameter(op, this.getFormalParameterType(), "parameter", 0, 1, IS_UNIQUE, IS_ORDERED);
+      op = addEOperation(formalParametersTypeEClass, null, "addFormalParameter", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+      addEParameter(op, this.getFormalParameterType(), "parameter", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
 
-      op = addEOperation(formalParametersTypeEClass, this.getFormalParameterType(), "getFormalParameter", 0, 1, IS_UNIQUE, IS_ORDERED);
-      addEParameter(op, theXMLTypePackage.getString(), "parameterId", 0, 1, IS_UNIQUE, IS_ORDERED);
+      op = addEOperation(formalParametersTypeEClass, this.getFormalParameterType(), "getFormalParameter", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+      addEParameter(op, theXMLTypePackage.getString(), "parameterId", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
 
-      initEClass(formalParameterTypeEClass, FormalParameterType.class, "FormalParameterType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-      initEReference(getFormalParameterType_DataType(), this.getDataTypeType(), null, "dataType", null, 0, 1, FormalParameterType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-      initEAttribute(getFormalParameterType_Description(), theXMLTypePackage.getString(), "description", null, 0, 1, FormalParameterType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-      initEAttribute(getFormalParameterType_Id(), theXMLTypePackage.getID(), "id", null, 1, 1, FormalParameterType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-      initEAttribute(getFormalParameterType_Mode(), this.getModeType(), "mode", "IN", 0, 1, FormalParameterType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-      initEAttribute(getFormalParameterType_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, FormalParameterType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+      initEClass(formalParameterTypeEClass, FormalParameterType.class, "FormalParameterType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+      initEReference(getFormalParameterType_DataType(), this.getDataTypeType(), null, "dataType", null, 0, 1, FormalParameterType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+      initEAttribute(getFormalParameterType_Description(), theXMLTypePackage.getString(), "description", null, 0, 1, FormalParameterType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+      initEAttribute(getFormalParameterType_Id(), theXMLTypePackage.getID(), "id", null, 1, 1, FormalParameterType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+      initEAttribute(getFormalParameterType_Mode(), this.getModeType(), "mode", "IN", 0, 1, FormalParameterType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+      initEAttribute(getFormalParameterType_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, FormalParameterType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-      initEClass(schemaTypeTypeEClass, SchemaTypeType.class, "SchemaTypeType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-      initEReference(getSchemaTypeType_Schema(), theXSDPackage.getXSDSchema(), null, "schema", null, 0, 1, SchemaTypeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+      initEClass(schemaTypeTypeEClass, SchemaTypeType.class, "SchemaTypeType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+      initEReference(getSchemaTypeType_Schema(), theXSDPackage.getXSDSchema(), null, "schema", null, 0, 1, SchemaTypeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-      initEClass(scriptTypeEClass, ScriptType.class, "ScriptType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-      initEAttribute(getScriptType_Grammar(), theXMLTypePackage.getAnyURI(), "grammar", null, 0, 1, ScriptType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-      initEAttribute(getScriptType_Type(), theXMLTypePackage.getString(), "type", null, 1, 1, ScriptType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-      initEAttribute(getScriptType_Version(), theXMLTypePackage.getString(), "version", null, 0, 1, ScriptType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+      initEClass(scriptTypeEClass, ScriptType.class, "ScriptType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+      initEAttribute(getScriptType_Grammar(), theXMLTypePackage.getAnyURI(), "grammar", null, 0, 1, ScriptType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+      initEAttribute(getScriptType_Type(), theXMLTypePackage.getString(), "type", null, 1, 1, ScriptType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+      initEAttribute(getScriptType_Version(), theXMLTypePackage.getString(), "version", null, 0, 1, ScriptType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-      initEClass(typeDeclarationsTypeEClass, TypeDeclarationsType.class, "TypeDeclarationsType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-      initEReference(getTypeDeclarationsType_TypeDeclaration(), this.getTypeDeclarationType(), null, "typeDeclaration", null, 0, -1, TypeDeclarationsType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+      initEClass(typeDeclarationsTypeEClass, TypeDeclarationsType.class, "TypeDeclarationsType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+      initEReference(getTypeDeclarationsType_TypeDeclaration(), this.getTypeDeclarationType(), null, "typeDeclaration", null, 0, -1, TypeDeclarationsType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-      op = addEOperation(typeDeclarationsTypeEClass, this.getTypeDeclarationType(), "getTypeDeclaration", 0, 1, IS_UNIQUE, IS_ORDERED);
-      addEParameter(op, theXMLTypePackage.getString(), "typeId", 0, 1, IS_UNIQUE, IS_ORDERED);
+      op = addEOperation(typeDeclarationsTypeEClass, this.getTypeDeclarationType(), "getTypeDeclaration", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+      addEParameter(op, theXMLTypePackage.getString(), "typeId", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
 
-      initEClass(typeDeclarationTypeEClass, TypeDeclarationType.class, "TypeDeclarationType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-      initEReference(getTypeDeclarationType_BasicType(), this.getBasicTypeType(), null, "basicType", null, 0, 1, TypeDeclarationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-      initEReference(getTypeDeclarationType_DeclaredType(), this.getDeclaredTypeType(), null, "declaredType", null, 0, 1, TypeDeclarationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-      initEReference(getTypeDeclarationType_SchemaType(), this.getSchemaTypeType(), null, "schemaType", null, 0, 1, TypeDeclarationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-      initEReference(getTypeDeclarationType_ExternalReference(), this.getExternalReferenceType(), null, "externalReference", null, 0, 1, TypeDeclarationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-      initEAttribute(getTypeDeclarationType_Description(), theXMLTypePackage.getString(), "description", null, 0, 1, TypeDeclarationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-      initEAttribute(getTypeDeclarationType_Id(), theXMLTypePackage.getID(), "id", null, 1, 1, TypeDeclarationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-      initEAttribute(getTypeDeclarationType_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, TypeDeclarationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+      initEClass(typeDeclarationTypeEClass, TypeDeclarationType.class, "TypeDeclarationType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+      initEReference(getTypeDeclarationType_BasicType(), this.getBasicTypeType(), null, "basicType", null, 0, 1, TypeDeclarationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+      initEReference(getTypeDeclarationType_DeclaredType(), this.getDeclaredTypeType(), null, "declaredType", null, 0, 1, TypeDeclarationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+      initEReference(getTypeDeclarationType_SchemaType(), this.getSchemaTypeType(), null, "schemaType", null, 0, 1, TypeDeclarationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+      initEReference(getTypeDeclarationType_ExternalReference(), this.getExternalReferenceType(), null, "externalReference", null, 0, 1, TypeDeclarationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+      initEAttribute(getTypeDeclarationType_Description(), theXMLTypePackage.getString(), "description", null, 0, 1, TypeDeclarationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+      initEAttribute(getTypeDeclarationType_Id(), theXMLTypePackage.getID(), "id", null, 1, 1, TypeDeclarationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+      initEAttribute(getTypeDeclarationType_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, TypeDeclarationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-      addEOperation(typeDeclarationTypeEClass, this.getXpdlTypeType(), "getDataType", 0, 1, IS_UNIQUE, IS_ORDERED);
+      addEOperation(typeDeclarationTypeEClass, this.getXpdlTypeType(), "getDataType", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
 
-      addEOperation(typeDeclarationTypeEClass, theXSDPackage.getXSDSchema(), "getSchema", 0, 1, IS_UNIQUE, IS_ORDERED);
+      addEOperation(typeDeclarationTypeEClass, theXSDPackage.getXSDSchema(), "getSchema", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
 
-      initEClass(xpdlTypeTypeEClass, XpdlTypeType.class, "XpdlTypeType", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+      initEClass(xpdlTypeTypeEClass, XpdlTypeType.class, "XpdlTypeType", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
       // Initialize enums and add enum literals
-      initEEnum(modeTypeEEnum, ModeType.class, "ModeType");
+      initEEnum(modeTypeEEnum, ModeType.class, "ModeType"); //$NON-NLS-1$
       addEEnumLiteral(modeTypeEEnum, ModeType.IN);
       addEEnumLiteral(modeTypeEEnum, ModeType.OUT);
       addEEnumLiteral(modeTypeEEnum, ModeType.INOUT);
 
-      initEEnum(typeTypeEEnum, TypeType.class, "TypeType");
+      initEEnum(typeTypeEEnum, TypeType.class, "TypeType"); //$NON-NLS-1$
       addEEnumLiteral(typeTypeEEnum, TypeType.STRING_LITERAL);
       addEEnumLiteral(typeTypeEEnum, TypeType.FLOAT_LITERAL);
       addEEnumLiteral(typeTypeEEnum, TypeType.INTEGER_LITERAL);
@@ -1144,8 +1144,8 @@ public class XpdlPackageImpl extends EPackageImpl implements XpdlPackage
       addEEnumLiteral(typeTypeEEnum, TypeType.PERFORMER_LITERAL);
 
       // Initialize data types
-      initEDataType(modeTypeObjectEDataType, ModeType.class, "ModeTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS);
-      initEDataType(typeTypeObjectEDataType, TypeType.class, "TypeTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS);
+      initEDataType(modeTypeObjectEDataType, ModeType.class, "ModeTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+      initEDataType(typeTypeObjectEDataType, TypeType.class, "TypeTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
       // Create resource
       createResource(eNS_URI);
@@ -1163,490 +1163,490 @@ public class XpdlPackageImpl extends EPackageImpl implements XpdlPackage
     */
 	protected void createExtendedMetaDataAnnotations()
    {
-      String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";		
+      String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";		 //$NON-NLS-1$
       addAnnotation
         (basicTypeTypeEClass, 
          source, 
          new String[] 
          {
-          "name", "BasicType_._type",
-          "kind", "empty"
+          "name", "BasicType_._type", //$NON-NLS-1$ //$NON-NLS-2$
+          "kind", "empty" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getBasicTypeType_Type(), 
          source, 
          new String[] 
          {
-          "kind", "attribute",
-          "name", "Type"
+          "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "Type" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (dataTypeTypeEClass, 
          source, 
          new String[] 
          {
-          "name", "DataType_._type",
-          "kind", "elementOnly"
+          "name", "DataType_._type", //$NON-NLS-1$ //$NON-NLS-2$
+          "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getDataTypeType_BasicType(), 
          source, 
          new String[] 
          {
-          "kind", "element",
-          "name", "BasicType",
-          "namespace", "##targetNamespace"
+          "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "BasicType", //$NON-NLS-1$ //$NON-NLS-2$
+          "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getDataTypeType_DeclaredType(), 
          source, 
          new String[] 
          {
-          "kind", "element",
-          "name", "DeclaredType",
-          "namespace", "##targetNamespace"
+          "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "DeclaredType", //$NON-NLS-1$ //$NON-NLS-2$
+          "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getDataTypeType_SchemaType(), 
          source, 
          new String[] 
          {
-          "kind", "element",
-          "name", "SchemaType",
-          "namespace", "##targetNamespace"
+          "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "SchemaType", //$NON-NLS-1$ //$NON-NLS-2$
+          "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getDataTypeType_ExternalReference(), 
          source, 
          new String[] 
          {
-          "kind", "element",
-          "name", "ExternalReference",
-          "namespace", "##targetNamespace"
+          "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "ExternalReference", //$NON-NLS-1$ //$NON-NLS-2$
+          "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getDataTypeType_CarnotType(), 
          source, 
          new String[] 
          {
-          "kind", "attribute",
-          "name", "carnotType",
-          "namespace", "http://www.carnot.ag/workflowmodel/3.1/xpdl/extensions"
+          "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "carnotType", //$NON-NLS-1$ //$NON-NLS-2$
+          "namespace", "http://www.carnot.ag/workflowmodel/3.1/xpdl/extensions" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (declaredTypeTypeEClass, 
          source, 
          new String[] 
          {
-          "name", "DeclaredType_._type",
-          "kind", "empty"
+          "name", "DeclaredType_._type", //$NON-NLS-1$ //$NON-NLS-2$
+          "kind", "empty" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getDeclaredTypeType_Id(), 
          source, 
          new String[] 
          {
-          "kind", "attribute",
-          "name", "Id"
+          "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "Id" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (extendedAttributesTypeEClass, 
          source, 
          new String[] 
          {
-          "name", "ExtendedAttributes_._type",
-          "kind", "elementOnly"
+          "name", "ExtendedAttributes_._type", //$NON-NLS-1$ //$NON-NLS-2$
+          "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getExtendedAttributesType_ExtendedAttribute(), 
          source, 
          new String[] 
          {
-          "kind", "element",
-          "name", "ExtendedAttribute",
-          "namespace", "##targetNamespace"
+          "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "ExtendedAttribute", //$NON-NLS-1$ //$NON-NLS-2$
+          "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (extendedAttributeTypeEClass, 
          source, 
          new String[] 
          {
-          "name", "ExtendedAttribute_._type",
-          "kind", "mixed"
+          "name", "ExtendedAttribute_._type", //$NON-NLS-1$ //$NON-NLS-2$
+          "kind", "mixed" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getExtendedAttributeType_ExtendedAnnotation(), 
          source, 
          new String[] 
          {
-          "kind", "element",
-          "name", "ExtendedAnnotation",
-          "namespace", "http://www.carnot.ag/workflowmodel/3.1/xpdl/extensions"
+          "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "ExtendedAnnotation", //$NON-NLS-1$ //$NON-NLS-2$
+          "namespace", "http://www.carnot.ag/workflowmodel/3.1/xpdl/extensions" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getExtendedAttributeType_Mixed(), 
          source, 
          new String[] 
          {
-          "kind", "elementWildcard",
-          "name", ":mixed"
+          "kind", "elementWildcard", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", ":mixed" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getExtendedAttributeType_Group(), 
          source, 
          new String[] 
          {
-          "kind", "group",
-          "name", "group:1"
+          "kind", "group", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "group:1" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getExtendedAttributeType_Any(), 
          source, 
          new String[] 
          {
-          "kind", "elementWildcard",
-          "wildcards", "##any",
-          "name", ":2",
-          "processing", "lax",
-          "group", "#group:1"
+          "kind", "elementWildcard", //$NON-NLS-1$ //$NON-NLS-2$
+          "wildcards", "##any", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", ":2", //$NON-NLS-1$ //$NON-NLS-2$
+          "processing", "lax", //$NON-NLS-1$ //$NON-NLS-2$
+          "group", "#group:1" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getExtendedAttributeType_Name(), 
          source, 
          new String[] 
          {
-          "kind", "attribute",
-          "name", "Name"
+          "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "Name" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getExtendedAttributeType_Value(), 
          source, 
          new String[] 
          {
-          "kind", "attribute",
-          "name", "Value"
+          "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "Value" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getExtensible_ExtendedAttributes(), 
          source, 
          new String[] 
          {
-          "kind", "element",
-          "name", "ExtendedAttributes",
-          "namespace", "##targetNamespace"
+          "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "ExtendedAttributes", //$NON-NLS-1$ //$NON-NLS-2$
+          "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (externalPackagesEClass, 
          source, 
          new String[] 
          {
-          "name", "ExternalPackages_._type",
-          "kind", "elementOnly"
+          "name", "ExternalPackages_._type", //$NON-NLS-1$ //$NON-NLS-2$
+          "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getExternalPackages_ExternalPackage(), 
          source, 
          new String[] 
          {
-          "kind", "element",
-          "name", "ExternalPackage",
-          "namespace", "##targetNamespace"
+          "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "ExternalPackage", //$NON-NLS-1$ //$NON-NLS-2$
+          "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (externalPackageEClass, 
          source, 
          new String[] 
          {
-          "name", "ExternalPackage_._type",
-          "kind", "elementOnly"
+          "name", "ExternalPackage_._type", //$NON-NLS-1$ //$NON-NLS-2$
+          "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getExternalPackage_Href(), 
          source, 
          new String[] 
          {
-          "kind", "attribute",
-          "name", "href"
+          "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "href" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getExternalPackage_Id(), 
          source, 
          new String[] 
          {
-          "kind", "attribute",
-          "name", "Id"
+          "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "Id" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getExternalPackage_Name(), 
          source, 
          new String[] 
          {
-          "kind", "attribute",
-          "name", "Name"
+          "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "Name" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (externalReferenceTypeEClass, 
          source, 
          new String[] 
          {
-          "name", "ExternalReference_._type",
-          "kind", "empty"
+          "name", "ExternalReference_._type", //$NON-NLS-1$ //$NON-NLS-2$
+          "kind", "empty" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getExternalReferenceType_Location(), 
          source, 
          new String[] 
          {
-          "kind", "attribute",
-          "name", "location"
+          "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "location" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getExternalReferenceType_Namespace(), 
          source, 
          new String[] 
          {
-          "kind", "attribute",
-          "name", "namespace"
+          "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "namespace" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getExternalReferenceType_Xref(), 
          source, 
          new String[] 
          {
-          "kind", "attribute",
-          "name", "xref"
+          "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "xref" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (formalParametersTypeEClass, 
          source, 
          new String[] 
          {
-          "name", "FormalParameters_._type",
-          "kind", "elementOnly"
+          "name", "FormalParameters_._type", //$NON-NLS-1$ //$NON-NLS-2$
+          "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getFormalParametersType_FormalParameter(), 
          source, 
          new String[] 
          {
-          "kind", "element",
-          "name", "FormalParameter",
-          "namespace", "##targetNamespace"
+          "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "FormalParameter", //$NON-NLS-1$ //$NON-NLS-2$
+          "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (formalParameterTypeEClass, 
          source, 
          new String[] 
          {
-          "name", "FormalParameter_._type",
-          "kind", "elementOnly"
+          "name", "FormalParameter_._type", //$NON-NLS-1$ //$NON-NLS-2$
+          "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getFormalParameterType_DataType(), 
          source, 
          new String[] 
          {
-          "kind", "element",
-          "name", "DataType",
-          "namespace", "##targetNamespace"
+          "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "DataType", //$NON-NLS-1$ //$NON-NLS-2$
+          "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getFormalParameterType_Description(), 
          source, 
          new String[] 
          {
-          "kind", "element",
-          "name", "Description",
-          "namespace", "##targetNamespace"
+          "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "Description", //$NON-NLS-1$ //$NON-NLS-2$
+          "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getFormalParameterType_Id(), 
          source, 
          new String[] 
          {
-          "kind", "attribute",
-          "name", "Id"
+          "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "Id" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getFormalParameterType_Mode(), 
          source, 
          new String[] 
          {
-          "kind", "attribute",
-          "name", "Mode"
+          "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "Mode" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getFormalParameterType_Name(), 
          source, 
          new String[] 
          {
-          "kind", "attribute",
-          "name", "Name"
+          "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "Name" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (schemaTypeTypeEClass, 
          source, 
          new String[] 
          {
-          "name", "SchemaType_._type",
-          "kind", "elementOnly"
+          "name", "SchemaType_._type", //$NON-NLS-1$ //$NON-NLS-2$
+          "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getSchemaTypeType_Schema(), 
          source, 
          new String[] 
          {
-          "kind", "element",
-          "name", "schema",
-          "namespace", "http://www.w3.org/2001/XMLSchema"
+          "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "schema", //$NON-NLS-1$ //$NON-NLS-2$
+          "namespace", "http://www.w3.org/2001/XMLSchema" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (scriptTypeEClass, 
          source, 
          new String[] 
          {
-          "name", "Script_._type",
-          "kind", "empty"
+          "name", "Script_._type", //$NON-NLS-1$ //$NON-NLS-2$
+          "kind", "empty" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getScriptType_Grammar(), 
          source, 
          new String[] 
          {
-          "kind", "attribute",
-          "name", "Grammar"
+          "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "Grammar" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getScriptType_Type(), 
          source, 
          new String[] 
          {
-          "kind", "attribute",
-          "name", "Type"
+          "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "Type" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getScriptType_Version(), 
          source, 
          new String[] 
          {
-          "kind", "attribute",
-          "name", "Version"
+          "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "Version" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (typeDeclarationsTypeEClass, 
          source, 
          new String[] 
          {
-          "name", "TypeDeclarations_._type",
-          "kind", "elementOnly"
+          "name", "TypeDeclarations_._type", //$NON-NLS-1$ //$NON-NLS-2$
+          "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getTypeDeclarationsType_TypeDeclaration(), 
          source, 
          new String[] 
          {
-          "kind", "element",
-          "name", "TypeDeclaration",
-          "namespace", "##targetNamespace"
+          "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "TypeDeclaration", //$NON-NLS-1$ //$NON-NLS-2$
+          "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (typeDeclarationTypeEClass, 
          source, 
          new String[] 
          {
-          "name", "TypeDeclaration_._type",
-          "kind", "elementOnly"
+          "name", "TypeDeclaration_._type", //$NON-NLS-1$ //$NON-NLS-2$
+          "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getTypeDeclarationType_BasicType(), 
          source, 
          new String[] 
          {
-          "kind", "element",
-          "name", "BasicType",
-          "namespace", "##targetNamespace"
+          "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "BasicType", //$NON-NLS-1$ //$NON-NLS-2$
+          "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getTypeDeclarationType_DeclaredType(), 
          source, 
          new String[] 
          {
-          "kind", "element",
-          "name", "DeclaredType",
-          "namespace", "##targetNamespace"
+          "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "DeclaredType", //$NON-NLS-1$ //$NON-NLS-2$
+          "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getTypeDeclarationType_SchemaType(), 
          source, 
          new String[] 
          {
-          "kind", "element",
-          "name", "SchemaType",
-          "namespace", "##targetNamespace"
+          "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "SchemaType", //$NON-NLS-1$ //$NON-NLS-2$
+          "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getTypeDeclarationType_ExternalReference(), 
          source, 
          new String[] 
          {
-          "kind", "element",
-          "name", "ExternalReference",
-          "namespace", "##targetNamespace"
+          "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "ExternalReference", //$NON-NLS-1$ //$NON-NLS-2$
+          "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getTypeDeclarationType_Description(), 
          source, 
          new String[] 
          {
-          "kind", "element",
-          "name", "Description",
-          "namespace", "##targetNamespace"
+          "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "Description", //$NON-NLS-1$ //$NON-NLS-2$
+          "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getTypeDeclarationType_Id(), 
          source, 
          new String[] 
          {
-          "kind", "attribute",
-          "name", "Id"
+          "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "Id" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (getTypeDeclarationType_Name(), 
          source, 
          new String[] 
          {
-          "kind", "attribute",
-          "name", "Name"
+          "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+          "name", "Name" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (modeTypeEEnum, 
          source, 
          new String[] 
          {
-          "name", "Mode_._type"
+          "name", "Mode_._type" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (typeTypeEEnum, 
          source, 
          new String[] 
          {
-          "name", "Type_._type"
+          "name", "Type_._type" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (modeTypeObjectEDataType, 
          source, 
          new String[] 
          {
-          "name", "Mode_._type:Object",
-          "baseType", "Mode_._type"
+          "name", "Mode_._type:Object", //$NON-NLS-1$ //$NON-NLS-2$
+          "baseType", "Mode_._type" //$NON-NLS-1$ //$NON-NLS-2$
          });		
       addAnnotation
         (typeTypeObjectEDataType, 
          source, 
          new String[] 
          {
-          "name", "Type_._type:Object",
-          "baseType", "Type_._type"
+          "name", "Type_._type:Object", //$NON-NLS-1$ //$NON-NLS-2$
+          "baseType", "Type_._type" //$NON-NLS-1$ //$NON-NLS-2$
          });
    }
 
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/util/QNameUtil.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/util/QNameUtil.java
index 9d833ff..2458ba7 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/util/QNameUtil.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/util/QNameUtil.java
@@ -10,6 +10,10 @@
  *******************************************************************************/
 package org.eclipse.stardust.model.xpdl.xpdl2.util;
 
+import java.text.MessageFormat;
+
+import org.eclipse.stardust.model.xpdl.carnot.Model_Messages;
+
 public final class QNameUtil
 {
    private QNameUtil() {};
@@ -22,7 +26,7 @@ public final class QNameUtil
       }
       else
       {
-         return "{" + namespaceURI + "}" + localPart;
+         return "{" + namespaceURI + "}" + localPart; //$NON-NLS-1$ //$NON-NLS-2$
       }
    }
    
@@ -45,7 +49,7 @@ public final class QNameUtil
       }
 
       // Namespace URI improperly specified?
-      if (qNameAsString.startsWith("{}"))
+      if (qNameAsString.startsWith("{}")) //$NON-NLS-1$
       {
          return null;
       }
@@ -54,8 +58,8 @@ public final class QNameUtil
       int endOfNamespaceURI = qNameAsString.indexOf('}');
       if (endOfNamespaceURI == -1)
       {
-          throw new IllegalArgumentException(
-              "Cannot parse QName from \"" + qNameAsString + "\", missing closing \"}\"");
+    	  
+          throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_CANNOT_PARSE_QNAME_FROM_NULL, new Object[]{qNameAsString}));
       }
       return qNameAsString.substring(1, endOfNamespaceURI);
    }
@@ -79,7 +83,7 @@ public final class QNameUtil
       }
 
       // Namespace URI improperly specified?
-      if (qNameAsString.startsWith("{}"))
+      if (qNameAsString.startsWith("{}")) //$NON-NLS-1$
       {
          return qNameAsString.substring(2);
       }
@@ -89,7 +93,7 @@ public final class QNameUtil
       if (endOfNamespaceURI == -1)
       {
           throw new IllegalArgumentException(
-              "Cannot parse QName from \"" + qNameAsString + "\", missing closing \"}\"");
+        		  MessageFormat.format(Model_Messages.EXC_CANNOT_PARSE_QNAME_FROM_NULL, new Object[]{qNameAsString}));
       }
       return qNameAsString.substring(endOfNamespaceURI + 1);
    }
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/util/TypeDeclarationUtils.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/util/TypeDeclarationUtils.java
index 83ae763..1d3cb77 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/util/TypeDeclarationUtils.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/util/TypeDeclarationUtils.java
@@ -266,7 +266,7 @@ public class TypeDeclarationUtils
       HashMap options = new HashMap();
       options.put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
        
-      URI uri = !location.toLowerCase().startsWith("http://") 
+      URI uri = !location.toLowerCase().startsWith("http://")  //$NON-NLS-1$
             ? URI.createPlatformResourceURI(location, true)
             : URI.createURI(location);
       XSDResourceImpl resource = new XSDResourceImpl(uri);
@@ -384,7 +384,7 @@ public class TypeDeclarationUtils
       }
       if (name == null || name.length() == 0)
       {
-         prefix="p";
+         prefix="p"; //$NON-NLS-1$
       }
       else
       {
@@ -431,7 +431,7 @@ public class TypeDeclarationUtils
          if (imports != null && !imports.isEmpty()) {
             for (Iterator<XSDImport> j = imports.iterator(); j.hasNext();) {
                XSDImport xsdImport = j.next();
-               if (xsdImport.getSchemaLocation().endsWith(":" + oldId)) {
+               if (xsdImport.getSchemaLocation().endsWith(":" + oldId)) { //$NON-NLS-1$
                   xsdImport.setSchemaLocation(StructuredDataConstants.URN_INTERNAL_PREFIX + id);                  
                }
             }
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/util/XpdlAdapterFactory.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/util/XpdlAdapterFactory.java
index 466d4e2..662008f 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/util/XpdlAdapterFactory.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/util/XpdlAdapterFactory.java
@@ -48,7 +48,7 @@ public class XpdlAdapterFactory extends AdapterFactoryImpl
 	 * <!-- end-user-doc -->
     * @generated
     */
-	public static final String copyright = "Copyright 2008 by SunGard";
+	public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
    /**
     * The cached model package.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/util/XpdlResourceFactoryImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/util/XpdlResourceFactoryImpl.java
index 76f9f39..377c7bd 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/util/XpdlResourceFactoryImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/util/XpdlResourceFactoryImpl.java
@@ -28,7 +28,7 @@ public class XpdlResourceFactoryImpl extends ResourceFactoryImpl {
 	 * <!-- end-user-doc -->
     * @generated
     */
-	public static final String copyright = "Copyright 2008 by SunGard";
+	public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
 	/**
     * Creates an instance of the resource factory.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/util/XpdlResourceImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/util/XpdlResourceImpl.java
index f54d14c..70047ed 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/util/XpdlResourceImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/util/XpdlResourceImpl.java
@@ -26,7 +26,7 @@ public class XpdlResourceImpl extends XMLResourceImpl {
 	 * <!-- end-user-doc -->
     * @generated
     */
-	public static final String copyright = "Copyright 2008 by SunGard";
+	public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
 	/**
     * Creates an instance of the resource.
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/util/XpdlSwitch.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/util/XpdlSwitch.java
index aa48235..695fece 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/util/XpdlSwitch.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/util/XpdlSwitch.java
@@ -53,7 +53,7 @@ public class XpdlSwitch<T>
 	 * <!-- end-user-doc -->
     * @generated
     */
-	public static final String copyright = "Copyright 2008 by SunGard";
+	public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
    /**
     * The cached model package
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/util/XpdlXMLProcessor.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/util/XpdlXMLProcessor.java
index f7039f1..346fdd5 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/util/XpdlXMLProcessor.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/xpdl2/util/XpdlXMLProcessor.java
@@ -30,7 +30,7 @@ public class XpdlXMLProcessor extends XMLProcessor {
 	 * <!-- end-user-doc -->
     * @generated
     */
-	public static final String copyright = "Copyright 2008 by SunGard";
+	public static final String copyright = "Copyright 2008 by SunGard"; //$NON-NLS-1$
 
 
 	/**
author	Rainer Pielmann	2012-02-01 09:24:21 (EST)
committer	Stephan Born	2012-04-24 04:30:13 (EDT)
commit	452f9b356756dc5f75f282818151ca71b08fdeab (patch) (side-by-side diff)
tree	28dd9dff12d12e7b6e5c89a4ae70951aa6e94ae1
parent	5e240e5f27c6f56192410e40bdad4051d19236e3 (diff)
download	org.eclipse.stardust.ide-452f9b356756dc5f75f282818151ca71b08fdeab.zip org.eclipse.stardust.ide-452f9b356756dc5f75f282818151ca71b08fdeab.tar.gz org.eclipse.stardust.ide-452f9b356756dc5f75f282818151ca71b08fdeab.tar.bz2