November 2010 - savara-commits - Jboss List Archives

Build failed in Hudson: savara-1.1.x #27

by jboss-qa-internal＠redhat.com

15 years, 6 months

1
16
0 / 0

savara SVN: r455 - trunk.

by do-not-reply＠jboss.org

Author: objectiser Date: 2010-11-02 16:26:25 -0400 (Tue, 02 Nov 2010) New Revision: 455 Modified: trunk/pom.xml Log: pi4soa repo should not be in top level pom. Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-02 20:24:29 UTC (rev 454) +++ trunk/pom.xml 2010-11-02 20:26:25 UTC (rev 455) @@ -138,6 +138,7 @@ <updatePolicy>never</updatePolicy> </snapshots> </repository> +  </repositories> <!-- No need for distribution details as there are no artifacts to publish

15 years, 6 months

1
0
0 / 0

savara SVN: r454 - in branches/1.1.x: tools/features/org.jboss.savara.tools.feature and 2 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2010-11-02 16:24:29 -0400 (Tue, 02 Nov 2010) New Revision: 454 Modified: branches/1.1.x/pom.xml branches/1.1.x/tools/features/org.jboss.savara.tools.feature/ branches/1.1.x/tools/features/org.scribble.protocol.feature/ branches/1.1.x/tools/site/ Log: pi4soa repo should not be in top level pom. Modified: branches/1.1.x/pom.xml =================================================================== --- branches/1.1.x/pom.xml 2010-11-02 17:28:30 UTC (rev 453) +++ branches/1.1.x/pom.xml 2010-11-02 20:24:29 UTC (rev 454) @@ -138,6 +138,7 @@ <updatePolicy>never</updatePolicy> </snapshots> </repository> +  </repositories> <!-- No need for distribution details as there are no artifacts to publish Property changes on: branches/1.1.x/tools/features/org.jboss.savara.tools.feature ___________________________________________________________________ Name: svn:ignore - target + target .classpath .project Property changes on: branches/1.1.x/tools/features/org.scribble.protocol.feature ___________________________________________________________________ Name: svn:ignore - target + target .classpath .project Property changes on: branches/1.1.x/tools/site ___________________________________________________________________ Name: svn:ignore - target + target .classpath .project

15 years, 6 months

1
0
0 / 0

savara SVN: r453 - in trunk/tools/plugins: org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator and 1 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2010-11-02 13:28:30 -0400 (Tue, 02 Nov 2010) New Revision: 453 Modified: trunk/tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser/rules/ConversationInteractionConverterRuleImpl.java trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java Log: SAVARA-143 - should now generate BPEL/WSDL correctly for participants with multiple role types. Modified: trunk/tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser/rules/ConversationInteractionConverterRuleImpl.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser/rules/ConversationInteractionConverterRuleImpl.java 2010-11-02 17:27:36 UTC (rev 452) +++ trunk/tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser/rules/ConversationInteractionConverterRuleImpl.java 2010-11-02 17:28:30 UTC (rev 453) @@ -27,10 +27,12 @@ import org.scribble.expression.xpath.model.XPathExpression; import org.pi4soa.cdl.util.*; import org.pi4soa.common.util.NamesUtil; +import org.pi4soa.common.xml.NameSpaceUtil; import org.pi4soa.common.xml.XMLUtils; public class ConversationInteractionConverterRuleImpl implements ConverterRule { + private static final String INTERFACE_NAME = "interfaceName"; private static final String FAULT_NAME = "faultName"; private static final String MESSAGE_TYPE_LOCALPART = "messageTypeLocalPart"; private static final String MESSAGE_TYPE_NAMESPACE = "messageTypeNameSpace"; @@ -355,6 +357,13 @@ cb.getContents().add(interaction); + // Set interface name + if (cdl.getToRoleType() != null) { + // TODO: Deal with interfaces that have multiple behaviours + interaction.getAnnotations().put(INTERFACE_NAME, + getInterfaceName(cdl)); + } + if (details.getAction() == ExchangeActionType.REQUEST) { interaction.setFromRole(fromRole); interaction.setToRole(toRole); @@ -621,5 +630,33 @@ return(ret); } + /** + * This method returns the interface name associated with the + * supplied role type. + * + * @param interaction The interaction + * @return The interface name + */ + protected String getInterfaceName(org.pi4soa.cdl.Interaction interaction) { + String ret=null; + + if (interaction != null) { + String intfName=InteractionUtil.getInterface(interaction); + + if (NamesUtil.isSet(intfName) == false) { + // If no name set, then use the 'to' role type name + // Similar to logic used in org.pi4soa.service.behavior.projection.DefaultServiceTypeResolver + intfName = interaction.getToRoleType().getName(); + } + + String ns=CDLTypeUtil.getNamespace(intfName, interaction, true); + String lp=XMLUtils.getLocalname(intfName); + + ret = NameSpaceUtil.getFullyQualifiedName(ns, lp); + } + + return(ret); + } + private static Logger logger = Logger.getLogger("org.pi4soa.scribble.cdm.parser.rules"); } Modified: trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java 2010-11-02 17:27:36 UTC (rev 452) +++ trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java 2010-11-02 17:28:30 UTC (rev 453) @@ -561,10 +561,17 @@ if (useRole != null && useRole.getAnnotations().containsKey(Contract.class.getName())) { Contract contract=(Contract)useRole.getAnnotations().get(Contract.class.getName()); - - if (contract.getInterfaces().size() > 0) { - Interface intf=contract.getInterfaces().iterator().next(); + Interface intf=null; + + if (pl.getMyRole() != null) { + intf = contract.getInterface(pl.getMyRole()); + } + if (intf == null && contract.getInterfaces().size() > 0) { + intf = contract.getInterfaces().iterator().next(); + } + + if (intf != null) { String prefix=null; String portType=intf.getName(); @@ -588,10 +595,17 @@ if (role.getAnnotations().containsKey(Contract.class.getName())) { Contract contract=(Contract)role.getAnnotations().get(Contract.class.getName()); - - if (contract.getInterfaces().size() > 0) { - Interface intf=contract.getInterfaces().iterator().next(); + Interface intf=null; + + if (pl.getMyRole() != null) { + intf = contract.getInterface(pl.getMyRole()); + } + if (intf == null && contract.getInterfaces().size() > 0) { + intf = contract.getInterfaces().iterator().next(); + } + + if (intf != null) { String prefix=null; String portType=intf.getName(); Modified: trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java 2010-11-02 17:27:36 UTC (rev 452) +++ trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java 2010-11-02 17:28:30 UTC (rev 453) @@ -36,6 +36,8 @@ @RegistryInfo(extension=ModelChangeRule.class,notation=BPELNotation.NOTATION_CODE) public class ConversationInteractionModelChangeRule extends AbstractBPELModelChangeRule { + private static final String INTERFACE_NAME = "interfaceName"; + /** * This method determines whether the rule is appropriate * for the supplied type of model, parent (in the context) and inserted @@ -133,9 +135,19 @@ if (roleType != null) { contract = ModelChangeUtils.getContract(context, roleType.getName()); - // Assume that contract only has one interface for now - if (contract != null && contract.getInterfaces().size() > 0) { - intf = contract.getInterfaces().iterator().next(); + if (contract != null) { + if (interaction.getAnnotations().containsKey(INTERFACE_NAME)) { + String intfName=(String)interaction.getAnnotations().get(INTERFACE_NAME); + intf = contract.getInterface(intfName); + + if (intf == null) { + // Try localpart + javax.xml.namespace.QName qname=javax.xml.namespace.QName.valueOf(intfName); + intf = contract.getInterface(qname.getLocalPart()); + } + } else if (contract.getInterfaces().size() > 0) { + intf = contract.getInterfaces().iterator().next(); + } } } @@ -249,10 +261,19 @@ } else if (InteractionPatterns.isInteractionPickPathTrigger(interaction) == false) { act = new Receive(bpelModel); + + String intfName=(String)interaction.getAnnotations().get("interfaceName"); + + if (intfName != null && intfName.trim().length() > 0) { + javax.xml.namespace.QName qname=javax.xml.namespace.QName.valueOf(intfName); + intfName = qname.getLocalPart(); + } else { + intfName = role.getName(); + } if (InteractionUtil.isRequest(interaction)) { - pl.setMyRole(role.getName()+"Service"); + pl.setMyRole(intfName); //role.getName()+"Service"); //pl.setPartnerRole(interaction.getToRole().getName()); pl.setName(interaction.getFromRole().getName()+"To"+role.getName()); @@ -266,7 +287,7 @@ //portType = role.getName()+"PT"; } else { - pl.setMyRole(role.getName()+"Requester"); + pl.setMyRole(intfName); //role.getName()+"Requester"); pl.setPartnerRole(interaction.getFromRole().getName()+"Service"); pl.setName(role.getName()+"To"+interaction.getFromRole().getName());

15 years, 6 months

1
0
0 / 0

savara SVN: r452 - in branches/1.1.x/tools/plugins: org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator and 1 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2010-11-02 13:27:36 -0400 (Tue, 02 Nov 2010) New Revision: 452 Modified: branches/1.1.x/tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser/rules/ConversationInteractionConverterRuleImpl.java branches/1.1.x/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java branches/1.1.x/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java Log: SAVARA-143 - should now generate BPEL/WSDL correctly for participants with multiple role types. Modified: branches/1.1.x/tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser/rules/ConversationInteractionConverterRuleImpl.java =================================================================== --- branches/1.1.x/tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser/rules/ConversationInteractionConverterRuleImpl.java 2010-11-01 17:26:38 UTC (rev 451) +++ branches/1.1.x/tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser/rules/ConversationInteractionConverterRuleImpl.java 2010-11-02 17:27:36 UTC (rev 452) @@ -27,10 +27,12 @@ import org.scribble.expression.xpath.model.XPathExpression; import org.pi4soa.cdl.util.*; import org.pi4soa.common.util.NamesUtil; +import org.pi4soa.common.xml.NameSpaceUtil; import org.pi4soa.common.xml.XMLUtils; public class ConversationInteractionConverterRuleImpl implements ConverterRule { + private static final String INTERFACE_NAME = "interfaceName"; private static final String FAULT_NAME = "faultName"; private static final String MESSAGE_TYPE_LOCALPART = "messageTypeLocalPart"; private static final String MESSAGE_TYPE_NAMESPACE = "messageTypeNameSpace"; @@ -355,6 +357,13 @@ cb.getContents().add(interaction); + // Set interface name + if (cdl.getToRoleType() != null) { + // TODO: Deal with interfaces that have multiple behaviours + interaction.getAnnotations().put(INTERFACE_NAME, + getInterfaceName(cdl)); + } + if (details.getAction() == ExchangeActionType.REQUEST) { interaction.setFromRole(fromRole); interaction.setToRole(toRole); @@ -621,5 +630,33 @@ return(ret); } + /** + * This method returns the interface name associated with the + * supplied role type. + * + * @param interaction The interaction + * @return The interface name + */ + protected String getInterfaceName(org.pi4soa.cdl.Interaction interaction) { + String ret=null; + + if (interaction != null) { + String intfName=InteractionUtil.getInterface(interaction); + + if (NamesUtil.isSet(intfName) == false) { + // If no name set, then use the 'to' role type name + // Similar to logic used in org.pi4soa.service.behavior.projection.DefaultServiceTypeResolver + intfName = interaction.getToRoleType().getName(); + } + + String ns=CDLTypeUtil.getNamespace(intfName, interaction, true); + String lp=XMLUtils.getLocalname(intfName); + + ret = NameSpaceUtil.getFullyQualifiedName(ns, lp); + } + + return(ret); + } + private static Logger logger = Logger.getLogger("org.pi4soa.scribble.cdm.parser.rules"); } Modified: branches/1.1.x/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java =================================================================== --- branches/1.1.x/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java 2010-11-01 17:26:38 UTC (rev 451) +++ branches/1.1.x/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java 2010-11-02 17:27:36 UTC (rev 452) @@ -561,10 +561,17 @@ if (useRole != null && useRole.getAnnotations().containsKey(Contract.class.getName())) { Contract contract=(Contract)useRole.getAnnotations().get(Contract.class.getName()); - - if (contract.getInterfaces().size() > 0) { - Interface intf=contract.getInterfaces().iterator().next(); + Interface intf=null; + + if (pl.getMyRole() != null) { + intf = contract.getInterface(pl.getMyRole()); + } + if (intf == null && contract.getInterfaces().size() > 0) { + intf = contract.getInterfaces().iterator().next(); + } + + if (intf != null) { String prefix=null; String portType=intf.getName(); @@ -588,10 +595,17 @@ if (role.getAnnotations().containsKey(Contract.class.getName())) { Contract contract=(Contract)role.getAnnotations().get(Contract.class.getName()); - - if (contract.getInterfaces().size() > 0) { - Interface intf=contract.getInterfaces().iterator().next(); + Interface intf=null; + + if (pl.getMyRole() != null) { + intf = contract.getInterface(pl.getMyRole()); + } + if (intf == null && contract.getInterfaces().size() > 0) { + intf = contract.getInterfaces().iterator().next(); + } + + if (intf != null) { String prefix=null; String portType=intf.getName(); Modified: branches/1.1.x/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java =================================================================== --- branches/1.1.x/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java 2010-11-01 17:26:38 UTC (rev 451) +++ branches/1.1.x/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java 2010-11-02 17:27:36 UTC (rev 452) @@ -36,6 +36,8 @@ @RegistryInfo(extension=ModelChangeRule.class,notation=BPELNotation.NOTATION_CODE) public class ConversationInteractionModelChangeRule extends AbstractBPELModelChangeRule { + private static final String INTERFACE_NAME = "interfaceName"; + /** * This method determines whether the rule is appropriate * for the supplied type of model, parent (in the context) and inserted @@ -133,9 +135,19 @@ if (roleType != null) { contract = ModelChangeUtils.getContract(context, roleType.getName()); - // Assume that contract only has one interface for now - if (contract != null && contract.getInterfaces().size() > 0) { - intf = contract.getInterfaces().iterator().next(); + if (contract != null) { + if (interaction.getAnnotations().containsKey(INTERFACE_NAME)) { + String intfName=(String)interaction.getAnnotations().get(INTERFACE_NAME); + intf = contract.getInterface(intfName); + + if (intf == null) { + // Try localpart + javax.xml.namespace.QName qname=javax.xml.namespace.QName.valueOf(intfName); + intf = contract.getInterface(qname.getLocalPart()); + } + } else if (contract.getInterfaces().size() > 0) { + intf = contract.getInterfaces().iterator().next(); + } } } @@ -249,10 +261,19 @@ } else if (InteractionPatterns.isInteractionPickPathTrigger(interaction) == false) { act = new Receive(bpelModel); + + String intfName=(String)interaction.getAnnotations().get("interfaceName"); + + if (intfName != null && intfName.trim().length() > 0) { + javax.xml.namespace.QName qname=javax.xml.namespace.QName.valueOf(intfName); + intfName = qname.getLocalPart(); + } else { + intfName = role.getName(); + } if (InteractionUtil.isRequest(interaction)) { - pl.setMyRole(role.getName()+"Service"); + pl.setMyRole(intfName); //role.getName()+"Service"); //pl.setPartnerRole(interaction.getToRole().getName()); pl.setName(interaction.getFromRole().getName()+"To"+role.getName()); @@ -266,7 +287,7 @@ //portType = role.getName()+"PT"; } else { - pl.setMyRole(role.getName()+"Requester"); + pl.setMyRole(intfName); //role.getName()+"Requester"); pl.setPartnerRole(interaction.getFromRole().getName()+"Service"); pl.setName(role.getName()+"To"+interaction.getFromRole().getName());

15 years, 6 months

1
0
0 / 0

savara SVN: r451 - trunk/docs/gettingstartedguide/src/main/en-US/module and 2 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2010-11-01 13:26:38 -0400 (Mon, 01 Nov 2010) New Revision: 451 Modified: branches/1.1.x/docs/gettingstartedguide/src/main/en-US/module/architecture.xml branches/1.1.x/docs/gettingstartedguide/src/main/en-US/module/businessanalysis.xml branches/1.1.x/docs/gettingstartedguide/src/main/en-US/module/servicedev.xml trunk/docs/gettingstartedguide/src/main/en-US/module/architecture.xml trunk/docs/gettingstartedguide/src/main/en-US/module/businessanalysis.xml trunk/docs/gettingstartedguide/src/main/en-US/module/servicedev.xml trunk/tools/parent-pom.xml trunk/tools/plugins/org.jboss.savara.contract.model/META-INF/MANIFEST.MF trunk/tools/pom.xml Log: Some 'getting started guide' comments from Jeff D, and copying Nick's pom/manifest changes from 1.1.x branch to trunk. Modified: branches/1.1.x/docs/gettingstartedguide/src/main/en-US/module/architecture.xml =================================================================== --- branches/1.1.x/docs/gettingstartedguide/src/main/en-US/module/architecture.xml 2010-10-29 20:23:48 UTC (rev 450) +++ branches/1.1.x/docs/gettingstartedguide/src/main/en-US/module/architecture.xml 2010-11-01 17:26:38 UTC (rev 451) @@ -97,7 +97,7 @@ <para> The choreography description for the Purchasing example can be found in -<filename>purchasing-models/PurchaseGoods.cdm</filename>. When the +<filename>purchasing/PurchaseGoods.cdm</filename>. When the choreography editor has been launched, by double-clicking on this file within the Eclipse environment, then navigate to the <emphasis>Choreography Flows</emphasis> tab to see the definition of the purchasing process: @@ -156,7 +156,7 @@ Once the choreography description has been successfully tested against the scenarios, the next step may be to obtain approval to proceed to the analysis/design phase. To help support this effort, the pi4soa tools provide the means to export the choreography description to -a range of representations. HTML documentation generated is discussed below, and BPMN +a range of representations. HTML documentation generation is discussed below, and BPMN diagram generation is discussed in the Service Oriented Analysis and Design section. </para> Modified: branches/1.1.x/docs/gettingstartedguide/src/main/en-US/module/businessanalysis.xml =================================================================== --- branches/1.1.x/docs/gettingstartedguide/src/main/en-US/module/businessanalysis.xml 2010-10-29 20:23:48 UTC (rev 450) +++ branches/1.1.x/docs/gettingstartedguide/src/main/en-US/module/businessanalysis.xml 2010-11-01 17:26:38 UTC (rev 451) @@ -59,7 +59,7 @@ </para> <para> -In the <filename>purchasing-models</filename> Eclipse project, the +In the <filename>purchasing</filename> Eclipse project, the <filename>SuccessfulPurchase.scn</filename> scenario looks like this: </para> @@ -82,7 +82,7 @@ </para> <para> - Some previously defined examples can be found in the <filename>process-models</filename> + Some previously defined examples can be found in the <filename>purchasing</filename> Eclipse project. For example, the Buy request is defined as: </para> Modified: branches/1.1.x/docs/gettingstartedguide/src/main/en-US/module/servicedev.xml =================================================================== --- branches/1.1.x/docs/gettingstartedguide/src/main/en-US/module/servicedev.xml 2010-10-29 20:23:48 UTC (rev 450) +++ branches/1.1.x/docs/gettingstartedguide/src/main/en-US/module/servicedev.xml 2010-11-01 17:26:38 UTC (rev 451) @@ -61,7 +61,7 @@ <para> To test out this feature, uncheck the <emphasis>Buyer</emphasis> participant, leave the build system -as <emphasis>Ant</emphasis>, select the messaging system appropriate for your target environment and +as <emphasis>Ant</emphasis>, and press the 'Ok' button. This will create a single new project for the <emphasis>Store</emphasis> and <emphasis>CreditAgency</emphasis> participants. </para> Modified: trunk/docs/gettingstartedguide/src/main/en-US/module/architecture.xml =================================================================== --- trunk/docs/gettingstartedguide/src/main/en-US/module/architecture.xml 2010-10-29 20:23:48 UTC (rev 450) +++ trunk/docs/gettingstartedguide/src/main/en-US/module/architecture.xml 2010-11-01 17:26:38 UTC (rev 451) @@ -97,7 +97,7 @@ <para> The choreography description for the Purchasing example can be found in -<filename>purchasing-models/PurchaseGoods.cdm</filename>. When the +<filename>purchasing/PurchaseGoods.cdm</filename>. When the choreography editor has been launched, by double-clicking on this file within the Eclipse environment, then navigate to the <emphasis>Choreography Flows</emphasis> tab to see the definition of the purchasing process: @@ -156,7 +156,7 @@ Once the choreography description has been successfully tested against the scenarios, the next step may be to obtain approval to proceed to the analysis/design phase. To help support this effort, the pi4soa tools provide the means to export the choreography description to -a range of representations. HTML documentation generated is discussed below, and BPMN +a range of representations. HTML documentation generation is discussed below, and BPMN diagram generation is discussed in the Service Oriented Analysis and Design section. </para> Modified: trunk/docs/gettingstartedguide/src/main/en-US/module/businessanalysis.xml =================================================================== --- trunk/docs/gettingstartedguide/src/main/en-US/module/businessanalysis.xml 2010-10-29 20:23:48 UTC (rev 450) +++ trunk/docs/gettingstartedguide/src/main/en-US/module/businessanalysis.xml 2010-11-01 17:26:38 UTC (rev 451) @@ -59,7 +59,7 @@ </para> <para> -In the <filename>purchasing-models</filename> Eclipse project, the +In the <filename>purchasing</filename> Eclipse project, the <filename>SuccessfulPurchase.scn</filename> scenario looks like this: </para> @@ -82,7 +82,7 @@ </para> <para> - Some previously defined examples can be found in the <filename>process-models</filename> + Some previously defined examples can be found in the <filename>purchasing</filename> Eclipse project. For example, the Buy request is defined as: </para> Modified: trunk/docs/gettingstartedguide/src/main/en-US/module/servicedev.xml =================================================================== --- trunk/docs/gettingstartedguide/src/main/en-US/module/servicedev.xml 2010-10-29 20:23:48 UTC (rev 450) +++ trunk/docs/gettingstartedguide/src/main/en-US/module/servicedev.xml 2010-11-01 17:26:38 UTC (rev 451) @@ -61,7 +61,7 @@ <para> To test out this feature, uncheck the <emphasis>Buyer</emphasis> participant, leave the build system -as <emphasis>Ant</emphasis>, select the messaging system appropriate for your target environment and +as <emphasis>Ant</emphasis>, and press the 'Ok' button. This will create a single new project for the <emphasis>Store</emphasis> and <emphasis>CreditAgency</emphasis> participants. </para> Modified: trunk/tools/parent-pom.xml =================================================================== --- trunk/tools/parent-pom.xml 2010-10-29 20:23:48 UTC (rev 450) +++ trunk/tools/parent-pom.xml 2010-11-01 17:26:38 UTC (rev 451) @@ -8,8 +8,7 @@ <packaging>pom</packaging> <properties> -  - <tychoVersion>0.9.0</tychoVersion> + <tychoVersion>0.10.0</tychoVersion> <scmBranch>trunk</scmBranch> <BUILD_ALIAS>SNAPSHOT</BUILD_ALIAS> <memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1> Modified: trunk/tools/plugins/org.jboss.savara.contract.model/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/plugins/org.jboss.savara.contract.model/META-INF/MANIFEST.MF 2010-10-29 20:23:48 UTC (rev 450) +++ trunk/tools/plugins/org.jboss.savara.contract.model/META-INF/MANIFEST.MF 2010-11-01 17:26:38 UTC (rev 451) @@ -6,6 +6,6 @@ Bundle-Activator: org.jboss.savara.contract.model.osgi.Activator Bundle-Vendor: www.jboss.org Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Import-Package: org.osgi.framework;version="1.3.0" +Import-Package: org.osgi.framework Require-Bundle: org.scribble.core;bundle-version="[1.0.0,2.0.0)" Export-Package: org.jboss.savara.contract.model Modified: trunk/tools/pom.xml =================================================================== --- trunk/tools/pom.xml 2010-10-29 20:23:48 UTC (rev 450) +++ trunk/tools/pom.xml 2010-11-01 17:26:38 UTC (rev 451) @@ -1,6 +1,6 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.savara</groupId> <artifactId>tools</artifactId> @@ -8,12 +8,23 @@ <version>1.1.0-SNAPSHOT</version> <name>Savara::Tools</name> - <parent> +  + <parent> + <groupId>org.jboss.tools</groupId> + <artifactId>org.jboss.tools.parent.pom</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + +  <properties> <jaxb.version>2.1</jaxb.version> @@ -59,7 +70,6 @@ <repository> <id>pi4soa</id> <url>http://download.jboss.org/jbosstools/builds/staging/pi4soa/all/repo/</url> -  <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -68,6 +78,17 @@ <enabled>true</enabled> </releases> </repository> + <repository> + <id>eclipse-helios</id> + <url>http://download.eclipse.org/releases/helios</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> </repositories> </project>

15 years, 6 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

savara-commits November 2010