JBoss Tools SVN: r24517 - in trunk/documentation/whatsnew: images and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2010-08-27 14:42:34 -0400 (Fri, 27 Aug 2010)
New Revision: 24517
Added:
trunk/documentation/whatsnew/images/usage-reporting-confirmation.png
trunk/documentation/whatsnew/images/usage-reporting-google-analytics.png
trunk/documentation/whatsnew/images/usage-reporting-preferences.png
trunk/documentation/whatsnew/usage/
trunk/documentation/whatsnew/usage/usage-news-3.2.0.M2.html
Log:
[JBIDE-6887] N&N for usage reporting added
Added: trunk/documentation/whatsnew/images/usage-reporting-confirmation.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/images/usage-reporting-confirmation.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/images/usage-reporting-google-analytics.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/images/usage-reporting-google-analytics.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/images/usage-reporting-preferences.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/images/usage-reporting-preferences.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/usage/usage-news-3.2.0.M2.html
===================================================================
--- trunk/documentation/whatsnew/usage/usage-news-3.2.0.M2.html (rev 0)
+++ trunk/documentation/whatsnew/usage/usage-news-3.2.0.M2.html 2010-08-27 18:42:34 UTC (rev 24517)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css" />
+<title>What's New Visual Page Editor 3.2.0.M2</title>
+</head>
+<body>
+<h1>What's New Usage Reporting 3.2.0.M2</h1>
+
+<p align="right">
+<a href="../index.html">< Main Index</a>
+<a href="../cdi/cdi-news-3.2.0.M2.html">CDI Tools ></a>
+</p>
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>General</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Usage Reporting</b></td>
+ <td valign="top">
+ <p>
+ 3.2.0.M2 comes a component that shall allow us to better fullfill our customers needs and expectations. The usage reporting plugin collects data about the local eclipse installation and reports them anonymously.
+ We collect the version, plugins, etc. and report them to a google analytics account.
+ </p>
+ <p><img src="../images/usage-reporting-google-analytics.png" /></p>
+ <p><small><a
+ href="https://jira.jboss.org/browse/JBIDE-6376">Related Jira</a></small></p>
+ <p>
+ The plugin will not report any information without explicit user consent.
+ When run for the first time, JBoss Tools / JBoss Developer Studio will ask the user if he agrees herein.
+ </p>
+ <p><img src="../images/usage-reporting-confirmation.png" /></p>
+ <p>
+ The user may, at any time, withdraw his consent and disable usage reporting in the preferences.
+ </p>
+ <p><img src="../images/usage-reporting-preferences.png" /></p>
+ </td>
+ </tr>
+
+</table>
+</body>
+</html>
14 years, 6 months
JBoss Tools SVN: r24516 - trunk/documentation/whatsnew/core.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2010-08-27 14:40:01 -0400 (Fri, 27 Aug 2010)
New Revision: 24516
Modified:
trunk/documentation/whatsnew/core/core-news-3.2.0.M2.html
Log:
[JBIDE-6887] N&N for usage reporting added
Modified: trunk/documentation/whatsnew/core/core-news-3.2.0.M2.html
===================================================================
--- trunk/documentation/whatsnew/core/core-news-3.2.0.M2.html 2010-08-27 17:40:53 UTC (rev 24515)
+++ trunk/documentation/whatsnew/core/core-news-3.2.0.M2.html 2010-08-27 18:40:01 UTC (rev 24516)
@@ -24,20 +24,21 @@
<tr>
<td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Usage Reporting</b></td>
<td valign="top">
- <p>TBD: Description for Usage Reporting functionality</p>
+ <p>
+ 3.2.0.M2 comes a component that shall allow us to better fullfill our customers needs and expectations. The usage reporting plugin collects data about the local eclipse installation and reports them anonymously.
+ We collect the version, plugins, etc. and report them to a google analytics account.
+ </p>
+ <p><img src="../images/usage-reporting-google-analytics.png" style=" width : 982px;"/></p>
<p><small><a
href="https://jira.jboss.org/browse/JBIDE-6376">Related Jira</a></small></p>
</td>
</tr>
-
<tr>
<td colspan="2">
<hr/>
</td>
</tr>
-
<tr>
-
<td valign="top" align="left"><a name="itemname2" id="itemname2"></a><b>Runtime detection</b></td>
<td valign="top">
<p><img src="../images/jbide6119.png"/></p>
14 years, 6 months
JBoss Tools SVN: r24515 - branches/jbosstools-3.2.0.M2/vpe/features/org.jboss.tools.xulrunner.feature.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-08-27 13:40:53 -0400 (Fri, 27 Aug 2010)
New Revision: 24515
Modified:
branches/jbosstools-3.2.0.M2/vpe/features/org.jboss.tools.xulrunner.feature/pom.xml
Log:
upversion from 1.9.2.qualifier to 1.9.12.qualifier so that suffix increments correctly and no one thinks this is based on xulrunner 1.9.2
Modified: branches/jbosstools-3.2.0.M2/vpe/features/org.jboss.tools.xulrunner.feature/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/vpe/features/org.jboss.tools.xulrunner.feature/pom.xml 2010-08-27 17:37:53 UTC (rev 24514)
+++ branches/jbosstools-3.2.0.M2/vpe/features/org.jboss.tools.xulrunner.feature/pom.xml 2010-08-27 17:40:53 UTC (rev 24515)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.vpe.features</groupId>
<artifactId>org.jboss.tools.xulrunner.feature</artifactId>
- <version>1.9.2.qualifier</version>
+ <version>1.9.12.qualifier</version>
<packaging>eclipse-feature</packaging>
</project>
14 years, 6 months
JBoss Tools SVN: r24514 - branches/jbosstools-3.2.0.M2/vpe/features/org.jboss.tools.xulrunner.feature.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-08-27 13:37:53 -0400 (Fri, 27 Aug 2010)
New Revision: 24514
Modified:
branches/jbosstools-3.2.0.M2/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml
Log:
upversion from 1.9.2.qualifier to 1.9.12.qualifier so that suffix increments correctly and no one thinks this is based on xulrunner 1.9.2
Modified: branches/jbosstools-3.2.0.M2/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml 2010-08-27 17:28:49 UTC (rev 24513)
+++ branches/jbosstools-3.2.0.M2/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml 2010-08-27 17:37:53 UTC (rev 24514)
@@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.xulrunner.feature"
label="%featureName"
- version="1.9.2.qualifier"
+ version="1.9.12.qualifier"
provider-name="%providerName"
plugin="org.jboss.tools.xulrunner">
14 years, 6 months
JBoss Tools SVN: r24513 - in trunk/bpel/plugins: org.eclipse.bpel.model/src/model and 14 other directories.
by jbosstools-commits@lists.jboss.org
Author: bbrodt
Date: 2010-08-27 13:28:49 -0400 (Fri, 27 Aug 2010)
New Revision: 24513
Added:
trunk/bpel/plugins/org.eclipse.bpel.ui/icons/obj16/extensionactivity.gif
trunk/bpel/plugins/org.eclipse.bpel.ui/icons/obj20/extensionactivity.png
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ExtensionActivityAdapter.java
Modified:
trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployResourceSetImpl.java
trunk/bpel/plugins/org.eclipse.bpel.model/src/model/bpel.ecore
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/BPELPackage.java
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/ExtensionActivity.java
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BPELPackageImpl.java
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ExtensionActivityImpl.java
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELReader.java
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationHelper.java
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELMultipageEditorPart.java
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/IBPELUIConstants.java
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/BPELUIAdapterFactory.java
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/factories/BPELUIObjectFactory.java
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/NamespacePrefixesProvider.java
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELReader.java
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/BPELReader.java
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/NodeNameFilter.java
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ExtensionActivityValidator.java
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/messages.properties
Log:
fix breakage caused by https://jira.jboss.org/browse/JBIDE-6825. Also fix https://jira.jboss.org/browse/JBIDE-6917
Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployResourceSetImpl.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployResourceSetImpl.java 2010-08-27 16:48:15 UTC (rev 24512)
+++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployResourceSetImpl.java 2010-08-27 17:28:49 UTC (rev 24513)
@@ -29,9 +29,10 @@
@Override
public Resource getResource(URI uri, boolean loadOnDemand) {
String name = uri.toString().toLowerCase();
- if (name.endsWith("?wsdl") || name.endsWith(".wsdl"))
+ // revert https://jira.jboss.org/browse/JBIDE-6825
+ if (name.endsWith("wsdl"))
return getResource(uri,true,"wsdl");
- if (name.endsWith(".wsil"))
+ if (name.endsWith("wsil"))
return getResource(uri,true,"wsil");
if (name.endsWith(".xsd"))
return getResource(uri,true,"xsd");
Modified: trunk/bpel/plugins/org.eclipse.bpel.model/src/model/bpel.ecore
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.model/src/model/bpel.ecore 2010-08-27 16:48:15 UTC (rev 24512)
+++ trunk/bpel/plugins/org.eclipse.bpel.model/src/model/bpel.ecore 2010-08-27 17:28:49 UTC (rev 24513)
@@ -1,590 +1,593 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model"
- nsURI="http://docs.oasis-open.org/wsbpel/2.0/process/executable" nsPrefix="bpws">
- <eClassifiers xsi:type="ecore:EClass" name="Process" eSuperTypes="#//ExtensibleElement">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Describes behavior based on interactions between the activities performed by partners through Web Service interfaces. Defines how individual or composite activities are coordinated to achieve a business goal, as well as the state and logic necessary for this coordination. Represents stateful, long-running interactions in which each interaction has a beginning, defined behavior during its lifetime, and an end.

Abstract processes approach data handling in a way that reflects the level of abstraction required to describe the public aspects of the business protocol. Abstract processes handle only protocol-relevant data as defined by message properties.

Processes and Partners are modeled as WSDL services."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="targetNamespace" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="queryLanguage" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
- defaultValueLiteral="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath1.0" unsettable="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="expressionLanguage" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
- defaultValueLiteral="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath1.0" unsettable="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="suppressJoinFailure" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
- defaultValueLiteral="false" unsettable="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Determines whether the joinFailure fault will be suppressed for all activities in the process. Default is false."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="variableAccessSerializable"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
- defaultValueLiteral="false" unsettable="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Specifies the XML query language used for selection of nodes in assignment, property definitions, and other uses. The default is XPath 1.0."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="partnerLinks" eType="#//PartnerLinks"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="variables" eType="#//Variables"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="activity" lowerBound="1"
- eType="#//Activity" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="faultHandlers" eType="#//FaultHandler"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="eventHandlers" eType="#//EventHandler"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="correlationSets" eType="#//CorrelationSets"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="imports" upperBound="-1"
- eType="#//Import" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="extensions" eType="#//Extensions"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="exitOnStandardFault" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBooleanObject"
- defaultValueLiteral="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="messageExchanges" eType="#//MessageExchanges"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="abstractProcessProfile"
- eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"
- unsettable="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PartnerLink" eSuperTypes="#//ExtensibleElement">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The services with which a business process interacts are modeled as partners in the process. Partners both consume and provide services to a business Process. These services are characterized by a ServiceLinkType.

Partners define the different parties that interact with the business process. A partner represents both a consumer of a service provided by the business process and a provider of a service to the business process.

The role of the partner is always seen from the perspective of the process that contains it. For invoke activities, the partner plays a role to provide the invoked service. For receive activities, the partner plays a role to invoke the service, and the process plays the role of providing it.

Each partner is characterized by a service link type and a role name that identifies the functionality that must be provided by the business process and by the partner!
for the relationship to succeed. That is, the portTypes that the process and partners need to implement.

myRole represents the responsibilities or services produced and consumed by this process. For services provided by this process, myRole must specify a role of the serviceLinkType which which has a portType and operation that appears in a receive activity within this process. That is, for some receive activity in this process, its partner attribute must name a partner defined in the process having myRole specify a role of the partner's serviceLinkType whose portType matches the receive portType, that portType must contain the operation specified in the receive activity, and the container of that activity must refer to a container of the process whose messageType is the same as the input message of the operation.

For consumed services, similar rules apply to the invoke activity. The partner attribute must name a partner defined in the!
process having partnerRole specify a role of the partner's se!
rviceLin
kType whose portType matches the invoke portType, that portType must contain the operation specified in the invoke activity, and the inputContainer of that activity must refer to a container of the process whose messageType is same as the input message of the operation, and whose outputContainer refers to a container of the process whose messageType is the same as the output message of the operation.
"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="myRole" eType="ecore:EClass partnerlinktype.ecore#//Role"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="partnerRole" eType="ecore:EClass partnerlinktype.ecore#//Role"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="PartnerLinkType" eType="ecore:EClass partnerlinktype.ecore#//PartnerLinkType"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="initializePartnerRole"
- eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBooleanObject"
- unsettable="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="FaultHandler" eSuperTypes="#//ExtensibleElement">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Defines the activities that must be executed in response to faults resulting from the invocation of services in a process."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="catch" upperBound="-1"
- eType="#//Catch" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="catchAll" eType="#//CatchAll"
- unsettable="true" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Activity" eSuperTypes="#//ExtensibleElement">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Represents a unit-of-work in a process. If the suppressJoinFailure is true, then the joinCondition determines if the activity is executed based on incoming links."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="suppressJoinFailure" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
- unsettable="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Suppresses the join failure for this activity and all nested activities (unless overridden by some nested activity)."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="targets" eType="#//Targets"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="sources" eType="#//Sources"
- containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="CorrelationSet" eSuperTypes="#//ExtensibleElement">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="A named group of properties that, taken together, serve to define a way of identifying an application-level conversation within a business protocol instance.

A given message can cary multiple correlation sets. After initialization, the values of the properties for a correlation set in a business process instance must be identical for all the messages in all the operations that carry the correlation set."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"
- eType="ecore:EClass messageproperties.ecore#//Property"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Invoke" eSuperTypes="#//PartnerActivity">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Allows the business process to invoke a one-way asynchronous, or request-response synchronous operation on a portType offered by a partner playing a role in the business process as specified in a ServiceLinkType. Asyncrhosous invocations specify only an input container while synchronous invocations specify both an input and output container. Correlation sets are used to correlate the business process with a stateful service provided by the partner.
"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="outputVariable" eType="#//Variable"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="inputVariable" eType="#//Variable"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="compensationHandler" eType="#//CompensationHandler"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="faultHandler" eType="#//FaultHandler"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="fromParts" eType="#//FromParts"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="toParts" eType="#//ToParts"
- containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Link" eSuperTypes="#//ExtensibleElement">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Specifies the synchronization dependencies between activities in a flow. Each activity can be the source and/or target of any number of links. Links establish a predecessor/successor relationship between activities. Activities that are the source of a link are predecessors of activities that are targets of the same link. Parallel execution of activities in a flow is synchronized by requiring that all the source activities of an activity must complete before corresponding target activities of the same link can run. When an activity completes, all activities that are targets of links for which this activity is a source are now candidates for execution (assuming all their predecessor activities have completed)."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="sources" upperBound="-1"
- eType="#//Source" eOpposite="#//Source/Link"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="targets" upperBound="-1"
- eType="#//Target" eOpposite="#//Target/Link"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Catch" eSuperTypes="#//ExtensibleElement">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="faultName" eType="ecore:EDataType platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//QName"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="faultVariable" eType="#//Variable"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="activity" lowerBound="1"
- eType="#//Activity" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="faultMessageType" eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//Message"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="faultElement" eType="ecore:EClass platform:/plugin/org.eclipse.xsd/model/XSD.ecore#//XSDElementDeclaration"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Reply" eSuperTypes="#//PartnerActivity #//Activity">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Allows a business process to send a message in reply to a message that was received through a Receive. The combination of a Receive and Reply forms a synchronous request-response operation on the WSDL portType for the process. The container for the replay activity provides the output message for the partner process invoke activity that invoked the corresponding receive activity.

FaultName specifies the name of a fault and must match some Catch fault name in the Scope or Process's FaultHandler.

A receive can have more than one corresponding reply, at most one without a faultName, and any mumber with different faults."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="faultName" eType="ecore:EDataType platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//QName"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="variable" eType="#//Variable"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="toParts" eType="#//ToParts"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="messageExchange" lowerBound="1"
- eType="#//MessageExchange"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PartnerActivity" eSuperTypes="#//Activity">
- <eStructuralFeatures xsi:type="ecore:EReference" name="partnerLink" lowerBound="1"
- eType="#//PartnerLink"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="correlations" eType="#//Correlations"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="portType" lowerBound="1"
- eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//PortType"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="operation" lowerBound="1"
- eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//Operation"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Receive" eSuperTypes="#//PartnerActivity">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Allows a business process to block and wait for a particular message to be invoked by a partner in another process. A Receive Activity has a corresponding WSDL portType and operation which other processes can use to invoke the service. The partner can only invoke operations specified by the role it is playing as defined in a ServiceLinkType.

The container for the receive activity corresponds to the input message of its operation. The container messageType must be the input message.

If the operation has an output message, it corresponds to a request-response WSDL message. There must be a corresponding Reply Activity in the process having a container whose messageType is the same as the output message. The Reply Activity is used to send a return message back to the invoking process ."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="createInstance" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
- defaultValueLiteral="false" unsettable="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="variable" lowerBound="1"
- eType="#//Variable"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="fromParts" eType="#//FromParts"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="messageExchange" lowerBound="1"
- eType="#//MessageExchange"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Exit" eSuperTypes="#//Activity">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="When executed, immediately terminates the business process."/>
- </eAnnotations>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Throw" eSuperTypes="#//Activity">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Generates a fault from inside the business process. The FaultHandler may be a proxy for an application or process-specific fault instead of a BPEL FaultHandler"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="faultName" eType="ecore:EDataType platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//QName"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="faultVariable" eType="#//Variable"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Wait" eSuperTypes="#//Activity">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Waits for a given time period or until a certain time is reached. Either expression for or until may be specified, but not both."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="for" eType="#//Expression"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="until" eType="#//Expression"
- containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Empty" eSuperTypes="#//Activity">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="A "no-op" instruction useful as the target for synchronization of parallel activities, for instance. Empty is also required in situations that require at least one Activity, but there is nothing to do. This may often occur in fault handlers.
"/>
- </eAnnotations>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Sequence" eSuperTypes="#//Activity">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Defines the structure of the process. Activities in a sequence are executed in order."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="activities" lowerBound="1"
- upperBound="-1" eType="#//Activity" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="While" eSuperTypes="#//Activity">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Indicates an activity is to be repeated while a condition is met."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="activity" lowerBound="1"
- eType="#//Activity" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="condition" lowerBound="1"
- eType="#//Condition" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Pick" eSuperTypes="#//Activity">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Blocks and waits for the occurrence of one of a set of messages to arrive or for a time-out to go off. When the pick trigger occurs, the associated activity is executed and the pick completes."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="createInstance" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
- defaultValueLiteral="false" unsettable="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="messages" lowerBound="1"
- upperBound="-1" eType="#//OnMessage" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="alarm" upperBound="-1"
- eType="#//OnAlarm" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Flow" eSuperTypes="#//Activity">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Enables concurrent execution of its contained activities. Contrast with Sequence which executes its contained activities in order. Links can be used in a flow to define arbitrary predecessor and/or successor activities. A flow activity completes when all of its concurrent activities have been completed."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="activities" lowerBound="1"
- upperBound="-1" eType="#//Activity" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="links" eType="#//Links"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="completionCondition" eType="#//CompletionCondition"
- containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="OnAlarm" eSuperTypes="#//ExtensibleElement">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="When the alert fires, the activity is executed."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="activity" lowerBound="1"
- eType="#//Activity" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="for" eType="#//Expression"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="until" eType="#//Expression"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="repeatEvery" eType="#//Expression"
- containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Assign" eSuperTypes="#//Activity">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Used to update values of containers with new data. Assigns the Form r-value to the To l-value. An Assign is an atomic Activity. All copy elements succeed or none of them do. Exceptions are raised by incompatible types."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="copy" lowerBound="1" upperBound="-1"
- eType="#//Copy" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="validate" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBooleanObject"
- defaultValueLiteral="false"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Copy" eSuperTypes="#//ExtensibleElement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="to" lowerBound="1" eType="#//To"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="from" lowerBound="1" eType="#//From"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="keepSrcElementName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
- defaultValueLiteral="false" unsettable="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="ignoreMissingFromData"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
- defaultValueLiteral="false" unsettable="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Extension" eSuperTypes="#//ExtensibleElement">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="namespace" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="mustUnderstand" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
- defaultValueLiteral="false" unsettable="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Scope" eSuperTypes="#//Activity">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Defines a nested activity with its own associated fault and compensation handlers."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="isolated" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
- defaultValueLiteral="false" unsettable="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="faultHandlers" eType="#//FaultHandler"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="compensationHandler" eType="#//CompensationHandler"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="activity" lowerBound="1"
- eType="#//Activity" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="variables" eType="#//Variables"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="correlationSets" eType="#//CorrelationSets"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="eventHandlers" eType="#//EventHandler"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="partnerLinks" eType="#//PartnerLinks"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="terminationHandler" eType="#//TerminationHandler"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="messageExchanges" eType="#//MessageExchanges"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="exitOnStandardFault" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
- defaultValueLiteral="false" unsettable="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="CompensateScope" eSuperTypes="#//Activity">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Used to invoke compensation of an inner scope that has already completed its execution normally. This construct can be invoked only from within a fault handler or the compensation handler of the scope that immediately encloses the scope for which compensation is to be performed."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="target" eType="#//Activity">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Specifies the scope whose compensation handler is to be invoked."/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="CompensationHandler" eSuperTypes="#//ExtensibleElement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="activity" lowerBound="1"
- eType="#//Activity" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="To" eSuperTypes="#//ExtensibleElement">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Represents an l-value in an assignment activity. Can be used to query a node of a part of a container, a property of a container, or a service reference of a partner."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="variable" eType="#//Variable"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="part" eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//Part"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="partnerLink" eType="#//PartnerLink"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="property" eType="ecore:EClass messageproperties.ecore#//Property"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="query" eType="#//Query"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="expression" eType="#//Expression"
- containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="From" eSuperTypes="#//ExtensibleElement">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="opaque" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
- unsettable="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Signifies that an opaque value is to be assigned to a container property based on a non-deterministic choice. Must be used in abstract processes only. The XSD type of the To container property must be derived from xsd:string restricted by enumeration or any restricted XSD integral numeric type."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="endpointReference" eType="#//EndpointReferenceRole"
- unsettable="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="literal" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
- unsettable="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="unsafeLiteral" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="expression" eType="#//Expression"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="serviceRef" eType="#//ServiceRef"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass platform:/plugin/org.eclipse.xsd/model/XSD.ecore#//XSDTypeDefinition"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="variable" eType="#//Variable"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="part" eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//Part"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="partnerLink" eType="#//PartnerLink"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="property" eType="ecore:EClass messageproperties.ecore#//Property"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="query" eType="#//Query"
- containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="OnMessage" eSuperTypes="#//ExtensibleElement">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Receipt of the corresponding message, the activity is executed."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="variable" eType="#//Variable"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="activity" eType="#//Activity"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="portType" lowerBound="1"
- eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//PortType"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="partnerLink" lowerBound="1"
- eType="#//PartnerLink"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="correlations" eType="#//Correlations"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="operation" lowerBound="1"
- eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//Operation"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="fromParts" eType="#//FromParts"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="messageExchange" lowerBound="1"
- eType="#//MessageExchange"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Expression" eSuperTypes="platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//ExtensibilityElement">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="body" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="expressionLanguage" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
- unsettable="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="opaque" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBooleanObject"
- unsettable="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="BooleanExpression" eSuperTypes="#//Expression"/>
- <eClassifiers xsi:type="ecore:EClass" name="Correlation" eSuperTypes="#//ExtensibleElement">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="initiate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
- defaultValueLiteral="no" unsettable="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="pattern" eType="#//CorrelationPattern"
- unsettable="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="set" lowerBound="1" eType="#//CorrelationSet"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EEnum" name="CorrelationPattern">
- <eLiterals name="request"/>
- <eLiterals name="response" value="1"/>
- <eLiterals name="requestresponse" value="2"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EEnum" name="EndpointReferenceRole">
- <eLiterals name="myRole"/>
- <eLiterals name="partnerRole" value="1"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="MessageExchange" eSuperTypes="#//ExtensibleElement">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
- defaultValueLiteral=""/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="EventHandler" eSuperTypes="#//ExtensibleElement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="alarm" upperBound="-1"
- eType="#//OnAlarm" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="events" upperBound="-1"
- eType="#//OnEvent" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Source" eSuperTypes="#//ExtensibleElement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="Link" lowerBound="1" eType="#//Link"
- eOpposite="#//Link/sources"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="activity" lowerBound="1"
- eType="#//Activity"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="transitionCondition" eType="#//Condition"
- containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Target" eSuperTypes="#//ExtensibleElement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="Link" lowerBound="1" eType="#//Link"
- eOpposite="#//Link/targets"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="activity" lowerBound="1"
- eType="#//Activity"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PartnerLinks" eSuperTypes="#//ExtensibleElement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
- eType="#//PartnerLink" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="MessageExchanges" eSuperTypes="#//ExtensibleElement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
- eType="#//MessageExchange" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Variables" eSuperTypes="#//ExtensibleElement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
- eType="#//Variable" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="CorrelationSets" eSuperTypes="#//ExtensibleElement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
- eType="#//CorrelationSet" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Links" eSuperTypes="#//ExtensibleElement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
- eType="#//Link" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="CatchAll" eSuperTypes="#//ExtensibleElement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="activity" lowerBound="1"
- eType="#//Activity" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Correlations" eSuperTypes="#//ExtensibleElement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
- eType="#//Correlation" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Variable" eSuperTypes="#//ExtensibleElement">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="messageType" eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//Message"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="XSDElement" eType="ecore:EClass platform:/plugin/org.eclipse.xsd/model/XSD.ecore#//XSDElementDeclaration"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass platform:/plugin/org.eclipse.xsd/model/XSD.ecore#//XSDTypeDefinition"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="from" eType="#//From" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="UnknownExtensibilityAttribute" eSuperTypes="platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//UnknownExtensibilityElement"/>
- <eClassifiers xsi:type="ecore:EClass" name="OnEvent" eSuperTypes="#//ExtensibleElement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="activity" eType="#//Activity"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="variable" eType="#//Variable"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="partnerLink" lowerBound="1"
- eType="#//PartnerLink"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="correlations" eType="#//Correlations"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="operation" lowerBound="1"
- eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//Operation"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="portType" lowerBound="1"
- eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//PortType"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="messageType" lowerBound="1"
- eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//Message"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="correlationSets" eType="#//CorrelationSets"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="fromParts" eType="#//FromParts"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="messageExchange" lowerBound="1"
- eType="#//MessageExchange"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Import" eSuperTypes="#//ExtensibleElement">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="namespace" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="location" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="importType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Rethrow" eSuperTypes="#//Activity"/>
- <eClassifiers xsi:type="ecore:EClass" name="Condition" eSuperTypes="#//Expression"/>
- <eClassifiers xsi:type="ecore:EClass" name="Targets" eSuperTypes="#//ExtensibleElement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
- eType="#//Target" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="joinCondition" eType="#//Condition"
- containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Sources" eSuperTypes="#//ExtensibleElement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
- eType="#//Source" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Query" eSuperTypes="platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//WSDLElement">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="queryLanguage" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ServiceRef" eSuperTypes="platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//ExtensibleElement">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="referenceScheme" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Extensions" eSuperTypes="#//ExtensibleElement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
- eType="#//Extension" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ExtensionActivity" eSuperTypes="#//Activity"/>
- <eClassifiers xsi:type="ecore:EClass" name="FromPart" eSuperTypes="#//ExtensibleElement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="toVariable" eType="#//Variable"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="part" eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//Part"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ToPart" eSuperTypes="#//ExtensibleElement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="fromVariable" eType="#//Variable"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="part" eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//Part"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="OpaqueActivity" eSuperTypes="#//Activity">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Hides detailed information of an existing executable activity. Using an Opaque Activity will turn the process into an abstract process."/>
- </eAnnotations>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ForEach" eSuperTypes="#//Activity">
- <eStructuralFeatures xsi:type="ecore:EReference" name="startCounterValue" lowerBound="1"
- eType="#//Expression" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="finalCounterValue" lowerBound="1"
- eType="#//Expression" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="parallel" lowerBound="1"
- eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBooleanObject"
- defaultValueLiteral="false"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="counterName" lowerBound="1"
- eType="#//Variable" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="completionCondition" eType="#//CompletionCondition"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="activity" lowerBound="1"
- eType="#//Activity" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="RepeatUntil" eSuperTypes="#//Activity">
- <eStructuralFeatures xsi:type="ecore:EReference" name="activity" lowerBound="1"
- eType="#//Activity" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="condition" lowerBound="1"
- eType="#//Condition" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="TerminationHandler" eSuperTypes="#//ExtensibleElement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="activity" eType="#//Activity"
- containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Validate" eSuperTypes="#//Activity">
- <eStructuralFeatures xsi:type="ecore:EReference" name="variables" upperBound="-1"
- eType="#//Variable"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="If" eSuperTypes="#//Activity">
- <eStructuralFeatures xsi:type="ecore:EReference" name="condition" eType="#//Condition"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="elseIf" upperBound="-1"
- eType="#//ElseIf" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="else" eType="#//Else" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="activity" lowerBound="1"
- eType="#//Activity" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ElseIf" eSuperTypes="#//ExtensibleElement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="condition" eType="#//Condition"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="activity" lowerBound="1"
- eType="#//Activity" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Else" eSuperTypes="#//ExtensibleElement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="activity" lowerBound="1"
- eType="#//Activity" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="CompletionCondition" eSuperTypes="#//ExtensibleElement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="branches" eType="#//Branches"
- containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Branches" eSuperTypes="#//Expression">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="countCompletedBranchesOnly"
- eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBooleanObject"
- defaultValueLiteral="false" unsettable="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ExtensibleElement" eSuperTypes="platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//ExtensibleElement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="documentation" eType="#//Documentation"
- unsettable="true" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Documentation">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="lang" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="source" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Compensate" eSuperTypes="#//Activity"/>
- <eClassifiers xsi:type="ecore:EClass" name="FromParts" eSuperTypes="#//ExtensibleElement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
- eType="#//FromPart" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ToParts" eSuperTypes="#//ExtensibleElement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
- eType="#//ToPart" containment="true"/>
- </eClassifiers>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model"
+ nsURI="http://docs.oasis-open.org/wsbpel/2.0/process/executable" nsPrefix="bpws">
+ <eClassifiers xsi:type="ecore:EClass" name="Process" eSuperTypes="#//ExtensibleElement">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Describes behavior based on interactions between the activities performed by partners through Web Service interfaces. Defines how individual or composite activities are coordinated to achieve a business goal, as well as the state and logic necessary for this coordination. Represents stateful, long-running interactions in which each interaction has a beginning, defined behavior during its lifetime, and an end.

Abstract processes approach data handling in a way that reflects the level of abstraction required to describe the public aspects of the business protocol. Abstract processes handle only protocol-relevant data as defined by message properties.

Processes and Partners are modeled as WSDL services."/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="targetNamespace" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="queryLanguage" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+ defaultValueLiteral="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath1.0" unsettable="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="expressionLanguage" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+ defaultValueLiteral="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath1.0" unsettable="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="suppressJoinFailure" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
+ defaultValueLiteral="false" unsettable="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Determines whether the joinFailure fault will be suppressed for all activities in the process. Default is false."/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="variableAccessSerializable"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
+ defaultValueLiteral="false" unsettable="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Specifies the XML query language used for selection of nodes in assignment, property definitions, and other uses. The default is XPath 1.0."/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="partnerLinks" eType="#//PartnerLinks"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="variables" eType="#//Variables"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="activity" lowerBound="1"
+ eType="#//Activity" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="faultHandlers" eType="#//FaultHandler"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="eventHandlers" eType="#//EventHandler"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="correlationSets" eType="#//CorrelationSets"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="imports" upperBound="-1"
+ eType="#//Import" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="extensions" eType="#//Extensions"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="exitOnStandardFault" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBooleanObject"
+ defaultValueLiteral="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="messageExchanges" eType="#//MessageExchanges"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="abstractProcessProfile"
+ eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"
+ unsettable="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="PartnerLink" eSuperTypes="#//ExtensibleElement">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="The services with which a business process interacts are modeled as partners in the process. Partners both consume and provide services to a business Process. These services are characterized by a ServiceLinkType.

Partners define the different parties that interact with the business process. A partner represents both a consumer of a service provided by the business process and a provider of a service to the business process.

The role of the partner is always seen from the perspective of the process that contains it. For invoke activities, the partner plays a role to provide the invoked service. For receive activities, the partner plays a role to invoke the service, and the process plays the role of providing it.

Each partner is characterized by a service link type and a role name that identifies the functionality that must be provided by the business process and by the partner!
for the relationship to succeed. That is, the portTypes that the process and partners need to implement.

myRole represents the responsibilities or services produced and consumed by this process. For services provided by this process, myRole must specify a role of the serviceLinkType which which has a portType and operation that appears in a receive activity within this process. That is, for some receive activity in this process, its partner attribute must name a partner defined in the process having myRole specify a role of the partner's serviceLinkType whose portType matches the receive portType, that portType must contain the operation specified in the receive activity, and the container of that activity must refer to a container of the process whose messageType is the same as the input message of the operation.

For consumed services, similar rules apply to the invoke activity. The partner attribute must name a partner defined in the!
process having partnerRole specify a role of the partner's se!
rviceLin
kType whose portType matches the invoke portType, that portType must contain the operation specified in the invoke activity, and the inputContainer of that activity must refer to a container of the process whose messageType is same as the input message of the operation, and whose outputContainer refers to a container of the process whose messageType is the same as the output message of the operation.
"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="myRole" eType="ecore:EClass partnerlinktype.ecore#//Role"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="partnerRole" eType="ecore:EClass partnerlinktype.ecore#//Role"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="PartnerLinkType" eType="ecore:EClass partnerlinktype.ecore#//PartnerLinkType"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="initializePartnerRole"
+ eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBooleanObject"
+ unsettable="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="FaultHandler" eSuperTypes="#//ExtensibleElement">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Defines the activities that must be executed in response to faults resulting from the invocation of services in a process."/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="catch" upperBound="-1"
+ eType="#//Catch" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="catchAll" eType="#//CatchAll"
+ unsettable="true" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Activity" eSuperTypes="#//ExtensibleElement">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Represents a unit-of-work in a process. If the suppressJoinFailure is true, then the joinCondition determines if the activity is executed based on incoming links."/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="suppressJoinFailure" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
+ unsettable="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Suppresses the join failure for this activity and all nested activities (unless overridden by some nested activity)."/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="targets" eType="#//Targets"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="sources" eType="#//Sources"
+ containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="CorrelationSet" eSuperTypes="#//ExtensibleElement">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="A named group of properties that, taken together, serve to define a way of identifying an application-level conversation within a business protocol instance.

A given message can cary multiple correlation sets. After initialization, the values of the properties for a correlation set in a business process instance must be identical for all the messages in all the operations that carry the correlation set."/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"
+ eType="ecore:EClass messageproperties.ecore#//Property"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Invoke" eSuperTypes="#//PartnerActivity">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Allows the business process to invoke a one-way asynchronous, or request-response synchronous operation on a portType offered by a partner playing a role in the business process as specified in a ServiceLinkType. Asyncrhosous invocations specify only an input container while synchronous invocations specify both an input and output container. Correlation sets are used to correlate the business process with a stateful service provided by the partner.
"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="outputVariable" eType="#//Variable"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="inputVariable" eType="#//Variable"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="compensationHandler" eType="#//CompensationHandler"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="faultHandler" eType="#//FaultHandler"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="fromParts" eType="#//FromParts"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="toParts" eType="#//ToParts"
+ containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Link" eSuperTypes="#//ExtensibleElement">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Specifies the synchronization dependencies between activities in a flow. Each activity can be the source and/or target of any number of links. Links establish a predecessor/successor relationship between activities. Activities that are the source of a link are predecessors of activities that are targets of the same link. Parallel execution of activities in a flow is synchronized by requiring that all the source activities of an activity must complete before corresponding target activities of the same link can run. When an activity completes, all activities that are targets of links for which this activity is a source are now candidates for execution (assuming all their predecessor activities have completed)."/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="sources" upperBound="-1"
+ eType="#//Source" eOpposite="#//Source/Link"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="targets" upperBound="-1"
+ eType="#//Target" eOpposite="#//Target/Link"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Catch" eSuperTypes="#//ExtensibleElement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="faultName" eType="ecore:EDataType platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//QName"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="faultVariable" eType="#//Variable"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="activity" lowerBound="1"
+ eType="#//Activity" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="faultMessageType" eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//Message"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="faultElement" eType="ecore:EClass platform:/plugin/org.eclipse.xsd/model/XSD.ecore#//XSDElementDeclaration"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Reply" eSuperTypes="#//PartnerActivity #//Activity">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Allows a business process to send a message in reply to a message that was received through a Receive. The combination of a Receive and Reply forms a synchronous request-response operation on the WSDL portType for the process. The container for the replay activity provides the output message for the partner process invoke activity that invoked the corresponding receive activity.

FaultName specifies the name of a fault and must match some Catch fault name in the Scope or Process's FaultHandler.

A receive can have more than one corresponding reply, at most one without a faultName, and any mumber with different faults."/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="faultName" eType="ecore:EDataType platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//QName"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="variable" eType="#//Variable"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="toParts" eType="#//ToParts"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="messageExchange" lowerBound="1"
+ eType="#//MessageExchange"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="PartnerActivity" eSuperTypes="#//Activity">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="partnerLink" lowerBound="1"
+ eType="#//PartnerLink"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="correlations" eType="#//Correlations"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="portType" lowerBound="1"
+ eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//PortType"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="operation" lowerBound="1"
+ eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//Operation"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Receive" eSuperTypes="#//PartnerActivity">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Allows a business process to block and wait for a particular message to be invoked by a partner in another process. A Receive Activity has a corresponding WSDL portType and operation which other processes can use to invoke the service. The partner can only invoke operations specified by the role it is playing as defined in a ServiceLinkType.

The container for the receive activity corresponds to the input message of its operation. The container messageType must be the input message.

If the operation has an output message, it corresponds to a request-response WSDL message. There must be a corresponding Reply Activity in the process having a container whose messageType is the same as the output message. The Reply Activity is used to send a return message back to the invoking process ."/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="createInstance" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
+ defaultValueLiteral="false" unsettable="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="variable" lowerBound="1"
+ eType="#//Variable"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="fromParts" eType="#//FromParts"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="messageExchange" lowerBound="1"
+ eType="#//MessageExchange"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Exit" eSuperTypes="#//Activity">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="When executed, immediately terminates the business process."/>
+ </eAnnotations>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Throw" eSuperTypes="#//Activity">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Generates a fault from inside the business process. The FaultHandler may be a proxy for an application or process-specific fault instead of a BPEL FaultHandler"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="faultName" eType="ecore:EDataType platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//QName"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="faultVariable" eType="#//Variable"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Wait" eSuperTypes="#//Activity">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Waits for a given time period or until a certain time is reached. Either expression for or until may be specified, but not both."/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="for" eType="#//Expression"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="until" eType="#//Expression"
+ containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Empty" eSuperTypes="#//Activity">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="A "no-op" instruction useful as the target for synchronization of parallel activities, for instance. Empty is also required in situations that require at least one Activity, but there is nothing to do. This may often occur in fault handlers.
"/>
+ </eAnnotations>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Sequence" eSuperTypes="#//Activity">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Defines the structure of the process. Activities in a sequence are executed in order."/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="activities" lowerBound="1"
+ upperBound="-1" eType="#//Activity" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="While" eSuperTypes="#//Activity">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Indicates an activity is to be repeated while a condition is met."/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="activity" lowerBound="1"
+ eType="#//Activity" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="condition" lowerBound="1"
+ eType="#//Condition" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Pick" eSuperTypes="#//Activity">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Blocks and waits for the occurrence of one of a set of messages to arrive or for a time-out to go off. When the pick trigger occurs, the associated activity is executed and the pick completes."/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="createInstance" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
+ defaultValueLiteral="false" unsettable="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="messages" lowerBound="1"
+ upperBound="-1" eType="#//OnMessage" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="alarm" upperBound="-1"
+ eType="#//OnAlarm" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Flow" eSuperTypes="#//Activity">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Enables concurrent execution of its contained activities. Contrast with Sequence which executes its contained activities in order. Links can be used in a flow to define arbitrary predecessor and/or successor activities. A flow activity completes when all of its concurrent activities have been completed."/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="activities" lowerBound="1"
+ upperBound="-1" eType="#//Activity" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="links" eType="#//Links"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="completionCondition" eType="#//CompletionCondition"
+ containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="OnAlarm" eSuperTypes="#//ExtensibleElement">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="When the alert fires, the activity is executed."/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="activity" lowerBound="1"
+ eType="#//Activity" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="for" eType="#//Expression"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="until" eType="#//Expression"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="repeatEvery" eType="#//Expression"
+ containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Assign" eSuperTypes="#//Activity">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Used to update values of containers with new data. Assigns the Form r-value to the To l-value. An Assign is an atomic Activity. All copy elements succeed or none of them do. Exceptions are raised by incompatible types."/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="copy" lowerBound="1" upperBound="-1"
+ eType="#//Copy" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="validate" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBooleanObject"
+ defaultValueLiteral="false"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Copy" eSuperTypes="#//ExtensibleElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="to" lowerBound="1" eType="#//To"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="from" lowerBound="1" eType="#//From"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="keepSrcElementName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
+ defaultValueLiteral="false" unsettable="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="ignoreMissingFromData"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
+ defaultValueLiteral="false" unsettable="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Extension" eSuperTypes="#//ExtensibleElement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="namespace" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="mustUnderstand" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
+ defaultValueLiteral="false" unsettable="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Scope" eSuperTypes="#//Activity">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Defines a nested activity with its own associated fault and compensation handlers."/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="isolated" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
+ defaultValueLiteral="false" unsettable="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="faultHandlers" eType="#//FaultHandler"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="compensationHandler" eType="#//CompensationHandler"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="activity" lowerBound="1"
+ eType="#//Activity" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="variables" eType="#//Variables"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="correlationSets" eType="#//CorrelationSets"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="eventHandlers" eType="#//EventHandler"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="partnerLinks" eType="#//PartnerLinks"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="terminationHandler" eType="#//TerminationHandler"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="messageExchanges" eType="#//MessageExchanges"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="exitOnStandardFault" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
+ defaultValueLiteral="false" unsettable="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="CompensateScope" eSuperTypes="#//Activity">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Used to invoke compensation of an inner scope that has already completed its execution normally. This construct can be invoked only from within a fault handler or the compensation handler of the scope that immediately encloses the scope for which compensation is to be performed."/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="target" eType="#//Activity">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Specifies the scope whose compensation handler is to be invoked."/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="CompensationHandler" eSuperTypes="#//ExtensibleElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="activity" lowerBound="1"
+ eType="#//Activity" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="To" eSuperTypes="#//ExtensibleElement">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Represents an l-value in an assignment activity. Can be used to query a node of a part of a container, a property of a container, or a service reference of a partner."/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="variable" eType="#//Variable"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="part" eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//Part"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="partnerLink" eType="#//PartnerLink"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="property" eType="ecore:EClass messageproperties.ecore#//Property"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="query" eType="#//Query"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="expression" eType="#//Expression"
+ containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="From" eSuperTypes="#//ExtensibleElement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="opaque" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
+ unsettable="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Signifies that an opaque value is to be assigned to a container property based on a non-deterministic choice. Must be used in abstract processes only. The XSD type of the To container property must be derived from xsd:string restricted by enumeration or any restricted XSD integral numeric type."/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="endpointReference" eType="#//EndpointReferenceRole"
+ unsettable="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="literal" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+ unsettable="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="unsafeLiteral" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="expression" eType="#//Expression"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="serviceRef" eType="#//ServiceRef"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass platform:/plugin/org.eclipse.xsd/model/XSD.ecore#//XSDTypeDefinition"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="variable" eType="#//Variable"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="part" eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//Part"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="partnerLink" eType="#//PartnerLink"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="property" eType="ecore:EClass messageproperties.ecore#//Property"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="query" eType="#//Query"
+ containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="OnMessage" eSuperTypes="#//ExtensibleElement">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Receipt of the corresponding message, the activity is executed."/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="variable" eType="#//Variable"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="activity" eType="#//Activity"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="portType" lowerBound="1"
+ eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//PortType"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="partnerLink" lowerBound="1"
+ eType="#//PartnerLink"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="correlations" eType="#//Correlations"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="operation" lowerBound="1"
+ eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//Operation"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="fromParts" eType="#//FromParts"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="messageExchange" lowerBound="1"
+ eType="#//MessageExchange"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Expression" eSuperTypes="platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//ExtensibilityElement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="body" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="expressionLanguage" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+ unsettable="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="opaque" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBooleanObject"
+ unsettable="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="BooleanExpression" eSuperTypes="#//Expression"/>
+ <eClassifiers xsi:type="ecore:EClass" name="Correlation" eSuperTypes="#//ExtensibleElement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="initiate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+ defaultValueLiteral="no" unsettable="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="pattern" eType="#//CorrelationPattern"
+ unsettable="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="set" lowerBound="1" eType="#//CorrelationSet"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EEnum" name="CorrelationPattern">
+ <eLiterals name="request"/>
+ <eLiterals name="response" value="1"/>
+ <eLiterals name="requestresponse" value="2"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EEnum" name="EndpointReferenceRole">
+ <eLiterals name="myRole"/>
+ <eLiterals name="partnerRole" value="1"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="MessageExchange" eSuperTypes="#//ExtensibleElement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+ defaultValueLiteral=""/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="EventHandler" eSuperTypes="#//ExtensibleElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="alarm" upperBound="-1"
+ eType="#//OnAlarm" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="events" upperBound="-1"
+ eType="#//OnEvent" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Source" eSuperTypes="#//ExtensibleElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="Link" lowerBound="1" eType="#//Link"
+ eOpposite="#//Link/sources"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="activity" lowerBound="1"
+ eType="#//Activity"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="transitionCondition" eType="#//Condition"
+ containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Target" eSuperTypes="#//ExtensibleElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="Link" lowerBound="1" eType="#//Link"
+ eOpposite="#//Link/targets"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="activity" lowerBound="1"
+ eType="#//Activity"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="PartnerLinks" eSuperTypes="#//ExtensibleElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
+ eType="#//PartnerLink" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="MessageExchanges" eSuperTypes="#//ExtensibleElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
+ eType="#//MessageExchange" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Variables" eSuperTypes="#//ExtensibleElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
+ eType="#//Variable" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="CorrelationSets" eSuperTypes="#//ExtensibleElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
+ eType="#//CorrelationSet" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Links" eSuperTypes="#//ExtensibleElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
+ eType="#//Link" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="CatchAll" eSuperTypes="#//ExtensibleElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="activity" lowerBound="1"
+ eType="#//Activity" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Correlations" eSuperTypes="#//ExtensibleElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
+ eType="#//Correlation" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Variable" eSuperTypes="#//ExtensibleElement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="messageType" eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//Message"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="XSDElement" eType="ecore:EClass platform:/plugin/org.eclipse.xsd/model/XSD.ecore#//XSDElementDeclaration"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass platform:/plugin/org.eclipse.xsd/model/XSD.ecore#//XSDTypeDefinition"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="from" eType="#//From" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="UnknownExtensibilityAttribute" eSuperTypes="platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//UnknownExtensibilityElement"/>
+ <eClassifiers xsi:type="ecore:EClass" name="OnEvent" eSuperTypes="#//ExtensibleElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="activity" eType="#//Activity"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="variable" eType="#//Variable"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="partnerLink" lowerBound="1"
+ eType="#//PartnerLink"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="correlations" eType="#//Correlations"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="operation" lowerBound="1"
+ eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//Operation"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="portType" lowerBound="1"
+ eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//PortType"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="messageType" lowerBound="1"
+ eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//Message"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="correlationSets" eType="#//CorrelationSets"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="fromParts" eType="#//FromParts"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="messageExchange" lowerBound="1"
+ eType="#//MessageExchange"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Import" eSuperTypes="#//ExtensibleElement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="namespace" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="location" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="importType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Rethrow" eSuperTypes="#//Activity"/>
+ <eClassifiers xsi:type="ecore:EClass" name="Condition" eSuperTypes="#//Expression"/>
+ <eClassifiers xsi:type="ecore:EClass" name="Targets" eSuperTypes="#//ExtensibleElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
+ eType="#//Target" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="joinCondition" eType="#//Condition"
+ containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Sources" eSuperTypes="#//ExtensibleElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
+ eType="#//Source" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Query" eSuperTypes="platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//WSDLElement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="queryLanguage" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ServiceRef" eSuperTypes="platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//ExtensibleElement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="referenceScheme" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Extensions" eSuperTypes="#//ExtensibleElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
+ eType="#//Extension" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ExtensionActivity" eSuperTypes="#//Activity">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="activity" lowerBound="1"
+ eType="#//Activity" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="FromPart" eSuperTypes="#//ExtensibleElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="toVariable" eType="#//Variable"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="part" eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//Part"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ToPart" eSuperTypes="#//ExtensibleElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="fromVariable" eType="#//Variable"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="part" eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//Part"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="OpaqueActivity" eSuperTypes="#//Activity">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Hides detailed information of an existing executable activity. Using an Opaque Activity will turn the process into an abstract process."/>
+ </eAnnotations>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ForEach" eSuperTypes="#//Activity">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="startCounterValue" lowerBound="1"
+ eType="#//Expression" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="finalCounterValue" lowerBound="1"
+ eType="#//Expression" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="parallel" lowerBound="1"
+ eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBooleanObject"
+ defaultValueLiteral="false"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="counterName" lowerBound="1"
+ eType="#//Variable" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="completionCondition" eType="#//CompletionCondition"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="activity" lowerBound="1"
+ eType="#//Activity" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="RepeatUntil" eSuperTypes="#//Activity">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="activity" lowerBound="1"
+ eType="#//Activity" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="condition" lowerBound="1"
+ eType="#//Condition" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="TerminationHandler" eSuperTypes="#//ExtensibleElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="activity" eType="#//Activity"
+ containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Validate" eSuperTypes="#//Activity">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="variables" upperBound="-1"
+ eType="#//Variable"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="If" eSuperTypes="#//Activity">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="condition" eType="#//Condition"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="elseIf" upperBound="-1"
+ eType="#//ElseIf" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="else" eType="#//Else" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="activity" lowerBound="1"
+ eType="#//Activity" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ElseIf" eSuperTypes="#//ExtensibleElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="condition" eType="#//Condition"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="activity" lowerBound="1"
+ eType="#//Activity" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Else" eSuperTypes="#//ExtensibleElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="activity" lowerBound="1"
+ eType="#//Activity" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="CompletionCondition" eSuperTypes="#//ExtensibleElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="branches" eType="#//Branches"
+ containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Branches" eSuperTypes="#//Expression">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="countCompletedBranchesOnly"
+ eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBooleanObject"
+ defaultValueLiteral="false" unsettable="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ExtensibleElement" eSuperTypes="platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//ExtensibleElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="documentation" eType="#//Documentation"
+ unsettable="true" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Documentation">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="lang" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="source" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Compensate" eSuperTypes="#//Activity"/>
+ <eClassifiers xsi:type="ecore:EClass" name="FromParts" eSuperTypes="#//ExtensibleElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
+ eType="#//FromPart" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ToParts" eSuperTypes="#//ExtensibleElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
+ eType="#//ToPart" containment="true"/>
+ </eClassifiers>
+</ecore:EPackage>
Modified: trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/BPELPackage.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/BPELPackage.java 2010-08-27 16:48:15 UTC (rev 24512)
+++ trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/BPELPackage.java 2010-08-27 17:28:49 UTC (rev 24513)
@@ -5540,13 +5540,26 @@
int EXTENSION_ACTIVITY__SOURCES = ACTIVITY__SOURCES;
/**
+ * The feature id for the '<em><b>Activity</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * https://jira.jboss.org/browse/JBIDE-6917
+ * The SampleStructuredActivity example needs an Activity container
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int EXTENSION_ACTIVITY__ACTIVITY = ACTIVITY_FEATURE_COUNT + 0;
+
+ /**
* The number of structural features of the '<em>Extension Activity</em>' class.
* <!-- begin-user-doc -->
+ * https://jira.jboss.org/browse/JBIDE-6917
+ * The SampleStructuredActivity example needs an Activity container
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int EXTENSION_ACTIVITY_FEATURE_COUNT = ACTIVITY_FEATURE_COUNT + 0;
+ int EXTENSION_ACTIVITY_FEATURE_COUNT = ACTIVITY_FEATURE_COUNT + 1;
/**
* The feature id for the '<em><b>Documentation Element</b></em>' attribute.
@@ -9144,6 +9157,19 @@
EClass getExtensionActivity();
/**
+ * Returns the meta object for the containment reference '{@link org.eclipse.bpel.model.ExtensionActivity#getActivity <em>Activity</em>}'.
+ * <!-- begin-user-doc -->
+ * https://jira.jboss.org/browse/JBIDE-6917
+ * The SampleStructuredActivity example needs an Activity container
+ * <!-- end-user-doc -->
+ * @return the meta object for the containment reference '<em>Activity</em>'.
+ * @see org.eclipse.bpel.model.ExtensionActivity#getActivity()
+ * @see #getExtensionActivity()
+ * @generated
+ */
+ EReference getExtensionActivity_Activity();
+
+ /**
* Returns the meta object for class '{@link org.eclipse.bpel.model.FromPart <em>From Part</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -11588,6 +11614,17 @@
EClass EXTENSION_ACTIVITY = eINSTANCE.getExtensionActivity();
/**
+ * The meta object literal for the '<em><b>Activity</b></em>' containment reference feature.
+ * <!-- begin-user-doc -->
+ * https://jira.jboss.org/browse/JBIDE-6917
+ * The SampleStructuredActivity example needs an Activity container
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference EXTENSION_ACTIVITY__ACTIVITY = eINSTANCE
+ .getExtensionActivity_Activity();
+
+ /**
* The meta object literal for the '{@link org.eclipse.bpel.model.impl.FromPartImpl <em>From Part</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
Modified: trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/ExtensionActivity.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/ExtensionActivity.java 2010-08-27 16:48:15 UTC (rev 24512)
+++ trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/ExtensionActivity.java 2010-08-27 17:28:49 UTC (rev 24513)
@@ -9,12 +9,46 @@
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Extension Activity</b></em>'.
+ * https://jira.jboss.org/browse/JBIDE-6917
+ * The SampleStructuredActivity example needs an Activity container
* <!-- end-user-doc -->
*
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.bpel.model.ExtensionActivity#getActivity <em>Activity</em>}</li>
+ * </ul>
+ * </p>
*
* @see org.eclipse.bpel.model.BPELPackage#getExtensionActivity()
* @model
* @generated
*/
public interface ExtensionActivity extends Activity {
+
+ /**
+ * Returns the value of the '<em><b>Activity</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Activity</em>' reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Activity</em>' containment reference.
+ * @see #setActivity(Activity)
+ * @see org.eclipse.bpel.model.BPELPackage#getExtensionActivity_Activity()
+ * @model containment="true" required="true"
+ * @generated
+ */
+ Activity getActivity();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.bpel.model.ExtensionActivity#getActivity <em>Activity</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Activity</em>' containment reference.
+ * @see #getActivity()
+ * @generated
+ */
+ void setActivity(Activity value);
} // ExtensionActivity
Modified: trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BPELPackageImpl.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BPELPackageImpl.java 2010-08-27 16:48:15 UTC (rev 24512)
+++ trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BPELPackageImpl.java 2010-08-27 17:28:49 UTC (rev 24513)
@@ -2728,9 +2728,21 @@
/**
* <!-- begin-user-doc -->
+ * https://jira.jboss.org/browse/JBIDE-6917
+ * The SampleStructuredActivity example needs an Activity container
* <!-- end-user-doc -->
* @generated
*/
+ public EReference getExtensionActivity_Activity() {
+ return (EReference) extensionActivityEClass.getEStructuralFeatures()
+ .get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public EClass getFromPart() {
return fromPartEClass;
}
@@ -3480,6 +3492,7 @@
createEReference(extensionsEClass, EXTENSIONS__CHILDREN);
extensionActivityEClass = createEClass(EXTENSION_ACTIVITY);
+ createEReference(extensionActivityEClass, EXTENSION_ACTIVITY__ACTIVITY);
fromPartEClass = createEClass(FROM_PART);
createEReference(fromPartEClass, FROM_PART__TO_VARIABLE);
@@ -4739,6 +4752,11 @@
extensionActivityEClass,
ExtensionActivity.class,
"ExtensionActivity", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(
+ getExtensionActivity_Activity(),
+ this.getActivity(),
+ null,
+ "activity", null, 1, 1, ExtensionActivity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEClass(
fromPartEClass,
Modified: trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ExtensionActivityImpl.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ExtensionActivityImpl.java 2010-08-27 16:48:15 UTC (rev 24512)
+++ trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ExtensionActivityImpl.java 2010-08-27 17:28:49 UTC (rev 24513)
@@ -6,15 +6,27 @@
*/
package org.eclipse.bpel.model.impl;
+import org.eclipse.bpel.model.Activity;
import org.eclipse.bpel.model.BPELPackage;
import org.eclipse.bpel.model.ExtensionActivity;
+import org.eclipse.bpel.model.util.ReconciliationHelper;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
/**
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Extension Activity</b></em>'.
+ * https://jira.jboss.org/browse/JBIDE-6917
+ * The SampleStructuredActivity example needs an Activity container
* <!-- end-user-doc -->
* <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.bpel.model.impl.ExtensionActivityImpl#getActivity <em>Activity</em>}</li>
+ * </ul>
* </p>
*
* @generated
@@ -22,10 +34,20 @@
public class ExtensionActivityImpl extends ActivityImpl implements
ExtensionActivity {
/**
+ * The cached value of the '{@link #getActivity() <em>Activity</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ * @see #getActivity()
* @generated
+ * @ordered
*/
+ protected Activity activity;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
protected ExtensionActivityImpl() {
super();
}
@@ -40,4 +62,136 @@
return BPELPackage.Literals.EXTENSION_ACTIVITY;
}
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public Activity getActivity() {
+ return activity;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ */
+ public NotificationChain basicSetActivity(Activity newActivity,
+ NotificationChain msgs) {
+ Activity oldActivity = activity;
+ if (!isReconciling) {
+ ReconciliationHelper.replaceChild(this, oldActivity, newActivity);
+ }
+ activity = newActivity;
+ if (eNotificationRequired()) {
+ ENotificationImpl notification = new ENotificationImpl(this,
+ Notification.SET, BPELPackage.EXTENSION_ACTIVITY__ACTIVITY,
+ oldActivity, newActivity);
+ if (msgs == null)
+ msgs = notification;
+ else
+ msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setActivity(Activity newActivity) {
+ if (newActivity != activity) {
+ NotificationChain msgs = null;
+ if (activity != null)
+ msgs = ((InternalEObject) activity).eInverseRemove(this,
+ EOPPOSITE_FEATURE_BASE
+ - BPELPackage.EXTENSION_ACTIVITY__ACTIVITY,
+ null, msgs);
+ if (newActivity != null)
+ msgs = ((InternalEObject) newActivity).eInverseAdd(this,
+ EOPPOSITE_FEATURE_BASE
+ - BPELPackage.EXTENSION_ACTIVITY__ACTIVITY,
+ null, msgs);
+ msgs = basicSetActivity(newActivity, msgs);
+ if (msgs != null)
+ msgs.dispatch();
+ } else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET,
+ BPELPackage.EXTENSION_ACTIVITY__ACTIVITY, newActivity,
+ newActivity));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public NotificationChain eInverseRemove(InternalEObject otherEnd,
+ int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case BPELPackage.EXTENSION_ACTIVITY__ACTIVITY:
+ return basicSetActivity(null, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case BPELPackage.EXTENSION_ACTIVITY__ACTIVITY:
+ return getActivity();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case BPELPackage.EXTENSION_ACTIVITY__ACTIVITY:
+ setActivity((Activity) newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case BPELPackage.EXTENSION_ACTIVITY__ACTIVITY:
+ setActivity((Activity) null);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case BPELPackage.EXTENSION_ACTIVITY__ACTIVITY:
+ return activity != null;
+ }
+ return super.eIsSet(featureID);
+ }
+
} //ExtensionActivityImpl
Modified: trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELReader.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELReader.java 2010-08-27 16:48:15 UTC (rev 24512)
+++ trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELReader.java 2010-08-27 17:28:49 UTC (rev 24513)
@@ -2386,7 +2386,12 @@
}
}
// Fallback is to create a new extensionActivity.
- return BPELFactory.eINSTANCE.createExtensionActivity();
+ // https://jira.jboss.org/browse/JBIDE-6917
+ Activity activity = BPELFactory.eINSTANCE.createExtensionActivity();
+ setStandardAttributes(extensionActivityElement, activity);
+ setStandardElements(extensionActivityElement, activity);
+ activity.setElement(extensionActivityElement);
+ return activity;
}
Modified: trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationHelper.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationHelper.java 2010-08-27 16:48:15 UTC (rev 24512)
+++ trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationHelper.java 2010-08-27 17:28:49 UTC (rev 24513)
@@ -946,7 +946,11 @@
// new child as child of the <extensionActivity> element child and not the <extensionActivity> itself.
// This code snippet changes the parentElement to the correct subelement
if (parent instanceof ExtensionActivity) {
- parentElement = getExtensionActivityChildElement((Element) parentElement);
+ // https://jira.jboss.org/browse/JBIDE-6917
+ // Fix NPE
+ Node realParent = ReconciliationHelper.getExtensionActivityChildElement((Element) parentElement);
+ if (realParent!=null)
+ parentElement = realParent;
}
if (child instanceof Variable) {
@@ -1379,6 +1383,9 @@
if (context instanceof CompensationHandler) return ((CompensationHandler)context).getActivity();
if (context instanceof TerminationHandler) return ((TerminationHandler)context).getActivity();
if (context instanceof If) return ((If) context).getActivity();
+ // https://jira.jboss.org/browse/JBIDE-6917
+ // added an Activity for Structure Activities that behave like containers
+ if (context instanceof ExtensionActivity) return ((ExtensionActivity) context).getActivity();
System.err.println("Missing getActivity():" + context.getClass());
throw new IllegalArgumentException();
}
Added: trunk/bpel/plugins/org.eclipse.bpel.ui/icons/obj16/extensionactivity.gif
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/plugins/org.eclipse.bpel.ui/icons/obj16/extensionactivity.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/plugins/org.eclipse.bpel.ui/icons/obj20/extensionactivity.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/plugins/org.eclipse.bpel.ui/icons/obj20/extensionactivity.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELMultipageEditorPart.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELMultipageEditorPart.java 2010-08-27 16:48:15 UTC (rev 24512)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELMultipageEditorPart.java 2010-08-27 17:28:49 UTC (rev 24513)
@@ -31,6 +31,7 @@
import org.eclipse.bpel.model.PartnerLink;
import org.eclipse.bpel.model.Process;
import org.eclipse.bpel.model.Variable;
+import org.eclipse.bpel.model.resource.BPELResourceSetImpl;
import org.eclipse.bpel.model.util.BPELUtils;
import org.eclipse.bpel.ui.adapters.AdapterNotification;
import org.eclipse.bpel.ui.editparts.ProcessTrayEditPart;
@@ -120,6 +121,7 @@
import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
import org.eclipse.wst.sse.ui.StructuredTextEditor;
+import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
import org.w3c.dom.Document;
@@ -415,6 +417,24 @@
}
}
+ // https://jira.jboss.org/browse/JBIDE-6917
+ @Override
+ protected IEditorSite createSite(IEditorPart page) {
+ IEditorSite site = null;
+ if (page == fTextEditor) {
+ site = new org.eclipse.ui.part.MultiPageEditorSite(this, page) {
+ public String getId() {
+ // Sets this ID so nested editor is configured for BPEL source
+ return BPELResourceSetImpl.BPEL_CONTENT_TYPE;
+ }
+ };
+ }
+ else {
+ site = super.createSite(page);
+ }
+ return site;
+ }
+
/**
* Creates the source page of the multi-page editor.
*/
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/IBPELUIConstants.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/IBPELUIConstants.java 2010-08-27 16:48:15 UTC (rev 24512)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/IBPELUIConstants.java 2010-08-27 17:28:49 UTC (rev 24513)
@@ -79,6 +79,9 @@
public final String ICON_INVOKE_32 = "obj20/invoke.png"; //$NON-NLS-1$
public final String ICON_OPAQUEACTIVITY_16 = "obj16/opaqueactivity.gif"; //$NON-NLS-1$
public final String ICON_OPAQUEACTIVITY_32 = "obj20/opaqueactivity.png"; //$NON-NLS-1$
+ // https://jira.jboss.org/browse/JBIDE-6917
+ public final String ICON_EXTENSIONCTIVITY_16 = "obj16/extensionactivity.gif"; //$NON-NLS-1$
+ public final String ICON_EXTENSIONACTIVITY_32 = "obj20/extensionactivity.png"; //$NON-NLS-1$
public final String ICON_PICK_16 = "obj16/pick.gif"; //$NON-NLS-1$
public final String ICON_PICK_32 = "obj20/pick.png"; //$NON-NLS-1$
public final String ICON_RECEIVE_16 = "obj16/receive.gif"; //$NON-NLS-1$
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/BPELUIAdapterFactory.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/BPELUIAdapterFactory.java 2010-08-27 16:48:15 UTC (rev 24512)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/BPELUIAdapterFactory.java 2010-08-27 17:28:49 UTC (rev 24513)
@@ -438,6 +438,12 @@
}
+ @Override
+ // https://jira.jboss.org/browse/JBIDE-6917
+ public Adapter createExtensionActivityAdapter() {
+ return fProvider.getAdapter(ExtensionActivityAdapter.class);
+ }
+
/**
* @see org.eclipse.emf.common.notify.impl.AdapterFactoryImpl#adaptNew(org.eclipse.emf.common.notify.Notifier, java.lang.Object)
*/
Added: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ExtensionActivityAdapter.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ExtensionActivityAdapter.java (rev 0)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ExtensionActivityAdapter.java 2010-08-27 17:28:49 UTC (rev 24513)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.eclipse.bpel.ui.adapters;
+
+/*
+ * This is the extensionActivity adapter
+ *
+ * @see https://jira.jboss.org/browse/JBIDE-6917
+ * @author Bob Brodt
+ * @date Aug 27, 2010
+ */
+public class ExtensionActivityAdapter extends ActivityAdapter {
+
+ public ExtensionActivityAdapter()
+ {
+ super();
+ }
+}
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/factories/BPELUIObjectFactory.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/factories/BPELUIObjectFactory.java 2010-08-27 16:48:15 UTC (rev 24512)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/factories/BPELUIObjectFactory.java 2010-08-27 17:28:49 UTC (rev 24513)
@@ -96,7 +96,10 @@
BPELPackage.eINSTANCE.getEventHandler(),
BPELPackage.eINSTANCE.getOnEvent(),
BPELPackage.eINSTANCE.getMessageExchange(),
- BPELPackage.eINSTANCE.getValidate() };
+ BPELPackage.eINSTANCE.getValidate(),
+ // https://jira.jboss.org/browse/JBIDE-6917
+ BPELPackage.eINSTANCE.getExtensionActivity()
+ };
protected EClass modelType;
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/NamespacePrefixesProvider.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/NamespacePrefixesProvider.java 2010-08-27 16:48:15 UTC (rev 24512)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/NamespacePrefixesProvider.java 2010-08-27 17:28:49 UTC (rev 24513)
@@ -73,18 +73,26 @@
// and collect all in-scope namespace info
while (context!=null)
{
- Map<String, String> map = BPELUtils.getNamespaceMap(context);
- for (Map.Entry<String,String> e : map.entrySet())
+ // https://jira.jboss.org/browse/JBIDE-6917
+ try
{
- String ns = e.getValue().toString();
- NamespacePrefixElement elem = new NamespacePrefixElement((String)e.getKey(), ns, context,null);
- elements.add(elem);
- if( BPELConstants.NAMESPACE_2007.equals(ns) ||
- process.getTargetNamespace().equals(ns))
+ Map<String, String> map = BPELUtils.getNamespaceMap(context);
+ for (Map.Entry<String,String> e : map.entrySet())
{
- elem.location = process.eResource().getURI().lastSegment();
+ String ns = e.getValue().toString();
+ NamespacePrefixElement elem = new NamespacePrefixElement((String)e.getKey(), ns, context,null);
+ elements.add(elem);
+ if( BPELConstants.NAMESPACE_2007.equals(ns) ||
+ process.getTargetNamespace().equals(ns))
+ {
+ elem.location = process.eResource().getURI().lastSegment();
+ }
}
}
+ catch (Exception e)
+ {
+ // ignore namespace map in extension activity eObjects ... for now
+ }
context = context.eContainer();
}
}
@@ -104,8 +112,13 @@
if (!imp.getLocation().startsWith("http://") && !imp.getLocation().startsWith("https://"))
{
ImportResolver r = ImportResolverRegistry.INSTANCE.getResolvers(imp.getImportType())[0];
- Definition wsdl = (Definition) r.resolve(imp, ImportResolver.RESOLVE_DEFINITION).get(0);
- recurseImports(wsdl.getImports(), imports, elements);
+ // https://jira.jboss.org/browse/JBIDE-6917
+ List<Object> rl = r.resolve(imp, ImportResolver.RESOLVE_DEFINITION);
+ if (rl.size()>0)
+ {
+ Definition wsdl = (Definition) rl.get(0);
+ recurseImports(wsdl.getImports(), imports, elements);
+ }
}
}
}
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELReader.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELReader.java 2010-08-27 16:48:15 UTC (rev 24512)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELReader.java 2010-08-27 17:28:49 UTC (rev 24513)
@@ -76,7 +76,14 @@
// but no parsing errors were logged in the Resource. This is because demand
// load was used by createResource(). Force a reload here, this time with
// proper error logging.
- processResource.unload();
+ // FIXME: this somehow breaks the resource change notifications, so that changes to the model
+ // don't cause the Resource to be marked dirty.
+ // This is a quick patch for JBT 3.2.0.M2, I'll fix this later
+ // NOTE: This is not the way to handle this because the editor is using a WST structured
+ // source editor to load the XML using a fault tolerant parser. The resulting DOM, which
+ // is always valid, is used to populate the EMF model. We should be getting the errors from
+ // the SSE and adding them as Diagnostics to the EMF Resource.getErrors() list.
+// processResource.unload();
processResource.load(Collections.EMPTY_MAP);
EList<EObject> contents = processResource.getContents();
if (!contents.isEmpty())
@@ -182,7 +189,10 @@
try {
// https://jira.jboss.org/browse/JBIDE-6825
- processResource.unload();
+ // FIXME: this somehow breaks the resource change notifications, so that changes to the model
+ // don't cause the Resource to be marked dirty.
+ // This is a quick patch for JBT 3.2.0.M2, I'll fix this later
+// processResource.unload();
processResource.load(Collections.EMPTY_MAP);
EList<EObject> contents = processResource.getContents();
if (!contents.isEmpty())
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/BPELReader.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/BPELReader.java 2010-08-27 16:48:15 UTC (rev 24512)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/BPELReader.java 2010-08-27 17:28:49 UTC (rev 24513)
@@ -17,7 +17,6 @@
import org.eclipse.bpel.common.extension.model.ExtensionMap;
import org.eclipse.bpel.model.Process;
-import org.eclipse.bpel.model.impl.BPELFactoryImpl;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
@@ -116,12 +115,6 @@
this.process = null;
try {
- // https://jira.jboss.org/browse/JBIDE-6825
- // If the ResourceInfo.load() already loaded the process file
- // but no parsing errors were logged in the Resource. This is because demand
- // load was used by createResource(). Force a reload here, this time with
- // proper error logging.
- processResource.unload();
processResource.load (Collections.EMPTY_MAP);
EList contents = processResource.getContents();
if (!contents.isEmpty()) {
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/NodeNameFilter.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/NodeNameFilter.java 2010-08-27 16:48:15 UTC (rev 24512)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/NodeNameFilter.java 2010-08-27 17:28:49 UTC (rev 24513)
@@ -69,7 +69,20 @@
}
return fNodeNames[0].equals(nn);
}
- return (Arrays.binarySearch(fNodeNames, nn, QNAME_COMPARATOR) >= 0);
+ boolean valid = (Arrays.binarySearch(fNodeNames, nn, QNAME_COMPARATOR) >= 0);
+ if (!valid)
+ {
+ // https://jira.jboss.org/browse/JBIDE-6917
+ // check if this is a structured extension activity (a container)
+ node = node.parentNode();
+ if (node!=null)
+ {
+ nn = node.nodeName();
+ if (IConstants.ND_EXTENSION_ACTIVITY.equals(nn))
+ valid = (Arrays.binarySearch(fNodeNames, nn, QNAME_COMPARATOR) >= 0);
+ }
+ }
+ return valid;
}
/**
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ExtensionActivityValidator.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ExtensionActivityValidator.java 2010-08-27 16:48:15 UTC (rev 24512)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ExtensionActivityValidator.java 2010-08-27 17:28:49 UTC (rev 24513)
@@ -10,9 +10,22 @@
*******************************************************************************/
package org.eclipse.bpel.validator.rules;
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.namespace.QName;
+import org.eclipse.bpel.model.extensions.BPELActivityDeserializer;
+import org.eclipse.bpel.model.extensions.BPELExtensionRegistry;
+import org.eclipse.bpel.validator.model.INode;
+import org.eclipse.bpel.validator.model.IProblem;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+
+
/**
* Validates Extension activities
*
@@ -25,12 +38,44 @@
public class ExtensionActivityValidator extends CActivityValidator {
-
/** End of public rule methods.
*
* Other methods are support methods for this class to perform its
* validation function.
*
*/
+ public ExtensionActivityValidator()
+ {
+ super();
+ }
+ // https://jira.jboss.org/browse/JBIDE-6917
+ @Override
+ protected void start() {
+ super.start();
+ BPELExtensionRegistry extensionRegistry = BPELExtensionRegistry.getInstance();
+ if (mNode.children().size() == 1) {
+ INode child = mNode.children().get(0);
+ // We found a child element. Look up a deserializer for this activity
+ BPELActivityDeserializer deserializer = extensionRegistry.getActivityDeserializer(child.nodeName());
+ if (deserializer == null)
+ {
+ IProblem problem = this.createWarning();
+ String node = toString(child.nodeName());
+ String name = child.getAttribute(new QName("name"));
+ if (name==null || name.length()==0)
+ name = "";
+ problem.fill("BPELC_UNKNOWN_EXTENSION__ACTIVITY",node,name);
+ }
+ }
+ else
+ {
+ IProblem problem = this.createError();
+ String node = toString(mNode.nodeName());
+ String name = mNode.getAttribute(new QName("name"));
+ if (name==null || name.length()==0)
+ name = "";
+ problem.fill("BPELC_MISSING_EXTENSION__ACTIVITY",node,name);
+ }
+ }
}
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/messages.properties
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/messages.properties 2010-08-27 16:48:15 UTC (rev 24512)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/messages.properties 2010-08-27 17:28:49 UTC (rev 24513)
@@ -901,4 +901,22 @@
BPELC_EXTENSION__NOT_SUPPORTED.summary = Extension "{1}" is not supported.
BPELC_EXTENSION__NOT_SUPPORTED = Extension "{1}" is not supported by this implementation.
BPELC_EXTENSION__NOT_SUPPORTED.fix = Remove the dependency on extension "{1}"
-#
\ No newline at end of file
+#
+# https://jira.jboss.org/browse/JBIDE-6917
+#
+# ------------- Extension Activity ---------------------
+# BPELC_UNKNOWN_EXTENSION__ACTIVITY
+# {0}: node
+# {1}: extension activity name
+#
+BPELC_UNKNOWN_EXTENSION__ACTIVITY.summary = Extension Activity element <{0}> is not supported.
+BPELC_UNKNOWN_EXTENSION__ACTIVITY = Extension Activity element <{0} name="{1}"> is not supported by this implementation.
+BPELC_UNKNOWN_EXTENSION__ACTIVITY.fix = Remove the Extension Activity <{0}> or contact the vendor to obtain the necessary plug-in(s)
+#
+# BPELC_UNKNOWN_EXTENSION__ACTIVITY
+# {0}: node
+# {1}: extension activity name
+#
+BPELC_MISSING_EXTENSION__ACTIVITY.summary = Extension Activity element <{0}> must have exactly one child element.
+BPELC_MISSING_EXTENSION__ACTIVITY = Extension Activity element <{0} name="{1}"> must have exactly one child element.
+BPELC_MISSING_EXTENSION__ACTIVITY.fix = Make sure the Extension Activity element <{0}> has exactly one child element that is supported by this implementation
14 years, 6 months
JBoss Tools SVN: r24512 - in trunk/seam/plugins: org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2010-08-27 12:48:15 -0400 (Fri, 27 Aug 2010)
New Revision: 24512
Added:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AddAnnotaionMarkerResolution.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/DeleteAnnotaionMarkerResolution.java
Removed:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/DeleteNameAnnotaionMarkerResolution.java
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AbstractSeamMarkerResolution.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/SeamProblemMarkerResolutionGenerator.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties
Log:
https://jira.jboss.org/browse/JBIDE-4064
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2010-08-27 16:09:56 UTC (rev 24511)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2010-08-27 16:48:15 UTC (rev 24512)
@@ -27,7 +27,6 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.Flags;
import org.eclipse.jdt.core.IMember;
import org.eclipse.jdt.core.IMethod;
@@ -87,8 +86,17 @@
public static final String ID = "org.jboss.tools.seam.core.CoreValidator";
public static final String MESSAGE_ID_ATTRIBUTE_NAME = "Seam_message_id"; //$NON-NLS-1$
+
public static final int NONUNIQUE_COMPONENT_NAME_MESSAGE_ID = 1;
-
+ public static final int DUPLICATE_REMOVE_MESSAGE_ID = 2;
+ public static final int DUPLICATE_DESTROY_MESSAGE_ID = 3;
+ public static final int DUPLICATE_CREATE_MESSAGE_ID = 4;
+ public static final int DUPLICATE_UNWRAP_MESSAGE_ID = 5;
+ public static final int DESTROY_METHOD_BELONGS_TO_STATELESS_SESSION_BEAN_MESSAGE_ID = 6;
+ public static final int CREATE_DOESNT_BELONG_TO_COMPONENT_MESSAGE_ID = 7;
+ public static final int UNWRAP_DOESNT_BELONG_TO_COMPONENT_MESSAGE_ID = 8;
+ public static final int OBSERVER_DOESNT_BELONG_TO_COMPONENT_MESSAGE_ID = 9;
+
private ISeamProject seamProject;
private String projectName;
@@ -755,7 +763,7 @@
ITextSourceReference location = getScopeLocation(component);
addError(SeamValidationMessages.STATEFUL_COMPONENT_WRONG_SCOPE, SeamPreferences.STATEFUL_COMPONENT_WRONG_SCOPE, new String[]{component.getName()}, location, javaDeclaration.getResource());
}
- validateDuplicateComponentMethod(SeamComponentMethodType.REMOVE, component, SeamValidationMessages.DUPLICATE_REMOVE, SeamPreferences.DUPLICATE_REMOVE);
+ validateDuplicateComponentMethod(SeamComponentMethodType.REMOVE, component, SeamValidationMessages.DUPLICATE_REMOVE, SeamPreferences.DUPLICATE_REMOVE, DUPLICATE_REMOVE_MESSAGE_ID);
}
}
@@ -769,12 +777,12 @@
}
private void validateDuplicateComponentMethods(ISeamComponent component) {
- validateDuplicateComponentMethod(SeamComponentMethodType.DESTROY, component, SeamValidationMessages.DUPLICATE_DESTROY, SeamPreferences.DUPLICATE_DESTROY);
- validateDuplicateComponentMethod(SeamComponentMethodType.CREATE, component, SeamValidationMessages.DUPLICATE_CREATE, SeamPreferences.DUPLICATE_CREATE);
- validateDuplicateComponentMethod(SeamComponentMethodType.UNWRAP, component, SeamValidationMessages.DUPLICATE_UNWRAP, SeamPreferences.DUPLICATE_UNWRAP);
+ validateDuplicateComponentMethod(SeamComponentMethodType.DESTROY, component, SeamValidationMessages.DUPLICATE_DESTROY, SeamPreferences.DUPLICATE_DESTROY, DUPLICATE_DESTROY_MESSAGE_ID);
+ validateDuplicateComponentMethod(SeamComponentMethodType.CREATE, component, SeamValidationMessages.DUPLICATE_CREATE, SeamPreferences.DUPLICATE_CREATE, DUPLICATE_CREATE_MESSAGE_ID);
+ validateDuplicateComponentMethod(SeamComponentMethodType.UNWRAP, component, SeamValidationMessages.DUPLICATE_UNWRAP, SeamPreferences.DUPLICATE_UNWRAP, DUPLICATE_UNWRAP_MESSAGE_ID);
}
- private void validateDuplicateComponentMethod(SeamComponentMethodType methodType, ISeamComponent component, String message, String preferenceKey) {
+ private void validateDuplicateComponentMethod(SeamComponentMethodType methodType, ISeamComponent component, String message, String preferenceKey, int message_id) {
ISeamJavaComponentDeclaration javaDeclaration = component.getJavaDeclaration();
Set<ISeamComponentMethod> methods = javaDeclaration.getMethodsByType(methodType);
if(methods!=null && methods.size()>1) {
@@ -783,7 +791,7 @@
IMethod javaMethod = (IMethod)method.getSourceMember();
String methodName = javaMethod.getElementName();
ITextSourceReference methodNameLocation = getNameLocation(method);
- addError(message, preferenceKey, new String[]{methodName}, methodNameLocation, javaDeclaration.getResource());
+ addError(message, preferenceKey, new String[]{methodName}, methodNameLocation, javaDeclaration.getResource(), message_id);
}
}
}
@@ -881,9 +889,9 @@
IMember member = declaration.getSourceMember();
try {
if(member!=null && !Flags.isAbstract(member.getFlags())) {
- validateMethodOfUnknownComponent(SeamComponentMethodType.CREATE, declaration, SeamValidationMessages.CREATE_DOESNT_BELONG_TO_COMPONENT, SeamPreferences.CREATE_DOESNT_BELONG_TO_COMPONENT);
- validateMethodOfUnknownComponent(SeamComponentMethodType.UNWRAP, declaration, SeamValidationMessages.UNWRAP_DOESNT_BELONG_TO_COMPONENT, SeamPreferences.UNWRAP_DOESNT_BELONG_TO_COMPONENT);
- validateMethodOfUnknownComponent(SeamComponentMethodType.OBSERVER, declaration, SeamValidationMessages.OBSERVER_DOESNT_BELONG_TO_COMPONENT, SeamPreferences.OBSERVER_DOESNT_BELONG_TO_COMPONENT);
+ validateMethodOfUnknownComponent(SeamComponentMethodType.CREATE, declaration, SeamValidationMessages.CREATE_DOESNT_BELONG_TO_COMPONENT, SeamPreferences.CREATE_DOESNT_BELONG_TO_COMPONENT, CREATE_DOESNT_BELONG_TO_COMPONENT_MESSAGE_ID);
+ validateMethodOfUnknownComponent(SeamComponentMethodType.UNWRAP, declaration, SeamValidationMessages.UNWRAP_DOESNT_BELONG_TO_COMPONENT, SeamPreferences.UNWRAP_DOESNT_BELONG_TO_COMPONENT, UNWRAP_DOESNT_BELONG_TO_COMPONENT_MESSAGE_ID);
+ validateMethodOfUnknownComponent(SeamComponentMethodType.OBSERVER, declaration, SeamValidationMessages.OBSERVER_DOESNT_BELONG_TO_COMPONENT, SeamPreferences.OBSERVER_DOESNT_BELONG_TO_COMPONENT, OBSERVER_DOESNT_BELONG_TO_COMPONENT_MESSAGE_ID);
}
} catch (JavaModelException e) {
SeamCorePlugin.getPluginLog().logError(e);
@@ -905,13 +913,13 @@
if(javaDeclaration.getSourcePath().equals(javaMethod.getPath())) {
validationContext.addLinkedCoreResource(component.getName(), javaDeclaration.getSourcePath(), true);
ITextSourceReference methodNameLocation = getNameLocation(method);
- addError(SeamValidationMessages.DESTROY_METHOD_BELONGS_TO_STATELESS_SESSION_BEAN, SeamPreferences.DESTROY_METHOD_BELONGS_TO_STATELESS_SESSION_BEAN, new String[]{methodName}, methodNameLocation, method.getResource());
+ addError(SeamValidationMessages.DESTROY_METHOD_BELONGS_TO_STATELESS_SESSION_BEAN, SeamPreferences.DESTROY_METHOD_BELONGS_TO_STATELESS_SESSION_BEAN, new String[]{methodName}, methodNameLocation, method.getResource(), DESTROY_METHOD_BELONGS_TO_STATELESS_SESSION_BEAN_MESSAGE_ID);
}
}
}
}
- private void validateMethodOfUnknownComponent(SeamComponentMethodType methodType, ISeamJavaComponentDeclaration declaration, String message, String preferenceKey) {
+ private void validateMethodOfUnknownComponent(SeamComponentMethodType methodType, ISeamJavaComponentDeclaration declaration, String message, String preferenceKey, int message_id) {
Set<ISeamComponentMethod> methods = declaration.getMethodsByType(methodType);
if(methods!=null && !methods.isEmpty()) {
for (ISeamComponentMethod method : methods) {
@@ -919,7 +927,7 @@
String methodName = javaMethod.getElementName();
if(declaration.getSourcePath().equals(javaMethod.getPath())) {
ITextSourceReference methodNameLocation = getNameLocation(method);
- addError(message, preferenceKey, new String[]{methodName}, methodNameLocation, method.getResource());
+ addError(message, preferenceKey, new String[]{methodName}, methodNameLocation, method.getResource(), message_id);
validationContext.addUnnamedCoreResource(declaration.getSourcePath());
}
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java 2010-08-27 16:09:56 UTC (rev 24511)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java 2010-08-27 16:48:15 UTC (rev 24512)
@@ -361,7 +361,19 @@
public static String SEAM_COMPONENT_RENAME_HANDLER_ERROR;
public static String DELETE_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE;
+
+ public static String DELETE_REMOVE_ANNOTATION_MARKER_RESOLUTION_TITLE;
+
+ public static String DELETE_DESTROY_ANNOTATION_MARKER_RESOLUTION_TITLE;
+ public static String DELETE_CREATE_ANNOTATION_MARKER_RESOLUTION_TITLE;
+
+ public static String DELETE_UNWRAP_ANNOTATION_MARKER_RESOLUTION_TITLE;
+
+ public static String DELETE_OBSERVER_ANNOTATION_MARKER_RESOLUTION_TITLE;
+
+ public static String ADD_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE;
+
static {
// load message values from bundle file
NLS.initializeMessages(BUNDLE_NAME, SeamUIMessages.class);
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AbstractSeamMarkerResolution.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AbstractSeamMarkerResolution.java 2010-08-27 16:09:56 UTC (rev 24511)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AbstractSeamMarkerResolution.java 2010-08-27 16:48:15 UTC (rev 24512)
@@ -82,16 +82,21 @@
}
private boolean checkImport(String text, String qualifiedName){
+ String name = getShortName(qualifiedName);
+
+ Pattern p = Pattern.compile(".*\\W"+name+"\\W.*",Pattern.DOTALL); //$NON-NLS-1$ //$NON-NLS-2$
+ Matcher m = p.matcher(text);
+ return !m.matches();
+ }
+
+ protected String getShortName(String qualifiedName){
int lastDot = qualifiedName.lastIndexOf('.');
String name;
if(lastDot < 0)
name = qualifiedName;
else
name = qualifiedName.substring(lastDot+1);
-
- Pattern p = Pattern.compile(".*\\W"+name+"\\W.*",Pattern.DOTALL); //$NON-NLS-1$ //$NON-NLS-2$
- Matcher m = p.matcher(text);
- return !m.matches();
+ return name;
}
protected void addAnnotation(String annotationTypeName, String annotationString){
Added: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AddAnnotaionMarkerResolution.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AddAnnotaionMarkerResolution.java (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AddAnnotaionMarkerResolution.java 2010-08-27 16:48:15 UTC (rev 24512)
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.seam.ui.marker;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+
+/**
+ * @author Daniel Azarov
+ */
+public class AddAnnotaionMarkerResolution extends
+ AbstractSeamMarkerResolution {
+ private String label;
+ private String qualifiedName;
+
+ public AddAnnotaionMarkerResolution(String label, String qualifiedName, IFile file, int start, int end){
+ super(file, start, end);
+ this.label = label;
+ this.qualifiedName = qualifiedName;
+ }
+
+ public String getLabel() {
+ return label;
+ }
+
+ public void run(IMarker marker) {
+ addAnnotation(qualifiedName,"@"+getShortName(qualifiedName)); //$NON-NLS-1$
+ }
+
+}
Property changes on: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AddAnnotaionMarkerResolution.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/DeleteAnnotaionMarkerResolution.java (from rev 24500, trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/DeleteNameAnnotaionMarkerResolution.java)
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/DeleteAnnotaionMarkerResolution.java (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/DeleteAnnotaionMarkerResolution.java 2010-08-27 16:48:15 UTC (rev 24512)
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.seam.ui.marker;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+
+/**
+ * @author Daniel Azarov
+ */
+public class DeleteAnnotaionMarkerResolution extends
+ AbstractSeamMarkerResolution {
+ private String label;
+ private String qualifiedName;
+
+ public DeleteAnnotaionMarkerResolution(String label, String qualifiedName, IFile file, int start, int end){
+ super(file, start, end);
+ this.label = label;
+ this.qualifiedName = qualifiedName;
+ }
+
+ public String getLabel() {
+ return label;
+ }
+
+ public void run(IMarker marker) {
+ deleteAnnotation(qualifiedName);
+ }
+
+}
Property changes on: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/DeleteAnnotaionMarkerResolution.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/DeleteNameAnnotaionMarkerResolution.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/DeleteNameAnnotaionMarkerResolution.java 2010-08-27 16:09:56 UTC (rev 24511)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/DeleteNameAnnotaionMarkerResolution.java 2010-08-27 16:48:15 UTC (rev 24512)
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.seam.ui.marker;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.jboss.tools.seam.ui.SeamUIMessages;
-
-/**
- * @author Daniel Azarov
- */
-public class DeleteNameAnnotaionMarkerResolution extends
- AbstractSeamMarkerResolution {
- public DeleteNameAnnotaionMarkerResolution(IFile file, int start, int end){
- super(file, start, end);
- }
-
- public String getLabel() {
- return SeamUIMessages.DELETE_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE;
- }
-
- public void run(IMarker marker) {
- deleteAnnotation("org.jboss.seam.annotations.Name"); //$NON-NLS-1$
- }
-
-}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/SeamProblemMarkerResolutionGenerator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/SeamProblemMarkerResolutionGenerator.java 2010-08-27 16:09:56 UTC (rev 24511)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/SeamProblemMarkerResolutionGenerator.java 2010-08-27 16:48:15 UTC (rev 24512)
@@ -17,6 +17,7 @@
import org.eclipse.ui.IMarkerResolutionGenerator2;
import org.jboss.tools.seam.internal.core.validation.SeamCoreValidator;
import org.jboss.tools.seam.ui.SeamGuiPlugin;
+import org.jboss.tools.seam.ui.SeamUIMessages;
/**
* @author Daniel Azarov
@@ -25,20 +26,17 @@
public IMarkerResolution[] getResolutions(IMarker marker) {
try{
- IMarkerResolution resolution = isOurCase(marker);
- if(resolution != null){
- return new IMarkerResolution[] {resolution};
- }
+ return findResolutions(marker);
}catch(CoreException ex){
SeamGuiPlugin.getPluginLog().logError(ex);
}
return new IMarkerResolution[]{};
}
- private IMarkerResolution isOurCase(IMarker marker) throws CoreException{
+ private IMarkerResolution[] findResolutions(IMarker marker) throws CoreException{
Integer attribute = ((Integer)marker.getAttribute(SeamCoreValidator.MESSAGE_ID_ATTRIBUTE_NAME));
if(attribute == null)
- return null;
+ return new IMarkerResolution[]{};
int messageId = attribute.intValue();
@@ -46,24 +44,49 @@
attribute = ((Integer)marker.getAttribute(IMarker.CHAR_START));
if(attribute == null)
- return null;
+ return new IMarkerResolution[]{};
int start = attribute.intValue();
attribute = ((Integer)marker.getAttribute(IMarker.CHAR_END));
if(attribute == null)
- return null;
+ return new IMarkerResolution[]{};
int end = attribute.intValue();
if(messageId == SeamCoreValidator.NONUNIQUE_COMPONENT_NAME_MESSAGE_ID)
- return new DeleteNameAnnotaionMarkerResolution(file, start, end);
-
- return null;
+ return new IMarkerResolution[]{new DeleteAnnotaionMarkerResolution(SeamUIMessages.DELETE_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Name",file, start, end)};
+ else if(messageId == SeamCoreValidator.DUPLICATE_REMOVE_MESSAGE_ID)
+ return new IMarkerResolution[]{new DeleteAnnotaionMarkerResolution(SeamUIMessages.DELETE_REMOVE_ANNOTATION_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Remove", file, start, end)};
+ else if(messageId == SeamCoreValidator.DUPLICATE_DESTROY_MESSAGE_ID)
+ return new IMarkerResolution[]{new DeleteAnnotaionMarkerResolution(SeamUIMessages.DELETE_DESTROY_ANNOTATION_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Destroy", file, start, end)};
+ else if(messageId == SeamCoreValidator.DUPLICATE_CREATE_MESSAGE_ID)
+ return new IMarkerResolution[]{new DeleteAnnotaionMarkerResolution(SeamUIMessages.DELETE_CREATE_ANNOTATION_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Create", file, start, end)};
+ else if(messageId == SeamCoreValidator.DUPLICATE_UNWRAP_MESSAGE_ID)
+ return new IMarkerResolution[]{new DeleteAnnotaionMarkerResolution(SeamUIMessages.DELETE_UNWRAP_ANNOTATION_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Unwrap", file, start, end)};
+ else if(messageId == SeamCoreValidator.DESTROY_METHOD_BELONGS_TO_STATELESS_SESSION_BEAN_MESSAGE_ID)
+ return new IMarkerResolution[]{new DeleteAnnotaionMarkerResolution(SeamUIMessages.DELETE_DESTROY_ANNOTATION_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Destroy", file, start, end)};
+ else if(messageId == SeamCoreValidator.CREATE_DOESNT_BELONG_TO_COMPONENT_MESSAGE_ID)
+ return new IMarkerResolution[]{
+ new AddAnnotaionMarkerResolution(SeamUIMessages.ADD_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Name", file, start, end),
+ new DeleteAnnotaionMarkerResolution(SeamUIMessages.DELETE_CREATE_ANNOTATION_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Create", file, start, end)
+ };
+ else if(messageId == SeamCoreValidator.UNWRAP_DOESNT_BELONG_TO_COMPONENT_MESSAGE_ID)
+ return new IMarkerResolution[]{
+ new AddAnnotaionMarkerResolution(SeamUIMessages.ADD_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Name", file, start, end),
+ new DeleteAnnotaionMarkerResolution(SeamUIMessages.DELETE_UNWRAP_ANNOTATION_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Unwrap", file, start, end)
+ };
+ else if(messageId == SeamCoreValidator.OBSERVER_DOESNT_BELONG_TO_COMPONENT_MESSAGE_ID)
+ return new IMarkerResolution[]{
+ new AddAnnotaionMarkerResolution(SeamUIMessages.ADD_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Name", file, start, end),
+ new DeleteAnnotaionMarkerResolution(SeamUIMessages.DELETE_OBSERVER_ANNOTATION_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Observer", file, start, end)
+ };
+
+ return new IMarkerResolution[]{};
}
public boolean hasResolutions(IMarker marker) {
try{
- if(isOurCase(marker) != null)
+ if(findResolutions(marker).length != 0)
return true;
}catch(CoreException ex){
SeamGuiPlugin.getPluginLog().logError(ex);
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2010-08-27 16:09:56 UTC (rev 24511)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2010-08-27 16:48:15 UTC (rev 24512)
@@ -189,3 +189,9 @@
FIND_USAGES_IN_EL = Find Usages in Expression Language
SEAM_COMPONENT_RENAME_HANDLER_ERROR = Error
DELETE_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE=Delete @Name annotation
+DELETE_REMOVE_ANNOTATION_MARKER_RESOLUTION_TITLE=Delete @Remove annotation
+DELETE_DESTROY_ANNOTATION_MARKER_RESOLUTION_TITLE=Delete @Destroy annotation
+DELETE_CREATE_ANNOTATION_MARKER_RESOLUTION_TITLE=Delete @Create annotation
+DELETE_UNWRAP_ANNOTATION_MARKER_RESOLUTION_TITLE=Delete @Unwrap annotation
+DELETE_OBSERVER_ANNOTATION_MARKER_RESOLUTION_TITLE=Delete @Oserver annotation
+ADD_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE=Add @Name annotation
14 years, 6 months
JBoss Tools SVN: r24511 - in trunk/usage: plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2010-08-27 12:09:56 -0400 (Fri, 27 Aug 2010)
New Revision: 24511
Modified:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java
Log:
[JBIDE-6881] request produce no hits any more, trying to fix
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java 2010-08-27 15:47:41 UTC (rev 24510)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java 2010-08-27 16:09:56 UTC (rev 24511)
@@ -158,9 +158,7 @@
.append("999.")
.append(googleParameters.getFirstVisit())
.append(IGoogleAnalyticsParameters.DOT)
- .append("1.1.")
- , IGoogleAnalyticsParameters.SEMICOLON
- , IGoogleAnalyticsParameters.PLUS_SIGN)
+ .append("1.1."))
.appendTo(builder);
// new GoogleAnalyticsCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_SESSION,
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java 2010-08-27 15:47:41 UTC (rev 24510)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java 2010-08-27 16:09:56 UTC (rev 24511)
@@ -44,11 +44,13 @@
private static final String HOST_NAME = ReportingMessages.UsageReport_HostName;
- private FocusPoint focusPoint = new FocusPoint("tools") //$NON-NLS-1$
- .setChild(new FocusPoint("usage") //$NON-NLS-1$
- .setChild(new FocusPoint("action") //$NON-NLS-1$
- .setChild(new FocusPoint("wsstartup")))); //$NON-NLS-1$
+// private FocusPoint focusPoint = new FocusPoint("tools") //$NON-NLS-1$
+// .setChild(new FocusPoint("usage") //$NON-NLS-1$
+// .setChild(new FocusPoint("action") //$NON-NLS-1$
+// .setChild(new FocusPoint("wsstartup")))); //$NON-NLS-1$
+ private FocusPoint focusPoint = new FocusPoint("pureTest"); //$NON-NLS-1$
+
private GlobalUsageReportingSettings globalSettings = new GlobalUsageReportingSettings(JBossToolsUsageActivator
.getDefault());
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java 2010-08-27 15:47:41 UTC (rev 24510)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java 2010-08-27 16:09:56 UTC (rev 24511)
@@ -61,14 +61,15 @@
@Test
public void differentUserIdOnDifferentEclipseInstance() throws Exception {
+ String focusPointName = "testDifferentUserIdOnDifferentEclipseInstance"
+ + System.currentTimeMillis();
UrlRevealingTracker tracker = getTracker(createEclipseEnvironment());
- tracker.trackSynchronously(createFocusPoint(""));
+ tracker.trackSynchronously(createFocusPoint(focusPointName));
String userId = getUserId(tracker.getTrackingUrl());
assertTrue(userId != null);
tracker = getTracker(createEclipseEnvironment());
- FocusPoint focusPoint = createFocusPoint("testDifferentUserIdOnDifferentEclipseInstance"
- + System.currentTimeMillis());
+ FocusPoint focusPoint = createFocusPoint(focusPointName);
tracker.trackSynchronously(focusPoint);
String newUserId = getUserId(tracker.getTrackingUrl());
@@ -76,6 +77,17 @@
assertTrue(!userId.equals(newUserId));
}
+ @Test
+ public void visitCountIncreases() throws Exception {
+ IGoogleAnalyticsParameters eclipseEnvironment = createEclipseEnvironment();
+ assertEquals(1, eclipseEnvironment.getVisitCount());
+ UrlRevealingTracker tracker = getTracker(eclipseEnvironment);
+ tracker.trackSynchronously(createFocusPoint("testVisitCount"));
+ assertEquals(2, eclipseEnvironment.getVisitCount());
+ tracker.trackSynchronously(createFocusPoint("testVisitCount"));
+ assertEquals(3, eclipseEnvironment.getVisitCount());
+ }
+
private String getUserId(String trackingUrl) {
Pattern pattern = Pattern.compile(".+" + IGoogleAnalyticsParameters.PARAM_COOKIES_UNIQUE_VISITOR_ID
+ "%3D([0-9]+\\.[0-9]+)\\..+");
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-08-27 15:47:41 UTC (rev 24510)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-08-27 16:09:56 UTC (rev 24511)
@@ -801,6 +801,70 @@
assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
}
+ /**
+ * this test should create a request from the same eclipse instance later in
+ * time (visit count increased, visit timestamps updated, userId identical)
+ */
+ @Test
+ public void testUrl_debug_utma() throws IOException {
+ String userAgent = "com.jboss.jbds.product/3.0.1 (Windows; U; Windows NT 6.1; en-US)";
+ TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
+ String url = "http://www.google-analytics.com/__utm.gif?"
+ + "utmwv=4.7.2"
+ + "&utmn=15176694"
+ + "&utmhn=jboss.org"
+ + "&utmcs=UTF-8"
+ + "&utmsr=1920x1080"
+ + "&utmsc=24-bit"
+ + "&utmul=en-us"
+ + "&utmdt=tools-usage-testUrl_utmaCookies_utmb_utmc_1"
+ + "&utmhid=1087431432"
+ + "&utmp=%2Ftools%2Fusage%2FtestUrl_utmaCookies_utmb_utmc_1"
+ + "&utmac=UA-17645367-1"
+ + "&utmcc="
+ + "__utma%3D999.5737734690471263281282924103927.1282924103925.1282924103925.1282924103925.1%3B%2B"
+ + "__utmb%3D1%3B%2B"
+ + "__utmc%3D1%3B%2B"
+ + "__utmz%3D156030500.1281430767.1.1."
+ + "utmcsr%3D(direct)%7C"
+ + "utmccn%3D(direct)%7C"
+ + "utmcmd%3D(none)%7C"
+ + "utmctr%3Dtest1%7Ctest2%7Ctest3%7Ctest4%7Ctest5%7Ctest6%7Ctest7%7Ctest8%7Ctest8%7Ctest9%7Ctest10%7Ctest11%7Ctest12%7Ctest13%7Ctest514%7Ctest14%7Ctest15%7Ctest16%7Ctest17%7Ctest18%7Ctest19%7Ctest20%7Ctest20%7Ctest21%7Ctest22%7Ctest23%7Ctest514%7Ctest24%7Ctest25%7Ctest26%7Ctest27%7Ctest28%7Ctest29%7Ctest30%7Ctest31%3B"
+ + "&gaq=1";
+ method.request(url);
+ assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+ }
+
+ @Test
+ public void testUrl_utma_utmz() throws IOException {
+ String userAgent = "com.jboss.jbds.product/3.0.1 (Windows; U; Windows NT 6.1; en-US)";
+ TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
+ String url = "http://www.google-analytics.com/__utm.gif?"
+ + "utmwv=4.7.2"
+ + "&utmn=15176694"
+ + "&utmhn=jboss.org"
+ + "&utmcs=UTF-8"
+ + "&utmsr=1920x1080"
+ + "&utmsc=24-bit"
+ + "&utmul=en-us"
+ + "&utmdt=tools-usage-testUrl_utmaCookies_utmb_utmc_1"
+ + "&utmhid=1087431432"
+ + "&utmp=%2Ftools%2Fusage%2FtestUrl_utmaCookies_utmb_utmc_1"
+ + "&utmac=UA-17645367-1"
+ + "&utmcc="
+ + "__utma%3D999.5737734690471263281282924103927.1282924103925.1282924103925.1282924103925.1%3B%2B"
+ + "__utmb%3D1%3B%2B"
+ + "__utmc%3D1%3B%2B"
+ + "__utmz%3D999.1282924103925.1.1."
+ + "utmcsr%3D(direct)%7C"
+ + "utmccn%3D(direct)%7C"
+ + "utmcmd%3D(none)%7C"
+ + "utmctr%3Dtest1%7Ctest2%7Ctest3%7Ctest4%7Ctest5%7Ctest6%7Ctest7%7Ctest8%7Ctest8%7Ctest9%7Ctest10%7Ctest11%7Ctest12%7Ctest13%7Ctest514%7Ctest14%7Ctest15%7Ctest16%7Ctest17%7Ctest18%7Ctest19%7Ctest20%7Ctest20%7Ctest21%7Ctest22%7Ctest23%7Ctest514%7Ctest24%7Ctest25%7Ctest26%7Ctest27%7Ctest28%7Ctest29%7Ctest30%7Ctest31%3B"
+ + "&gaq=1";
+ method.request(url);
+ assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+ }
+
protected class TestHttpGetMethod extends HttpGetRequest {
private HttpURLConnection urlConnection;
14 years, 6 months
JBoss Tools SVN: r24510 - trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2010-08-27 11:47:41 -0400 (Fri, 27 Aug 2010)
New Revision: 24510
Modified:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java
Log:
[JBIDE-6880] progress monitor set
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java 2010-08-27 15:45:50 UTC (rev 24509)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java 2010-08-27 15:47:41 UTC (rev 24510)
@@ -108,11 +108,12 @@
if (monitor.isCanceled()) {
return Status.CANCEL_STATUS;
}
+ monitor.beginTask(ReportingMessages.UsageReport_Querying_Enablement, 2);
if (globalSettings.isEnabled()) {
- monitor.beginTask(ReportingMessages.UsageReport_Querying_Enablement, 2);
if (monitor.isCanceled()) {
return Status.CANCEL_STATUS;
}
+ monitor.worked(1);
if (UsageReportPreferences.isAskUser()) {
askUserAndReport();
if (monitor.isCanceled()) {
@@ -121,6 +122,7 @@
} else {
doReport();
}
+ monitor.worked(2);
monitor.done();
}
return Status.OK_STATUS;
14 years, 6 months
JBoss Tools SVN: r24509 - trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2010-08-27 11:45:50 -0400 (Fri, 27 Aug 2010)
New Revision: 24509
Modified:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/ReportingMessages.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/messages.properties
Log:
[JBIDE-6880] Strings externalized, messages corrected
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/ReportingMessages.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/ReportingMessages.java 2010-08-27 15:11:03 UTC (rev 24508)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/ReportingMessages.java 2010-08-27 15:45:50 UTC (rev 24509)
@@ -16,6 +16,9 @@
private static final String BUNDLE_NAME = "org.jboss.tools.usage.reporting.messages"; //$NON-NLS-1$
public static String EclipseEnvironment_Error_SavePreferences;
+ public static String UsageReport_Reporting_Usage;
+ public static String UsageReport_Querying_Enablement;
+ public static String UsageReport_Asking_User;
public static String UsageReport_Checkbox_Text;
public static String UsageReport_DialogMessage;
public static String UsageReport_DialogTitle;
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java 2010-08-27 15:11:03 UTC (rev 24508)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java 2010-08-27 15:45:50 UTC (rev 24509)
@@ -100,7 +100,7 @@
private class ReportingJob extends Job {
private ReportingJob() {
- super("Reporting eclipse usage");
+ super(ReportingMessages.UsageReport_Reporting_Usage);
}
@Override
@@ -109,7 +109,7 @@
return Status.CANCEL_STATUS;
}
if (globalSettings.isEnabled()) {
- monitor.beginTask("querying whether reporting is globally enabled", 2);
+ monitor.beginTask(ReportingMessages.UsageReport_Querying_Enablement, 2);
if (monitor.isCanceled()) {
return Status.CANCEL_STATUS;
}
@@ -162,7 +162,7 @@
private class AskUserJob extends UIJob {
private AskUserJob() {
- super("Asking User to allow reporting");
+ super(ReportingMessages.UsageReport_Asking_User);
}
@Override
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/messages.properties
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/messages.properties 2010-08-27 15:11:03 UTC (rev 24508)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/messages.properties 2010-08-27 15:45:50 UTC (rev 24509)
@@ -1,4 +1,7 @@
EclipseEnvironment_Error_SavePreferences=Could not sage {0} to preferences.
+UsageReport_Reporting_Usage=Reporting JBoss Tools / JBoss Developer Studio usage
+UsageReport_Querying_Enablement=Querying whether reporting is globally enabled
+UsageReport_Asking_User=Asking User to allow reporting
UsageReport_Checkbox_Text=Report usage anonymously to Red Hat Inc.
UsageReport_DialogMessage=Please allow Red Hat Inc. to report this installation anynomously for statistical matters.
UsageReport_DialogTitle=Report usage
14 years, 6 months
JBoss Tools SVN: r24508 - trunk/documentation/whatsnew/teiid.
by jbosstools-commits@lists.jboss.org
Author: blafond
Date: 2010-08-27 11:11:03 -0400 (Fri, 27 Aug 2010)
New Revision: 24508
Modified:
trunk/documentation/whatsnew/teiid/teiid-news-7.1.0.M2.html
Log:
JBIDE-6916 Applied suggested edits from feedback on draft.
Modified: trunk/documentation/whatsnew/teiid/teiid-news-7.1.0.M2.html
===================================================================
--- trunk/documentation/whatsnew/teiid/teiid-news-7.1.0.M2.html 2010-08-27 15:06:56 UTC (rev 24507)
+++ trunk/documentation/whatsnew/teiid/teiid-news-7.1.0.M2.html 2010-08-27 15:11:03 UTC (rev 24508)
@@ -12,7 +12,8 @@
<h1>Teiid Designer 7.1.0 M2 What's New</h1>
<p>Last revised August 26, 2010</p>
<p><b>Teiid Designer</b>, which is new to JBoss Tools,
-is a visual tool that enables rapid, model-driven definition, integration, management and testing of data services without programming using the <b>Teiid</b> runtime framework.</p>
+is a graphical data modeling tool that enables rapid definition, integration, management and testing of data services without
+programming using the <b>Teiid</b> runtime engine.</p>
<p>Below is simple introduction to the tool and a summary of a few basic concepts.</p>
<p>For more details on <a href="http://www.jboss.org/teiid.html">Teiid</a> and <a href="http://www.jboss.org/teiiddesigner.html">Teiid Designer</a> visit: <a href="http://www.teiid.org">http://www.teiid.org</a></p>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
@@ -26,20 +27,15 @@
<td valign="top" align="left">
<p><b>Designer "modeling" Perspective</b></p></td>
<td valign="top">
- <p>The Teiid Designer perspective provides a modeling-centric
- explorer designed to aid in creating/editing and managing models (XMI/EMF-based) and
- Virtual Databases (VDBs). When deployed to Teiid server, these VDB's are treated like
+ <p>The Teiid Designer perspective provides a model
+ explorer for creating, editing and managing models (XMI/EMF-based) and
+ Virtual Databases (VDBs). When deployed to Teiid server, these VDBs can be accessed like
any other JDBC data source and queried.</p>
<p><img src="images/designer-perspective.png" alt="Teiid Designer Perspective"/></p>
- <p>If you've been following Teiid Designer since 7.0 development you'll know that the 7.1 version
- reflects major changes to both Preview Data functionality and VDB editing and VDB execution. These features
- are now tied to standard application deployment technology through the Teiid Admin API.
- In Designer, the Teiid view is a window to view the contents of deployed Teiid artifacts, namely Data Sources and
- Virtual Databases (VDB's).</p>
<p>A <strong>model</strong> is a representation of a set of information constructs.
- A familiar <strong>model</strong> is the <strong>relational</strong> <strong>model</strong>, which
+ A familiar model type is the <strong>relational</strong> <strong>model</strong>, which
defines tables composed of columns and containing records of data. Another
- familiar model is the <strong>XML</strong> <strong>model</strong>, which defines hierarchical data sets. </p>
+ familiar model type is the <strong>XML</strong> <strong>model</strong>, which defines hierarchical data sets. </p>
<p>In <strong>Teiid Designer</strong>, models are used to define the entities, and relationships between those
entities, required to fully define the integration of information sets so that they may be accessed in a uniform manner,
using a single API and access protocol. The file extension used for these models is '<strong>.xmi</strong>'
@@ -50,7 +46,7 @@
characteristics of the information contained in data sources. These are referred to
as <strong><EM>source</EM></strong> models<span class="medium"></span>.
Teiid uses the information in <strong>source</strong> models to federate the information
- in multiple sources, so that from a user's viewpoint these all appear to be in a single source.</p>
+ from multiple sources, so that from a user's viewpoint these all appear to be in a single source.</p>
<p>In addition to <strong>source</strong> models, Teiid Designer provides the ability to
define a variety of <em><strong>view</strong></em> models<span class="medium"></span>. These can be used to define
a layer of abstraction above the physical (or <strong>source</strong>) layer, so that information can
@@ -62,11 +58,12 @@
<li><strong>XML</strong></li>
<li><strong>XML Service</strong></li>
<li><strong>Web services</strong></li>
- <li><strong>Relationship </strong></li>
- <li><strong>Extension</strong></li>
- <li><strong>Function </strong></li>
<li><strong>Uml 2.0 </strong></li>
</ul>
+ <p>In Teiid Designer 7.1 you can Preview Data through the models you've created and execute queries against VDBs created
+ in your workspace. These features are enabled by deployment of VDB artifacts to an instance of Teiid running in an
+ application server. In Designer, the Teiid view is a window which displays the contents of your deployed Teiid artifacts,
+ namely Data Sources and Virtual Databases (VDBs).</p>
</td>
</tr>
<tr><td colspan="2"><hr /></td></tr>
@@ -76,16 +73,13 @@
<td valign="top">
<p>A <strong>VDB</strong>, or <strong>Virtual Database</strong> is a container for your models and pertinent source connection data used by
Teiid query engine to access your federated data.</p>
- <p>Teiid Designer allows you to create and edit VDBs. The VDB is a zip-like file that contains sources
- and view models, source connection information and index files used at runtime for data identification
+ <p>Teiid Designer allows you to create and edit VDBs. The VDB is a zip archive file that contains sources
+ and view models, source connection properties, index files used at runtime for data identification,
and a manifest to pull it all together. </p>
- <p>VDBs contain two primary varieties of model types - source and view. Source models represent the structure
- and characteristics of physical data sources, whereas view models represent the structure and characteristics
- of abstract structures you want to expose to your applications.</p>
<p>Each source model must contain connectivity information in order for the <strong>Teiid</strong> engine understand which
connection factory/data source instance to connect with. In particular, a "<strong>Translator</strong>" name and an existing
"<strong>JNDI</strong>" name must be defined.</p>
- <p>After a VDB is defined, it must be deployed to the <strong>Teiid</strong> query engine to be accessed. You can select a
+ <p>After a VDB is defined, it must be deployed to the <strong>Teiid</strong> instance to be accessed. You can select a
VDB in your Model Explorer and right-click select "<strong>Modeling > Deploy VDB</strong>" action or drag the VDB onto an
existing server connected in your <strong>Teiid</strong> view. </p>
</td>
@@ -96,9 +90,10 @@
<td valign="top" align="left">
<p><b>Teiid as JDBC Data Source</b></p></td>
<td valign="top">
- <p><strong>Teiid Designer 7.1</strong> offers a JDBC Connection Profile contribution through the DTP extension point. The properties for
+ <p><strong>Teiid Designer 7.1</strong> provides access to the VDBs deployed to Teiid via a JDBC Connection Profile in the
+ Eclipse Database Development perspective. The properties for
this connection include standard JDBC inputs including URL, host, port, user-name and password.</p>
- <p>Through this connection, you can perform standard SQL queries. The nature of Teiid VDB's allows complex, multi-source
+ <p>Through this connection, you can perform standard SQL queries on VDBs. The nature of the Teiid Virtual Database allows complex, multi-source
modeling and data transformation, so you can design views targeted for your front-end applications and simplify or reduce
the work necessary to pull all that data together.</p>
</td>
14 years, 6 months