[savara-commits] savara SVN: r507 - in branches/experimental/2.0.x/bundles: org.savara.core/src/main/java/org/savara/model/generator and 1 other directory.

Author: objectiser Date: 2010-12-17 03:46:19 -0500 (Fri, 17 Dec 2010) New Revision: 507 Removed: branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/model/generator/DefaultModelGenerator.java Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ChoiceModelChangeRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionModelChangeRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ProtocolModelChangeRule.java Log: Intermediate save - still refactoring. Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ChoiceModelChangeRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ChoiceModelChangeRule.java 2010-12-16 16:32:57 UTC (rev 506) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ChoiceModelChangeRule.java 2010-12-17 08:46:19 UTC (rev 507) @@ -25,6 +25,7 @@ import org.savara.bpel.model.TElseif; import org.savara.bpel.model.TFaultHandlers; import org.savara.bpel.model.TIf; +import org.savara.bpel.model.TInvoke; import org.savara.bpel.model.TOnMessage; import org.savara.bpel.model.TPartnerLink; import org.savara.bpel.model.TPick; @@ -32,8 +33,6 @@ import org.savara.bpel.model.TScope; import org.savara.bpel.model.TSequence; import org.savara.bpel.model.TVariable; -import org.savara.bpel.model2.*; -import org.savara.bpel.toprotocol.*; import org.savara.bpel.util.InteractionUtil; import org.savara.bpel.util.PartnerLinkUtil; import org.savara.bpel.util.VariableUtil; @@ -165,11 +164,11 @@ } else { subseq = seq; - java.util.List<BPELActivity> acts= - ((Sequence)context.getParent()).getActivities(); + java.util.List<Object> acts= + ((TSequence)context.getParent()).getActivity(); if (acts.size() > 0 && act instanceof Interaction && - acts.get(acts.size()-1) instanceof Invoke) { + acts.get(acts.size()-1) instanceof TInvoke) { Contract contract = ModelChangeUtils.getContract(context, ((Interaction)act).getFromRole().getName()); @@ -186,7 +185,7 @@ } String varName=qname.getLocalPart()+"Var"; //InteractionPatterns.getVariableName((Interaction)act); - Invoke invoke=(Invoke)acts.get(acts.size()-1); + TInvoke invoke=(TInvoke)acts.get(acts.size()-1); invoke.setOutputVariable(varName); @@ -255,7 +254,7 @@ //String mainPrefix=null; - Contract contract=ModelChangeUtils.getContract(context, context.getRole().getName()); + Contract contract=ModelChangeUtils.getContract(context, elem.enclosingProtocol().getRole().getName()); /* TODO: namespace issue if (contract != null) { Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionModelChangeRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionModelChangeRule.java 2010-12-16 16:32:57 UTC (rev 506) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionModelChangeRule.java 2010-12-17 08:46:19 UTC (rev 507) @@ -19,10 +19,20 @@ import javax.xml.namespace.QName; -import org.savara.bpel.model.util.*; -import org.savara.bpel.model2.*; -import org.savara.bpel.toprotocol.*; +import org.savara.bpel.model.TActivity; +import org.savara.bpel.model.TBoolean; +import org.savara.bpel.model.TFaultHandlers; +import org.savara.bpel.model.TInvoke; +import org.savara.bpel.model.TPartnerLink; +import org.savara.bpel.model.TProcess; +import org.savara.bpel.model.TReceive; +import org.savara.bpel.model.TReply; +import org.savara.bpel.model.TScope; +import org.savara.bpel.model.TSequence; +import org.savara.bpel.model.TVariable; import org.savara.bpel.util.InteractionUtil; +import org.savara.bpel.util.PartnerLinkUtil; +import org.savara.bpel.util.VariableUtil; import org.savara.contract.model.Contract; import org.savara.contract.model.Interface; import org.savara.model.change.ModelChangeContext; @@ -91,11 +101,11 @@ @Override public boolean insert(ModelChangeContext context, ProtocolModel model, ModelObject mobj, ModelObject ref) { - BPELLanguageModel bpelModel=(BPELLanguageModel)model; + TProcess bpelModel=getBPELModel(model); Interaction interaction=(Interaction)mobj; boolean ret=false; - AbstractInteraction act=null; - PartnerLink pl=new PartnerLink(bpelModel); + TActivity act=null; + TPartnerLink pl=new TPartnerLink(); Role role=null; String portType=null; String varName=null; //InteractionPatterns.getVariableName(interaction); @@ -106,14 +116,18 @@ } // Identify port type role - String prefix=null; + //String prefix=null; - String mainPrefix=null; + //String mainPrefix=null; - Contract contract=ModelChangeUtils.getContract(context, context.getRole().getName()); + Contract contract=ModelChangeUtils.getContract(context, + interaction.enclosingProtocol().getRole().getName()); + + /* TODO: Namespace issue if (contract != null) { mainPrefix = bpelModel.getBPELProcess().addNamespace(contract.getNamespace()); } + */ Role roleType=null; @@ -154,11 +168,13 @@ if (intf != null) { portType = intf.getName(); + /* TODO: Namespace issue prefix = bpelModel.getBPELProcess().addNamespace(intf.getNamespace()); if (prefix != null) { portType = prefix+":"+portType; } + */ } // Create variable @@ -177,16 +193,16 @@ varName = qname.getLocalPart()+"Var"; - org.savara.bpel.toprotocol.Variable var= - bpelModel.getBPELProcess().getVariable(varName); + TVariable var=VariableUtil.getVariable(bpelModel, varName); if (var == null) { - var = new org.savara.bpel.toprotocol.Variable(bpelModel); + var = new TVariable(); var.setName(varName); - String mesgType=qname.getLocalPart(); + //String mesgType=qname.getLocalPart(); // Find namespace prefix + /* TODO: Namespace issue if (qname.getNamespaceURI() != null) { String pfix=bpelModel.getBPELProcess().addNamespace(qname.getNamespaceURI()); @@ -194,10 +210,11 @@ mesgType = pfix+":"+mesgType; } } + */ - var.setMessageType(mesgType); + var.setMessageType(qname); - bpelModel.getBPELProcess().addVariable(var, -1); + bpelModel.getVariables().getVariable().add(var); } //} @@ -212,23 +229,23 @@ if (InteractionPatterns.isFaultHandlerRequired(interaction)) { - Scope scope=new Scope(bpelModel); + TScope scope=new TScope(); - if (context.getParent() instanceof Sequence) { - ((Sequence)context.getParent()).addActivity(scope, -1); + if (context.getParent() instanceof TSequence) { + ((TSequence)context.getParent()).getActivity().add(scope); } - FaultHandlers fhs=new FaultHandlers(bpelModel); + TFaultHandlers fhs=new TFaultHandlers(); - Sequence seq=new Sequence(bpelModel); + TSequence seq=new TSequence(); - scope.setActivity(seq); + scope.setSequence(seq); scope.setFaultHandlers(fhs); - context.setParent(scope.getActivity()); + context.setParent(seq); } - act = new Invoke(bpelModel); + act = new TInvoke(); // TODO: What about if multiple 'to' roles pl.setPartnerRole(interaction.getToRoles().get(0).getName()+"Requester"); @@ -236,20 +253,16 @@ String plt=role.getName()+"To"+interaction.getToRoles().get(0).getName()+"LT"; - if (mainPrefix != null) { - plt = mainPrefix+":"+plt; - } - - pl.setPartnerLinkType(plt); + pl.setPartnerLinkType(new QName(contract.getNamespace(), plt)); //portType = interaction.getToRole().getName()+"PT"; if (varName != null) { - ((Invoke)act).setInputVariable(varName); + ((TInvoke)act).setInputVariable(varName); } } else { - act = new Reply(bpelModel); + act = new TReply(); // TODO: What about if multiple 'to' roles pl.setMyRole(role.getName()+"Service"); @@ -257,11 +270,7 @@ String plt=interaction.getToRoles().get(0)+"To"+role.getName()+"Service"+"LT"; - if (mainPrefix != null) { - plt = mainPrefix+":"+plt; - } - - pl.setPartnerLinkType(plt); + pl.setPartnerLinkType(new QName(contract.getNamespace(), plt)); //portType = role.getName()+"PT"; @@ -272,16 +281,19 @@ //if (intf != null) { // String prefix=bpelModel.getBPELProcess().addNamespace(intf.getNamespace()); + /* if (prefix != null) { faultName = prefix+":"+faultName; } + */ //} - ((Reply)act).setFaultName(faultName); + // TODO: Not sure what to do about namespace here? + ((TReply)act).setFaultName(new QName(faultName)); } if (varName != null) { - ((Reply)act).setVariable(varName); + ((TReply)act).setVariable(varName); } } } else if (InteractionPatterns.isResponseInFaultHandler(interaction) == false) { @@ -289,20 +301,20 @@ if (InteractionPatterns.isSyncNormalResponse(interaction)) { //System.out.println("ADD RESP VAR TO PRECEDING"); - if (context.getParent() instanceof Sequence) { - java.util.List<BPELActivity> acts= - ((Sequence)context.getParent()).getActivities(); + if (context.getParent() instanceof TSequence) { + java.util.List<Object> acts= + ((TSequence)context.getParent()).getActivity(); if (acts.size() > 0 && - acts.get(acts.size()-1) instanceof Invoke) { - Invoke invoke=(Invoke)acts.get(acts.size()-1); + acts.get(acts.size()-1) instanceof TInvoke) { + TInvoke invoke=(TInvoke)acts.get(acts.size()-1); invoke.setOutputVariable(varName); } } } else if (InteractionPatterns.isInteractionPickPathTrigger(interaction) == false) { - act = new Receive(bpelModel); + act = new TReceive(); String intfName=(String)interaction.getProperties().get("interfaceName"); @@ -319,12 +331,8 @@ pl.setName(interaction.getFromRole().getName()+"To"+role.getName()); String plt=interaction.getFromRole().getName()+"To"+role.getName()+"Service"+"LT"; - - if (mainPrefix != null) { - plt = mainPrefix+":"+plt; - } - - pl.setPartnerLinkType(plt); + + pl.setPartnerLinkType(new QName(contract.getNamespace(), plt)); //portType = role.getName()+"PT"; } else { @@ -334,23 +342,19 @@ String plt=role.getName()+"To"+interaction.getFromRole().getName()+"Requester"+"LT"; - if (mainPrefix != null) { - plt = mainPrefix+":"+plt; - } - - pl.setPartnerLinkType(plt); + pl.setPartnerLinkType(new QName(contract.getNamespace(), plt)); //portType = role.getName()+ // interaction.getFromRole().getName()+"CallbackPT"; } if (varName != null) { - ((Receive)act).setVariable(varName); + ((TReceive)act).setVariable(varName); } // Check if create instance if (org.scribble.protocol.util.InteractionUtil.isInitialInteraction(interaction.getModel(), interaction)) { - ((Receive)act).setCreateInstance(true); + ((TReceive)act).setCreateInstance(TBoolean.YES); } } } @@ -367,17 +371,17 @@ // Set the name act.setName(InteractionUtil.getName(interaction)); - if (context.getParent() instanceof Sequence) { - ((Sequence)context.getParent()).addActivity(act, -1); + if (context.getParent() instanceof TSequence) { + ((TSequence)context.getParent()).getActivity().add(act); ret = true; } // Create partner link - PartnerLink other= - bpelModel.getBPELProcess().getPartnerLink(pl.getName()); + TPartnerLink other= + PartnerLinkUtil.getPartnerLink(bpelModel, pl.getName()); if (other == null) { - bpelModel.getBPELProcess().addPartnerLink(pl, -1); + bpelModel.getPartnerLinks().getPartnerLink().add(pl); } else { if (other.getPartnerRole() == null && pl.getPartnerRole() != null) { @@ -390,12 +394,24 @@ } // Set details on interaction - act.setPartnerLink(pl.getName()); - - act.setPortType(portType); - - if (interaction.getMessageSignature() != null) { - act.setOperation(interaction.getMessageSignature().getOperation()); + if (act instanceof TInvoke) { + ((TInvoke)act).setPartnerLink(pl.getName()); + ((TInvoke)act).setPortType(new QName(intf.getNamespace(),portType)); + if (interaction.getMessageSignature() != null) { + ((TInvoke)act).setOperation(interaction.getMessageSignature().getOperation()); + } + } else if (act instanceof TReceive) { + ((TReceive)act).setPartnerLink(pl.getName()); + ((TReceive)act).setPortType(new QName(intf.getNamespace(),portType)); + if (interaction.getMessageSignature() != null) { + ((TReceive)act).setOperation(interaction.getMessageSignature().getOperation()); + } + } else if (act instanceof TReply) { + ((TReply)act).setPartnerLink(pl.getName()); + ((TReply)act).setPortType(new QName(intf.getNamespace(),portType)); + if (interaction.getMessageSignature() != null) { + ((TReply)act).setOperation(interaction.getMessageSignature().getOperation()); + } } } Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ProtocolModelChangeRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ProtocolModelChangeRule.java 2010-12-16 16:32:57 UTC (rev 506) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ProtocolModelChangeRule.java 2010-12-17 08:46:19 UTC (rev 507) @@ -22,11 +22,8 @@ import org.savara.bpel.model.TScope; import org.savara.bpel.model.TSequence; import org.savara.bpel.model.generator.GeneratorUtil; -import org.savara.bpel.model2.*; -import org.savara.bpel.toprotocol.*; import org.savara.contract.model.Contract; import org.savara.contract.model.Interface; -import org.savara.model.change.AbstractModelChangeRule; import org.savara.model.change.ModelChangeContext; import org.scribble.protocol.model.*; @@ -148,7 +145,7 @@ */ // Add import for this role - addImport(context, bpelModel, conv, context.getRole()); + addImport(context, bpelModel, conv, conv.getRole()); // Add import statements for partner roles java.util.List<Role> roles=conv.getRoles(); Deleted: branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/model/generator/DefaultModelGenerator.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/model/generator/DefaultModelGenerator.java 2010-12-16 16:32:57 UTC (rev 506) +++ branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/model/generator/DefaultModelGenerator.java 2010-12-17 08:46:19 UTC (rev 507) @@ -1,52 +0,0 @@ -/* - * Copyright 2005-8 Pi4 Technologies Ltd - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * - * Change History: - * 24 Jul 2008 : Initial version created by gary - */ -package org.savara.model.generator; - -import org.savara.model.change.AbstractModelChangeContext; -import org.scribble.protocol.model.*; - -/** - * This class represents a default implementation of the model - * generator interface. - */ -public class DefaultModelGenerator implements ModelGenerator { - - /** - * This method generates the contents of the target - * model using information in the source model. This - * mechanism is used to create a new instance of the - * model, but with a specific underlying representation. - * - * @param targetRef The target model's reference - * @param role The role associated with the model - * @param target The model being generated - * @param source The reference model - */ - public void generate(ModelReference targetRef, Role role, - ProtocolModel target, ProtocolModel source) { - - AbstractModelChangeContext context= - new AbstractModelChangeContext(targetRef, role); - context.setParent(target); - - context.insert(target, source, null); - } - -}