CRNT-25760 Refactor/Clean up MB Facade: Renamed MBFacade -> ModelBuilderFacade

git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@58547 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b

15 files changed, 57 insertions, 57 deletions

diff --git a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/ModelingSession.java b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/ModelingSession.java
index 3f68fa4..d1b5fdb 100644
--- a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/ModelingSession.java
+++ b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/ModelingSession.java
@@ -12,7 +12,7 @@ import org.eclipse.stardust.engine.api.runtime.User;
 import org.eclipse.stardust.model.xpdl.builder.common.EObjectUUIDMapper;

 import org.eclipse.stardust.model.xpdl.builder.session.EditingSession;

 import org.eclipse.stardust.model.xpdl.builder.strategy.ModelManagementStrategy;

-import org.eclipse.stardust.model.xpdl.builder.utils.MBFacade;

+import org.eclipse.stardust.model.xpdl.builder.utils.ModelBuilderFacade;

 import org.eclipse.stardust.model.xpdl.carnot.ModelType;

 import org.eclipse.stardust.ui.web.modeler.marshaling.ModelElementMarshaller;

 import org.eclipse.stardust.ui.web.modeler.marshaling.ModelElementUnmarshaller;

@@ -32,7 +32,7 @@ public class ModelingSession
 

    private final EditingSession editingSession = new EditingSession();

    

-   private MBFacade mbFacade;

+   private ModelBuilderFacade mbFacade;

 

    @Resource

    @Qualifier("default")

diff --git a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/ActivityCommandHandler.java b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/ActivityCommandHandler.java
index c7e20cf..8f38697 100644
--- a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/ActivityCommandHandler.java
+++ b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/ActivityCommandHandler.java
@@ -20,7 +20,7 @@ import static org.eclipse.stardust.ui.web.modeler.service.ModelService.Y_PROPERT
 

 import javax.annotation.Resource;

 

-import org.eclipse.stardust.model.xpdl.builder.utils.MBFacade;

+import org.eclipse.stardust.model.xpdl.builder.utils.ModelBuilderFacade;

 import org.eclipse.stardust.model.xpdl.builder.utils.ModelerConstants;

 import org.eclipse.stardust.model.xpdl.carnot.ActivitySymbolType;

 import org.eclipse.stardust.model.xpdl.carnot.ActivityType;

@@ -45,7 +45,7 @@ public class ActivityCommandHandler
 {   

    @Resource

    private ApplicationContext springContext;

-   private MBFacade modelBuilderFacade;

+   private ModelBuilderFacade modelBuilderFacade;

 

    /**

     * @param parentLaneSymbol

@@ -117,11 +117,11 @@ public class ActivityCommandHandler
 

    }

    

-   private MBFacade getModelBuilderFacade()

+   private ModelBuilderFacade getModelBuilderFacade()

    {

       if (modelBuilderFacade == null)

       {

-         modelBuilderFacade = new MBFacade(springContext.getBean(ModelService.class)

+         modelBuilderFacade = new ModelBuilderFacade(springContext.getBean(ModelService.class)

                .getModelManagementStrategy());

       }

       return modelBuilderFacade;

diff --git a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/ConnectionCommandHandler.java b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/ConnectionCommandHandler.java
index dc2106c..c70f7c2 100644
--- a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/ConnectionCommandHandler.java
+++ b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/ConnectionCommandHandler.java
@@ -23,7 +23,7 @@ import com.google.gson.JsonObject;
 import org.eclipse.stardust.common.error.ObjectNotFoundException;

 import org.eclipse.stardust.engine.api.model.PredefinedConstants;

 import org.eclipse.stardust.model.xpdl.builder.common.AbstractElementBuilder;

-import org.eclipse.stardust.model.xpdl.builder.utils.MBFacade;

+import org.eclipse.stardust.model.xpdl.builder.utils.ModelBuilderFacade;

 import org.eclipse.stardust.model.xpdl.builder.utils.ModelerConstants;

 import org.eclipse.stardust.model.xpdl.builder.utils.XpdlModelUtils;

 import org.eclipse.stardust.model.xpdl.carnot.ActivitySymbolType;

@@ -56,7 +56,7 @@ public class ConnectionCommandHandler
 {

    @Resource

    private ApplicationContext springContext;

-   private MBFacade modelBuilderFacade;

+   private ModelBuilderFacade modelBuilderFacade;

    

    @OnCommand(commandId = "connection.create")

    public void createConnection(IIdentifiableElement targetElement, JsonObject request)

@@ -469,11 +469,11 @@ public class ConnectionCommandHandler
       throw new IllegalArgumentException("Illegal orientation key " + orientation + ".");

    }

    

-   private MBFacade getModelBuilderFacade()

+   private ModelBuilderFacade getModelBuilderFacade()

    {

       if (modelBuilderFacade == null)

       {

-         modelBuilderFacade = new MBFacade(springContext.getBean(ModelService.class)

+         modelBuilderFacade = new ModelBuilderFacade(springContext.getBean(ModelService.class)

                .getModelManagementStrategy());

       }

       return modelBuilderFacade;

diff --git a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/DataCommandHandler.java b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/DataCommandHandler.java
index 5f662ba..fd1c7ff 100644
--- a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/DataCommandHandler.java
+++ b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/DataCommandHandler.java
@@ -19,7 +19,7 @@ import javax.annotation.Resource;
 

 import org.eclipse.stardust.common.error.ObjectNotFoundException;

 import org.eclipse.stardust.model.xpdl.builder.common.EObjectUUIDMapper;

-import org.eclipse.stardust.model.xpdl.builder.utils.MBFacade;

+import org.eclipse.stardust.model.xpdl.builder.utils.ModelBuilderFacade;

 import org.eclipse.stardust.model.xpdl.builder.utils.ModelerConstants;

 import org.eclipse.stardust.model.xpdl.carnot.DataSymbolType;

 import org.eclipse.stardust.model.xpdl.carnot.DataType;

@@ -45,7 +45,7 @@ public class DataCommandHandler
 

    @Resource

    private ApplicationContext springContext;

-   private MBFacade modelBuilderFacade;

+   private ModelBuilderFacade modelBuilderFacade;

 

    /**

     *

@@ -124,11 +124,11 @@ public class DataCommandHandler
       return springContext.getBean(ModelService.class);

    }

    

-   private MBFacade getModelBuilderFacade()

+   private ModelBuilderFacade getModelBuilderFacade()

    {

       if (modelBuilderFacade == null)

       {

-         modelBuilderFacade = new MBFacade(springContext.getBean(ModelService.class)

+         modelBuilderFacade = new ModelBuilderFacade(springContext.getBean(ModelService.class)

                .getModelManagementStrategy());

       }

       return modelBuilderFacade;

diff --git a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/EventCommandHandler.java b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/EventCommandHandler.java
index 693f678..6f81daf 100644
--- a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/EventCommandHandler.java
+++ b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/EventCommandHandler.java
@@ -26,7 +26,7 @@ import javax.annotation.Resource;
 import com.google.gson.JsonObject;

 

 import org.eclipse.stardust.model.xpdl.builder.common.AbstractElementBuilder;

-import org.eclipse.stardust.model.xpdl.builder.utils.MBFacade;

+import org.eclipse.stardust.model.xpdl.builder.utils.ModelBuilderFacade;

 import org.eclipse.stardust.model.xpdl.builder.utils.ModelerConstants;

 import org.eclipse.stardust.model.xpdl.builder.utils.XpdlModelUtils;

 import org.eclipse.stardust.model.xpdl.carnot.EndEventSymbol;

@@ -48,7 +48,7 @@ public class EventCommandHandler
 {

    @Resource

    private ApplicationContext springContext;

-   private MBFacade modelBuilderFacade;

+   private ModelBuilderFacade modelBuilderFacade;

    

    @OnCommand(commandId = "eventSymbol.create")

    public void createEvent(LaneSymbol parentLaneSymbol, JsonObject request)

@@ -138,11 +138,11 @@ public class EventCommandHandler
       }

    }

    

-   private MBFacade getModelBuilderFacade()

+   private ModelBuilderFacade getModelBuilderFacade()

    {

       if (modelBuilderFacade == null)

       {

-         modelBuilderFacade = new MBFacade(springContext.getBean(ModelService.class)

+         modelBuilderFacade = new ModelBuilderFacade(springContext.getBean(ModelService.class)

                .getModelManagementStrategy());

       }

       return modelBuilderFacade;

diff --git a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/GatewayCommandHandler.java b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/GatewayCommandHandler.java
index 8bb78ec..4bb3414 100644
--- a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/GatewayCommandHandler.java
+++ b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/GatewayCommandHandler.java
@@ -25,7 +25,7 @@ import javax.annotation.Resource;
 import com.google.gson.JsonObject;

 

 import org.eclipse.stardust.model.xpdl.builder.common.AbstractElementBuilder;

-import org.eclipse.stardust.model.xpdl.builder.utils.MBFacade;

+import org.eclipse.stardust.model.xpdl.builder.utils.ModelBuilderFacade;

 import org.eclipse.stardust.model.xpdl.builder.utils.ModelerConstants;

 import org.eclipse.stardust.model.xpdl.builder.utils.XpdlModelUtils;

 import org.eclipse.stardust.model.xpdl.carnot.ActivityImplementationType;

@@ -48,7 +48,7 @@ public class GatewayCommandHandler
 {

    @Resource

    private ApplicationContext springContext;

-   private MBFacade modelBuilderFacade;

+   private ModelBuilderFacade modelBuilderFacade;

    

    @OnCommand(commandId = "gateSymbol.create")

    public void createGateway(LaneSymbol parentLaneSymbol, JsonObject request)

@@ -115,11 +115,11 @@ public class GatewayCommandHandler
       }

    }

    

-   private MBFacade getModelBuilderFacade()

+   private ModelBuilderFacade getModelBuilderFacade()

    {

       if (modelBuilderFacade == null)

       {

-         modelBuilderFacade = new MBFacade(springContext.getBean(ModelService.class)

+         modelBuilderFacade = new ModelBuilderFacade(springContext.getBean(ModelService.class)

                .getModelManagementStrategy());

       }

       return modelBuilderFacade;

diff --git a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/SwimlaneCommandHandler.java b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/SwimlaneCommandHandler.java
index b9cc785..22f2133 100644
--- a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/SwimlaneCommandHandler.java
+++ b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/SwimlaneCommandHandler.java
@@ -20,7 +20,7 @@ import static org.eclipse.stardust.ui.web.modeler.service.ModelService.Y_PROPERT
 

 import javax.annotation.Resource;

 

-import org.eclipse.stardust.model.xpdl.builder.utils.MBFacade;

+import org.eclipse.stardust.model.xpdl.builder.utils.ModelBuilderFacade;

 import org.eclipse.stardust.model.xpdl.builder.utils.ModelerConstants;

 import org.eclipse.stardust.model.xpdl.carnot.LaneSymbol;

 import org.eclipse.stardust.model.xpdl.carnot.ModelType;

@@ -42,7 +42,7 @@ public class SwimlaneCommandHandler
 {

    @Resource

    private ApplicationContext springContext;

-   private MBFacade modelBuilderFacade;

+   private ModelBuilderFacade modelBuilderFacade;

 

    /**

     * @param parentSymbol

@@ -98,11 +98,11 @@ public class SwimlaneCommandHandler
       }

    }

    

-   private MBFacade getModelBuilderFacade()

+   private ModelBuilderFacade getModelBuilderFacade()

    {

       if (modelBuilderFacade == null)

       {

-         modelBuilderFacade = new MBFacade(springContext.getBean(ModelService.class)

+         modelBuilderFacade = new ModelBuilderFacade(springContext.getBean(ModelService.class)

                .getModelManagementStrategy());

       }

       return modelBuilderFacade;

diff --git a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/model/element/ApplicationTypeChangeCommandHandler.java b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/model/element/ApplicationTypeChangeCommandHandler.java
index ab22c40..24a5122 100644
--- a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/model/element/ApplicationTypeChangeCommandHandler.java
+++ b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/model/element/ApplicationTypeChangeCommandHandler.java
@@ -15,7 +15,7 @@ import com.google.gson.JsonObject;
 

 import org.eclipse.stardust.model.xpdl.builder.common.AbstractElementBuilder;

 import org.eclipse.stardust.model.xpdl.builder.common.EObjectUUIDMapper;

-import org.eclipse.stardust.model.xpdl.builder.utils.MBFacade;

+import org.eclipse.stardust.model.xpdl.builder.utils.ModelBuilderFacade;

 import org.eclipse.stardust.model.xpdl.builder.utils.ModelerConstants;

 import org.eclipse.stardust.model.xpdl.carnot.ApplicationType;

 import org.eclipse.stardust.model.xpdl.carnot.ModelType;

@@ -32,7 +32,7 @@ public class ApplicationTypeChangeCommandHandler
 {

    @Resource

    private ApplicationContext springContext;

-   private MBFacade modelBuilderFacade;

+   private ModelBuilderFacade modelBuilderFacade;

 

    @OnCommand(commandId = "webServiceApplication.create")

    public void createWebServiceApp(ModelType model, JsonObject request)

@@ -139,11 +139,11 @@ public class ApplicationTypeChangeCommandHandler
       return springContext.getBean(ModelService.class);

    }

    

-   private MBFacade getModelBuilderFacade()

+   private ModelBuilderFacade getModelBuilderFacade()

    {

       if (modelBuilderFacade == null)

       {

-         modelBuilderFacade = new MBFacade(springContext.getBean(ModelService.class)

+         modelBuilderFacade = new ModelBuilderFacade(springContext.getBean(ModelService.class)

                .getModelManagementStrategy());

       }

       return modelBuilderFacade;

diff --git a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/model/element/DataChangeCommandHandler.java b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/model/element/DataChangeCommandHandler.java
index cd3b5d5..a05aa53 100644
--- a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/model/element/DataChangeCommandHandler.java
+++ b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/model/element/DataChangeCommandHandler.java
@@ -23,7 +23,7 @@ import com.google.gson.JsonObject;
 

 import org.eclipse.stardust.common.StringUtils;

 import org.eclipse.stardust.model.xpdl.builder.common.EObjectUUIDMapper;

-import org.eclipse.stardust.model.xpdl.builder.utils.MBFacade;

+import org.eclipse.stardust.model.xpdl.builder.utils.ModelBuilderFacade;

 import org.eclipse.stardust.model.xpdl.builder.utils.ModelerConstants;

 import org.eclipse.stardust.model.xpdl.builder.utils.XpdlModelUtils;

 import org.eclipse.stardust.model.xpdl.carnot.DataSymbolType;

@@ -46,7 +46,7 @@ public class DataChangeCommandHandler
 {

    @Resource

    private ApplicationContext springContext;

-   private MBFacade modelBuilderFacade;

+   private ModelBuilderFacade modelBuilderFacade;

 

    /**

     * @param model

@@ -168,11 +168,11 @@ public class DataChangeCommandHandler
       }

    }

    

-   private MBFacade getModelBuilderFacade()

+   private ModelBuilderFacade getModelBuilderFacade()

    {

       if (modelBuilderFacade == null)

       {

-         modelBuilderFacade = new MBFacade(springContext.getBean(ModelService.class)

+         modelBuilderFacade = new ModelBuilderFacade(springContext.getBean(ModelService.class)

                .getModelManagementStrategy());

       }

       return modelBuilderFacade;

diff --git a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/model/element/ParticipantChangeCommandHandler.java b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/model/element/ParticipantChangeCommandHandler.java
index 5afdc7c..8aa79a1 100644
--- a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/model/element/ParticipantChangeCommandHandler.java
+++ b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/model/element/ParticipantChangeCommandHandler.java
@@ -23,7 +23,7 @@ import org.springframework.context.ApplicationContext;
 import com.google.gson.JsonObject;

 

 import org.eclipse.stardust.model.xpdl.builder.common.EObjectUUIDMapper;

-import org.eclipse.stardust.model.xpdl.builder.utils.MBFacade;

+import org.eclipse.stardust.model.xpdl.builder.utils.ModelBuilderFacade;

 import org.eclipse.stardust.model.xpdl.builder.utils.ModelerConstants;

 import org.eclipse.stardust.model.xpdl.builder.utils.XpdlModelUtils;

 import org.eclipse.stardust.model.xpdl.carnot.IModelParticipant;

@@ -45,7 +45,7 @@ public class ParticipantChangeCommandHandler
 {

    @Resource

    private ApplicationContext springContext;

-   private MBFacade modelBuilderFacade;

+   private ModelBuilderFacade modelBuilderFacade;

 

    /**

     * @param model

@@ -233,11 +233,11 @@ public class ParticipantChangeCommandHandler
       return springContext.getBean(ModelService.class);

    }

    

-   private MBFacade getModelBuilderFacade()

+   private ModelBuilderFacade getModelBuilderFacade()

    {

       if (modelBuilderFacade == null)

       {

-         modelBuilderFacade = new MBFacade(springContext.getBean(ModelService.class)

+         modelBuilderFacade = new ModelBuilderFacade(springContext.getBean(ModelService.class)

                .getModelManagementStrategy());

       }

       return modelBuilderFacade;

diff --git a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/model/element/ProcessChangeCommandHandler.java b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/model/element/ProcessChangeCommandHandler.java
index 25690fa..f086b92 100644
--- a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/model/element/ProcessChangeCommandHandler.java
+++ b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/model/element/ProcessChangeCommandHandler.java
@@ -25,7 +25,7 @@ import com.google.gson.JsonObject;
 

 import org.eclipse.stardust.model.xpdl.builder.common.AbstractElementBuilder;

 import org.eclipse.stardust.model.xpdl.builder.common.EObjectUUIDMapper;

-import org.eclipse.stardust.model.xpdl.builder.utils.MBFacade;

+import org.eclipse.stardust.model.xpdl.builder.utils.ModelBuilderFacade;

 import org.eclipse.stardust.model.xpdl.builder.utils.ModelerConstants;

 import org.eclipse.stardust.model.xpdl.builder.utils.XpdlModelUtils;

 import org.eclipse.stardust.model.xpdl.carnot.DiagramModeType;

@@ -48,7 +48,7 @@ public class ProcessChangeCommandHandler
 {

    @Resource

    private ApplicationContext springContext;

-   private MBFacade modelBuilderFacade;

+   private ModelBuilderFacade modelBuilderFacade;

 

    @OnCommand(commandId = "process.create")

    public void createProcess(ModelType model, JsonObject request)

@@ -136,11 +136,11 @@ public class ProcessChangeCommandHandler
       return springContext.getBean(ModelService.class);

    }

    

-   private MBFacade getModelBuilderFacade()

+   private ModelBuilderFacade getModelBuilderFacade()

    {

       if (modelBuilderFacade == null)

       {

-         modelBuilderFacade = new MBFacade(springContext.getBean(ModelService.class)

+         modelBuilderFacade = new ModelBuilderFacade(springContext.getBean(ModelService.class)

                .getModelManagementStrategy());

       }

       return modelBuilderFacade;

diff --git a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/model/element/StructuredTypeChangeCommandHandler.java b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/model/element/StructuredTypeChangeCommandHandler.java
index e422e4b..fe8e437 100644
--- a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/model/element/StructuredTypeChangeCommandHandler.java
+++ b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/model/element/StructuredTypeChangeCommandHandler.java
@@ -13,7 +13,7 @@ import org.springframework.context.ApplicationContext;
 import com.google.gson.JsonObject;

 

 import org.eclipse.stardust.model.xpdl.builder.common.EObjectUUIDMapper;

-import org.eclipse.stardust.model.xpdl.builder.utils.MBFacade;

+import org.eclipse.stardust.model.xpdl.builder.utils.ModelBuilderFacade;

 import org.eclipse.stardust.model.xpdl.builder.utils.ModelerConstants;

 import org.eclipse.stardust.model.xpdl.carnot.ModelType;

 import org.eclipse.stardust.model.xpdl.xpdl2.TypeDeclarationType;

@@ -30,7 +30,7 @@ public class StructuredTypeChangeCommandHandler
 {

    @Resource

    private ApplicationContext springContext;

-   private MBFacade modelBuilderFacade;

+   private ModelBuilderFacade modelBuilderFacade;

 

    public static final String TYPE_PROPERTY = "type";

 

@@ -72,11 +72,11 @@ public class StructuredTypeChangeCommandHandler
       return springContext.getBean(ModelService.class);

    }

    

-   private MBFacade getModelBuilderFacade()

+   private ModelBuilderFacade getModelBuilderFacade()

    {

       if (modelBuilderFacade == null)

       {

-         modelBuilderFacade = new MBFacade(springContext.getBean(ModelService.class)

+         modelBuilderFacade = new ModelBuilderFacade(springContext.getBean(ModelService.class)

                .getModelManagementStrategy());

       }

       return modelBuilderFacade;

diff --git a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementMarshaller.java b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementMarshaller.java
index bcd1d63..d912226 100644
--- a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementMarshaller.java
+++ b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementMarshaller.java
@@ -10,7 +10,7 @@ import org.eclipse.stardust.engine.api.model.PredefinedConstants;
 import org.eclipse.stardust.engine.core.struct.StructuredDataConstants;
 import org.eclipse.stardust.model.xpdl.builder.common.EObjectUUIDMapper;
 import org.eclipse.stardust.model.xpdl.builder.strategy.ModelManagementStrategy;
-import org.eclipse.stardust.model.xpdl.builder.utils.MBFacade;
+import org.eclipse.stardust.model.xpdl.builder.utils.ModelBuilderFacade;
 import org.eclipse.stardust.model.xpdl.builder.utils.ModelerConstants;
 import org.eclipse.stardust.model.xpdl.carnot.AccessPointType;
 import org.eclipse.stardust.model.xpdl.carnot.ActivityImplementationType;
@@ -59,7 +59,7 @@ public abstract class ModelElementMarshaller
 
    protected abstract ModelManagementStrategy modelManagementStrategy();
 
-   private MBFacade modelBuilderFacade;
+   private ModelBuilderFacade modelBuilderFacade;
 
    /**
     * 
@@ -1442,11 +1442,11 @@ public abstract class ModelElementMarshaller
       }
    }
 
-   private MBFacade getModelBuilderFacade()
+   private ModelBuilderFacade getModelBuilderFacade()
    {
       if (modelBuilderFacade == null)
       {
-         modelBuilderFacade = new MBFacade(modelManagementStrategy());
+         modelBuilderFacade = new ModelBuilderFacade(modelManagementStrategy());
       }
       return modelBuilderFacade;
    }
diff --git a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementUnmarshaller.java b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementUnmarshaller.java
index ae79908..1ba4364 100644
--- a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementUnmarshaller.java
+++ b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementUnmarshaller.java
@@ -30,7 +30,7 @@ import org.eclipse.stardust.model.xpdl.builder.activity.BpmApplicationActivityBu
 import org.eclipse.stardust.model.xpdl.builder.activity.BpmSubProcessActivityBuilder;
 import org.eclipse.stardust.model.xpdl.builder.common.AbstractElementBuilder;
 import org.eclipse.stardust.model.xpdl.builder.strategy.ModelManagementStrategy;
-import org.eclipse.stardust.model.xpdl.builder.utils.MBFacade;
+import org.eclipse.stardust.model.xpdl.builder.utils.ModelBuilderFacade;
 import org.eclipse.stardust.model.xpdl.builder.utils.ModelerConstants;
 import org.eclipse.stardust.model.xpdl.carnot.ActivityImplementationType;
 import org.eclipse.stardust.model.xpdl.carnot.ActivitySymbolType;
@@ -78,7 +78,7 @@ public abstract class ModelElementUnmarshaller
 
    protected abstract ModelManagementStrategy modelManagementStrategy();
 
-   private MBFacade modelBuilderFacade;
+   private ModelBuilderFacade modelBuilderFacade;
 
    /**
 	 *
@@ -755,11 +755,11 @@ public abstract class ModelElementUnmarshaller
     * 
     * @return
     */
-   private MBFacade getModelBuilderFacade()
+   private ModelBuilderFacade getModelBuilderFacade()
    {
       if (modelBuilderFacade == null)
       {
-         modelBuilderFacade = new MBFacade(modelManagementStrategy());
+         modelBuilderFacade = new ModelBuilderFacade(modelManagementStrategy());
       }
       return modelBuilderFacade;
    }
diff --git a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/service/ModelService.java b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/service/ModelService.java
index caba414..9875ebf 100644
--- a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/service/ModelService.java
+++ b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/service/ModelService.java
@@ -48,7 +48,7 @@ import org.eclipse.stardust.model.xpdl.builder.common.EObjectUUIDMapper;
 import org.eclipse.stardust.model.xpdl.builder.session.EditingSession;

 import org.eclipse.stardust.model.xpdl.builder.strategy.ModelManagementStrategy;

 import org.eclipse.stardust.model.xpdl.builder.utils.JcrConnectionManager;

-import org.eclipse.stardust.model.xpdl.builder.utils.MBFacade;

+import org.eclipse.stardust.model.xpdl.builder.utils.ModelBuilderFacade;

 import org.eclipse.stardust.model.xpdl.builder.utils.ModelerConstants;

 import org.eclipse.stardust.model.xpdl.builder.utils.PepperIconFactory;

 import org.eclipse.stardust.model.xpdl.builder.utils.XpdlModelUtils;

@@ -2065,8 +2065,8 @@ public class ModelService
       return json;

    }

 

-   private MBFacade getModelBuilderFacade()

+   private ModelBuilderFacade getModelBuilderFacade()

    {

-      return new MBFacade(getModelManagementStrategy());

+      return new ModelBuilderFacade(getModelManagementStrategy());

    }

 }
\ No newline at end of file