summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Pielmann2012-11-07 08:39:51 (EST)
committerSven Rottstock2012-11-07 08:39:51 (EST)
commit1f2944447c1898a5181942fb6e497386313e9909 (patch)
tree52705516237bb333e43596b5a450149c4185999b
parentf2ce36347d15914b8a8e9ab2c48b1245d4a09bc9 (diff)
downloadorg.eclipse.stardust.ide-1f2944447c1898a5181942fb6e497386313e9909.zip
org.eclipse.stardust.ide-1f2944447c1898a5181942fb6e497386313e9909.tar.gz
org.eclipse.stardust.ide-1f2944447c1898a5181942fb6e497386313e9909.tar.bz2
CRNT-25759 Support implementation of data paths
git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ide@60634 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/defaults/DefaultTypesInitializer.java5
-rw-r--r--model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/utils/ModelBuilderFacade.java187
-rw-r--r--model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/variable/PrimitiveAccessPointBuilder.java25
-rw-r--r--model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/variable/StructAccessPointBuilder.java28
-rw-r--r--model/org.eclipse.stardust.model.xpdl.builder/src/test/java/org/eclipse/stardust/model/xpdl/builder/CrossModelSupportModelBuilderTest.java8
5 files changed, 164 insertions, 89 deletions
diff --git a/model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/defaults/DefaultTypesInitializer.java b/model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/defaults/DefaultTypesInitializer.java
index 4a0c5f3..cec17ac 100644
--- a/model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/defaults/DefaultTypesInitializer.java
+++ b/model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/defaults/DefaultTypesInitializer.java
@@ -122,7 +122,10 @@ public class DefaultTypesInitializer implements ModelInitializer
"Default Context", false, true);
initializeInteractionContextType(model, PredefinedConstants.ENGINE_CONTEXT,
- "Engine Context", true, false);
+ "Engine Context", true, false);
+
+ initializeInteractionContextType(model, PredefinedConstants.EXTERNALWEBAPP_CONTEXT,
+ "External Web Application", true, false);
// TODO
}
diff --git a/model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/utils/ModelBuilderFacade.java b/model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/utils/ModelBuilderFacade.java
index 2f3ef52..87b36d7 100644
--- a/model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/utils/ModelBuilderFacade.java
+++ b/model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/utils/ModelBuilderFacade.java
@@ -148,7 +148,7 @@ public class ModelBuilderFacade
/**
* Sets the team leader for an organization.
- *
+ *
* @param organization
* @param role
* @return
@@ -160,7 +160,7 @@ public class ModelBuilderFacade
/**
* Adds a participant to an organization.
- *
+ *
* @param organization
* @param participant
* @return
@@ -175,7 +175,7 @@ public class ModelBuilderFacade
/**
* Returns a list of organizations a participants belongs to.
- *
+ *
* @param model
* @param participant
* @return list of organizations
@@ -204,14 +204,14 @@ public class ModelBuilderFacade
/**
* Created a type declaration.
- *
+ *
* @param model
* model to create the type declaration in
* @param typeID
* id of the type
* @param typeName
* name of the type
- *
+ *
* @return type declaration created
*/
public TypeDeclarationType createTypeDeclaration(ModelType model, String typeID,
@@ -477,7 +477,7 @@ public class ModelBuilderFacade
/**
* Created a data of type <b>Document</b>.
- *
+ *
* @param model
* model to create the document data in
* @param dataID
@@ -486,7 +486,7 @@ public class ModelBuilderFacade
* name of the data
* @param typeDeclarationID
* id of the type declaration assigned to the document
- *
+ *
* @return document data created
*/
public DataType createDocumentData(ModelType model, String dataID, String dataName,
@@ -518,11 +518,11 @@ public class ModelBuilderFacade
/**
* Created a data of type <b>Structured Type</b>.
- *
+ *
* <p>
* The <i>typeFullID</i> id is provided as <b>ModelID:TypedeclarationID</b>.
* </p>
- *
+ *
* @param model
* model to create the document data in
* @param dataID
@@ -531,7 +531,7 @@ public class ModelBuilderFacade
* name of the data
* @param typeFullID
* full qualified id of the type declaration assigned to the document
- *
+ *
* @return structured data created
*/
public DataType createStructuredData(ModelType model, String dataID, String dataName,
@@ -567,12 +567,12 @@ public class ModelBuilderFacade
/**
* Update the type of a primitive data.
- *
+ *
* @param data
* the primitive data to update
* @param primitiveTypeID
* the id of the primitive type to assign
- *
+ *
* @return
*/
public void updatePrimitiveData(DataType data, String primitiveTypeID)
@@ -583,16 +583,16 @@ public class ModelBuilderFacade
/**
* Update the type declaration a structured data refers to.
- *
+ *
* <p>
* The <i>typeFullID</i> id is provided as <b>ModelID:TypedeclarationID</b>.
* </p>
- *
+ *
* @param data
* the structured data to update
* @param typeFullID
* full qualified id of the type declaration to assign to the data
- *
+ *
* @return
*/
public void updateStructuredDataType(DataType data, String typeFullID)
@@ -693,7 +693,7 @@ public class ModelBuilderFacade
/**
* Created a primitive data.
- *
+ *
* <p>
* As <b>primitiveTypeID</b> might be set:
* </p>
@@ -706,7 +706,7 @@ public class ModelBuilderFacade
* ModelerConstants.DECIMAL_PRIMITIVE_DATA_TYPE</li>
* <ul>
* </ul>
- *
+ *
* @param model
* model to create the data in
* @param dataID
@@ -715,7 +715,7 @@ public class ModelBuilderFacade
* name of the data
* @param primitiveTypeID
* id of the data
- *
+ *
* @return primitive data created
*/
public DataType createPrimitiveData(ModelType model, String dataID, String dataName,
@@ -760,16 +760,16 @@ public class ModelBuilderFacade
* differs from the model to import the data in, then a file connection is established
* and a reference is created. If the data exists locally in the model this is not
* necessary.
- *
+ *
* <p>
* The <i>dataFullID</i> id provided as <b>ModelID:DataID</b>.
* </p>
- *
+ *
* @param model
* model to import a data in
* @param dataFullID
* full qualified id of the data to be imported
- *
+ *
* @return local or referenced data
*/
public DataType importData(ModelType model, String dataFullID)
@@ -811,11 +811,11 @@ public class ModelBuilderFacade
/**
* Creates lane in a diagram
- *
+ *
* <p>
* The <i>participantFullID</i> id is provided as <b>ModelID:ParticipantID</b>.
* </p>
- *
+ *
* <p>
* As <b>orientation</b> might be set:
* </p>
@@ -825,7 +825,7 @@ public class ModelBuilderFacade
* ModelerConstants.DIAGRAM_FLOW_ORIENTATION_VERTICAL</li>
* <ul>
* </ul>
- *
+ *
* @param model
* model to create the lane in
* @param processDefinition
@@ -932,7 +932,7 @@ public class ModelBuilderFacade
/**
* Create an activity diagram symbol
- *
+ *
* @param model
* model to create the symbol in
* @param activity
@@ -974,7 +974,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param model
* @param processDefinition
* @param parentLaneID
@@ -1007,7 +1007,7 @@ public class ModelBuilderFacade
/**
* Create a data diagram symbol
- *
+ *
* @param model
* model to create the symbol in
* @param data
@@ -1052,7 +1052,7 @@ public class ModelBuilderFacade
/**
* Creates a role.
- *
+ *
* @param model
* The model to create the role in.
* @param roleID
@@ -1084,7 +1084,7 @@ public class ModelBuilderFacade
/**
* Creates an organization.
- *
+ *
* @param model
* The model to create the organization in.
* @param orgID
@@ -1102,7 +1102,7 @@ public class ModelBuilderFacade
/**
* Creates an application.
- *
+ *
* <p>
* As <b>applicationTypeID</b> might be set:
* </p>
@@ -1116,7 +1116,7 @@ public class ModelBuilderFacade
* ModelerConstants.EXTERNAL_WEB_APP_CONTEXT_TYPE_KEY</li>
* <ul>
* </ul>
- *
+ *
* @param model
* model to create the application in.
* @param applicationID
@@ -1157,7 +1157,7 @@ public class ModelBuilderFacade
/**
* Creates an activity.
- *
+ *
* <p>
* As <b>activityTypeID</b> might be set:
* </p>
@@ -1167,7 +1167,7 @@ public class ModelBuilderFacade
* <li>ModelerConstants.SUBPROCESS_ACTIVITY</li>
* <ul>
* </ul>
- *
+ *
* <p>
* The <b>xxxFullID</b> are provided like that:
* </p>
@@ -1178,7 +1178,7 @@ public class ModelBuilderFacade
* <li>The <i>subProcessFullID</i> id provided as <b>ModelID:ProcessID</b>.</p></li>
* <ul>
* </ul>
- *
+ *
* @param model
* model to create the activity in.
* @param processDefinition
@@ -1282,7 +1282,7 @@ public class ModelBuilderFacade
/**
* Creates a process.
- *
+ *
* @param model
* model to create the process in
* @param processID
@@ -1340,7 +1340,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @return
*/
public DataPathType createDataPath()
@@ -1349,7 +1349,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param modelId
* @return
*/
@@ -1359,7 +1359,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param model
* @param id
* @return
@@ -1378,7 +1378,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param processFullID
* @return processDefinition
*/
@@ -1400,7 +1400,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param modelId
* @param id
* @return
@@ -1411,7 +1411,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param model
* @param id
* @return application
@@ -1430,7 +1430,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param model
* @param fullApplicationID
* @return application
@@ -1453,7 +1453,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param model
* @param id
* @return
@@ -1472,7 +1472,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param model
* @param id
* @return
@@ -1493,7 +1493,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param model
* @param id
* @return
@@ -1513,7 +1513,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param fullTypeID
* @return typeDeclaration
*/
@@ -1536,7 +1536,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param model
* @param id
* @return
@@ -1555,7 +1555,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param model
* @param id
* @return
@@ -1574,7 +1574,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param model
* @param dataFullID
* @return data
@@ -1596,7 +1596,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param model
* @param id
* @return
@@ -1630,7 +1630,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param model
* @param fullParticipantID
* @return participant
@@ -1661,7 +1661,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param diagram
* @param oid
* @return
@@ -1693,7 +1693,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param laneSymbol
* @param oid
* @return
@@ -1722,7 +1722,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param processDefinition
* @param id
* @return
@@ -1741,7 +1741,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param diagram
* @param oid
* @return
@@ -1759,7 +1759,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param laneSymbol
* @param oid
* @return
@@ -1778,7 +1778,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param diagram
* @param oid
* @return
@@ -1828,7 +1828,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param model
* @param id
* @return
@@ -1852,7 +1852,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param diagram
* @param oid
* @return
@@ -1870,7 +1870,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param laneSymbol
* @param oid
* @return
@@ -1889,7 +1889,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param diagram
* @param oid
* @return
@@ -1914,7 +1914,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param laneSymbol
* @param oid
* @return
@@ -1945,7 +1945,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param diagram
* @param oid
* @return
@@ -1963,7 +1963,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param laneSymbol
* @param oid
* @return
@@ -1982,7 +1982,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param diagram
* @param oid
* @return
@@ -2007,7 +2007,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param laneSymbol
* @param oid
* @return
@@ -2038,7 +2038,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param laneSymbol
* @param id
* @return
@@ -2064,7 +2064,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param model
* @param id
* @return
@@ -2092,7 +2092,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param laneSymbol
* @param id
* @return
@@ -2120,7 +2120,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param processDefinition
* @param oid
* @return
@@ -2158,7 +2158,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param processDefinition
* @param oid
* @return
@@ -2194,7 +2194,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param processDefinition
* @param oid
* @return
@@ -2215,7 +2215,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param poolSymbol
* @param oid
* @return
@@ -2235,7 +2235,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param poolSymbol
* @param oid
* @return
@@ -2260,7 +2260,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param modelId
* @param appId
* @return
@@ -2282,7 +2282,7 @@ public class ModelBuilderFacade
/**
* TODO Replace by Eclipse modeler logic
- *
+ *
* @param name
* @return
*/
@@ -2315,7 +2315,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param model
* @param modelElement
* @return
@@ -2340,7 +2340,7 @@ public class ModelBuilderFacade
/**
* TODO Auxiliary method while cross-model references are not supported
- *
+ *
* @param fullId
* @return
*/
@@ -2353,7 +2353,7 @@ public class ModelBuilderFacade
/**
* Retrieves the model ID of a full ID (e.g. ModelA for ModelA:CreateCustomer).
- *
+ *
* @param fullId
* @return
*/
@@ -2429,6 +2429,29 @@ public class ModelBuilderFacade
return null;
}
+ public ContextType createApplicationContext(ApplicationType application,
+ String contextID)
+ {
+ ModelType model = ModelUtils.findContainingModel(application);
+ ContextType context = AbstractElementBuilder.F_CWM.createContextType();
+ ApplicationContextTypeType contextTypeType = findApplicationContextTypeType(model,
+ contextID);
+ if (contextTypeType == null)
+ {
+ contextTypeType = AbstractElementBuilder.F_CWM
+ .createApplicationContextTypeType();
+ contextTypeType.setName("External Web Application");
+ contextTypeType.setId("externalWebApp");
+ contextTypeType.setIsPredefined(true);
+ long maxElementOid = XpdlModelUtils.getMaxUsedOid(model);
+ contextTypeType.setElementOid(++maxElementOid);
+ model.getApplicationContextType().add(contextTypeType);
+ }
+ context.setType(contextTypeType);
+ application.getContext().add(context);
+ return context;
+ }
+
public Class<? > getClassForType(String type)
{
if (type.equalsIgnoreCase("long")) { //$NON-NLS-1$
@@ -2552,7 +2575,7 @@ public class ModelBuilderFacade
}
/**
- *
+ *
* @param element
* @param attributeName
* @return
@@ -2566,7 +2589,7 @@ public class ModelBuilderFacade
return attribute;
}
}
-
+
return null;
}
@@ -2745,4 +2768,6 @@ public class ModelBuilderFacade
return model;
}
+
+
}
diff --git a/model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/variable/PrimitiveAccessPointBuilder.java b/model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/variable/PrimitiveAccessPointBuilder.java
index f8da02e..e33546c 100644
--- a/model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/variable/PrimitiveAccessPointBuilder.java
+++ b/model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/variable/PrimitiveAccessPointBuilder.java
@@ -96,6 +96,21 @@ public class PrimitiveAccessPointBuilder
"messageTransformation:TransformationProperty", xmlString);
}
+ private void createInteractiveAccessPoint(ContextType contextType)
+ {
+ contextType.getAccessPoint().add(element);
+ if (contextType.getType().getId()
+ .equals(ModelerConstants.EXTERNAL_WEB_APP_CONTEXT_TYPE_KEY))
+ {
+ AttributeUtil.setAttribute(element, "RootElement", element.getId());
+ TransformationProperty property = MappingFactory.eINSTANCE
+ .createTransformationProperty();
+ String xmlString = MappingModelUtil.transformEcore2XML(property);
+ AttributeUtil.setAttribute(contextType,
+ "messageTransformation:TransformationProperty", xmlString);
+ }
+ }
+
@Override
protected String getDefaultElementIdPrefix()
{
@@ -117,7 +132,15 @@ public class PrimitiveAccessPointBuilder
}
else
{
- createDefaultAccessPoint(owner);
+ if (owner instanceof ContextType)
+ {
+ createInteractiveAccessPoint((ContextType) owner);
+ }
+ else
+ {
+ createDefaultAccessPoint(owner);
+ }
+
}
return element;
}
diff --git a/model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/variable/StructAccessPointBuilder.java b/model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/variable/StructAccessPointBuilder.java
index 0e62711..df21090 100644
--- a/model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/variable/StructAccessPointBuilder.java
+++ b/model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/variable/StructAccessPointBuilder.java
@@ -114,10 +114,25 @@ public class StructAccessPointBuilder
"messageTransformation:TransformationProperty", xmlString);
}
+ private void createInteractiveAccessPoint(ContextType contextType)
+ {
+ contextType.getAccessPoint().add(element);
+ if (contextType.getType().getId()
+ .equals(ModelerConstants.EXTERNAL_WEB_APP_CONTEXT_TYPE_KEY))
+ {
+ AttributeUtil.setAttribute(element, "RootElement", element.getId());
+ TransformationProperty property = MappingFactory.eINSTANCE
+ .createTransformationProperty();
+ String xmlString = MappingModelUtil.transformEcore2XML(property);
+ AttributeUtil.setAttribute(contextType,
+ "messageTransformation:TransformationProperty", xmlString);
+ }
+ }
+
@Override
protected String getDefaultElementIdPrefix()
{
- return "PrimitiveAccessPoint";
+ return "StructAccessPoint";
}
public static StructAccessPointBuilder newAccessPoint(IAccessPointOwner anOwner)
@@ -135,11 +150,18 @@ public class StructAccessPointBuilder
}
else
{
- createDefaultAccessPoint(owner);
+ if (owner instanceof ContextType)
+ {
+ createInteractiveAccessPoint((ContextType) owner);
+ }
+ else
+ {
+ createDefaultAccessPoint(owner);
+ }
+
}
return element;
}
-
public StructAccessPointBuilder withDirection(String direction)
{
DirectionType directionType;
diff --git a/model/org.eclipse.stardust.model.xpdl.builder/src/test/java/org/eclipse/stardust/model/xpdl/builder/CrossModelSupportModelBuilderTest.java b/model/org.eclipse.stardust.model.xpdl.builder/src/test/java/org/eclipse/stardust/model/xpdl/builder/CrossModelSupportModelBuilderTest.java
index 492176e..bd1727c 100644
--- a/model/org.eclipse.stardust.model.xpdl.builder/src/test/java/org/eclipse/stardust/model/xpdl/builder/CrossModelSupportModelBuilderTest.java
+++ b/model/org.eclipse.stardust.model.xpdl.builder/src/test/java/org/eclipse/stardust/model/xpdl/builder/CrossModelSupportModelBuilderTest.java
@@ -31,6 +31,7 @@ import org.eclipse.stardust.model.xpdl.builder.utils.XpdlModelIoUtils;
import org.eclipse.stardust.model.xpdl.carnot.ActivityType;
import org.eclipse.stardust.model.xpdl.carnot.ApplicationType;
import org.eclipse.stardust.model.xpdl.carnot.CarnotWorkflowModelFactory;
+import org.eclipse.stardust.model.xpdl.carnot.ContextType;
import org.eclipse.stardust.model.xpdl.carnot.DataType;
import org.eclipse.stardust.model.xpdl.carnot.IModelParticipant;
import org.eclipse.stardust.model.xpdl.carnot.IdRef;
@@ -97,7 +98,7 @@ public class CrossModelSupportModelBuilderTest
ModelType providerModel = newBpmModel().withName("ProviderModel").build();
providerModel.setConnectionManager(new WebModelerConnectionManager(providerModel, strategy));
ModelType consumerModel = newBpmModel().withName("ConsumerModel").build();
- consumerModel.setConnectionManager(new WebModelerConnectionManager(consumerModel, strategy));
+ consumerModel.setConnectionManager(new WebModelerConnectionManager(consumerModel, strategy));
strategy.registerModel(consumerModel);
strategy.registerModel(providerModel);
@@ -153,8 +154,9 @@ public class CrossModelSupportModelBuilderTest
ApplicationType externalWebApp = facade.createApplication(providerModel, "UI MashUp", "UI MashUp", ModelerConstants.EXTERNAL_WEB_APP_CONTEXT_TYPE_KEY);
- facade.createPrimitiveAccessPoint(externalWebApp, "NewPrimitive", "NewPrimitive", Type.String.getId() , "IN");
- facade.createStructuredAccessPoint(externalWebApp, "NewStruct", "NewStruct", "ProviderModel:ProvidedComposite", "IN");
+ ContextType cty = facade.getApplicationContext(externalWebApp, ModelerConstants.EXTERNAL_WEB_APP_CONTEXT_TYPE_KEY);
+ facade.createPrimitiveAccessPoint(cty, "NewPrimitive", "NewPrimitive", Type.String.getId() , "IN");
+ facade.createStructuredAccessPoint(cty, "NewStruct", "NewStruct", "ProviderModel:ProvidedComposite", "IN");
ApplicationType consumedExtWebApp = facade.createApplication(consumerModel, "UI MashUp", "UI MashUp", ModelerConstants.EXTERNAL_WEB_APP_CONTEXT_TYPE_KEY);
facade.createStructuredAccessPoint(consumedExtWebApp, "NewStruct", "NewStruct", "ProviderModel:ProvidedComposite", "IN");