Merge branch 'master' of https://se3.informatik.uni-wuerzburg.de/sis76cq/prisma.git

tools.descartes.prisma.agent.wildfly/src/main/java/tools/descartes/prisma/agent/wildfly/service/ModelExtractionService.java

@@ -325,7 +325,7 @@ public class ModelExtractionService implements Service<ModelExtractionService> {
 		}
 		RepositoryComponentTemplate<?> callerComponent = implementationComponent;
 		
-		// 4. Now add the called component (if applicable)
+		// 4. Now add the called component (if applicable)		
 		InterfaceProvidingRoleTemplate calledProvidingRole = null;
 		RepositoryComponentTemplate<?> calledComponent = null;
 		boolean isRemoteCall = false;
@@ -342,6 +342,7 @@ public class ModelExtractionService implements Service<ModelExtractionService> {
 		// 5. Now wrap the implementation in a composite component (if necessary)
 		CompositeComponentTemplate compositeComponent = createCompositeComponent(repository, incomingCrec, callerComponent);
 		if (compositeComponent != null) {
+
 			// Create an assembly context for embedding the component and connect its interface providing role with a role on the composite component
 			AssemblyContextTemplate assembly = compositeComponent.defineAssemblyContext(incomingCrec.getComponentName(), implementationComponent);			
 			
@@ -374,9 +375,9 @@ public class ModelExtractionService implements Service<ModelExtractionService> {
 		}
 		
 		// 6. Now create the assembly contexts
-		AssemblyContextTemplate callerContext = system.defineAssemblyContext(incomingCrec.getComponentName(), callerComponent);
+		AssemblyContextTemplate callerContext = system.defineAssemblyContext(callerComponent.getName(), callerComponent);
 		if (callerRequiringRole != null) {
-			AssemblyContextTemplate calledContext = system.defineAssemblyContext(outgoingCrec.getComponentName(), calledComponent);
+			AssemblyContextTemplate calledContext = system.defineAssemblyContext(calledComponent.getName(), calledComponent);
 			system.defineAssemblyConnector(callerContext, callerRequiringRole, calledContext, calledProvidingRole);
 		}