JBoss Tools SVN: r29274 - in branches/jbosstools-3.2.x/as/plugins: org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-02-22 16:55:30 -0500 (Tue, 22 Feb 2011)
New Revision: 29274
Modified:
branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java
branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java
branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedJSTPublisher.java
Log:
JBIDE-8450 to branch
Modified: branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java
===================================================================
--- branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java 2011-02-22 21:52:56 UTC (rev 29273)
+++ branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java 2011-02-22 21:55:30 UTC (rev 29274)
@@ -24,6 +24,7 @@
import org.eclipse.core.runtime.MultiStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Status;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.internal.Server;
@@ -34,6 +35,7 @@
import org.jboss.ide.eclipse.archives.core.util.internal.TrueZipUtil;
import org.jboss.ide.eclipse.archives.webtools.IntegrationPlugin;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
+import org.jboss.ide.eclipse.as.core.Messages;
import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes;
import org.jboss.ide.eclipse.as.core.publishers.PublishUtil;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
@@ -52,6 +54,9 @@
public IStatus publishModule(IServer server, String deployRoot, IModule[] module,
int publishType, IModuleResourceDelta[] delta,
IProgressMonitor monitor) throws CoreException {
+ String name = "Compressing " + module[0].getName(); //$NON-NLS-1$
+ monitor.beginTask(name, 200);
+ monitor.setTaskName(name);
this.deployRoot = deployRoot;
IStatus[] returnStatus;
@@ -87,16 +92,20 @@
}
TrueZipUtil.umount();
- IStatus finalStatus;
+ IStatus finalStatus = null;
if( returnStatus.length > 0 ) {
MultiStatus ms = new MultiStatus(JBossServerCorePlugin.PLUGIN_ID, IEventCodes.JST_PUB_INC_FAIL,
"Publish Failed for module " + module[0].getName(), null); //$NON-NLS-1$
for( int i = 0; i < returnStatus.length; i++ )
ms.add(returnStatus[i]);
finalStatus = ms;
- } else
- finalStatus = Status.OK_STATUS;
+ } else {
+ finalStatus = new Status(IStatus.OK, JBossServerCorePlugin.PLUGIN_ID,
+ IEventCodes.JST_PUB_FULL_SUCCESS,
+ NLS.bind(Messages.ModulePublished, module[0].getName()), null);
+ }
+ monitor.done();
return finalStatus;
}
Modified: branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java
===================================================================
--- branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java 2011-02-22 21:52:56 UTC (rev 29273)
+++ branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java 2011-02-22 21:55:30 UTC (rev 29274)
@@ -15,7 +15,6 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
import org.eclipse.wst.common.componentcore.ModuleCoreNature;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
@@ -62,12 +61,14 @@
IProgressMonitor monitor) throws CoreException {
// Build all parts together at once.
// When a call for [ear, childWar] comes in, ignore it.
- if( module.length > 1 ) {
- return Status.OK_STATUS;
- }
+ if( module.length > 1 )
+ return null;
+
IDeployableServer ds = ServerConverter.getDeployableServer(server);
String deployRoot = getDeployRoot(module, ds);
LocalZippedPublisherUtil util = new LocalZippedPublisherUtil();
- return util.publishModule(server, deployRoot, module, publishType, delta, monitor);
+ IStatus s = util.publishModule(server, deployRoot, module, publishType, delta, monitor);
+ monitor.done();
+ return s;
}
}
Modified: branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedJSTPublisher.java
===================================================================
--- branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedJSTPublisher.java 2011-02-22 21:52:56 UTC (rev 29273)
+++ branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedJSTPublisher.java 2011-02-22 21:55:30 UTC (rev 29274)
@@ -12,20 +12,28 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.rse.core.archives;
+import java.util.ArrayList;
+
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.MultiStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Status;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
import org.eclipse.rse.services.files.IFileService;
import org.eclipse.rse.subsystems.files.core.servicesubsystem.IFileServiceSubSystem;
+import org.eclipse.wst.common.project.facet.core.util.internal.ProgressMonitorUtil;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.model.IModuleResourceDelta;
import org.jboss.ide.eclipse.archives.webtools.modules.WTPZippedPublisher;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
+import org.jboss.ide.eclipse.as.core.Messages;
+import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes;
+import org.jboss.ide.eclipse.as.core.publishers.AbstractServerToolsPublisher;
import org.jboss.ide.eclipse.as.core.publishers.PublishUtil;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
@@ -62,12 +70,24 @@
int publishType, IModuleResourceDelta[] delta,
IProgressMonitor monitor) throws CoreException {
- if( module.length > 1 )
- return Status.OK_STATUS;
+ String taskName = "Publishing " + module[0].getName();
+ monitor.beginTask(taskName, 200); //$NON-NLS-1$
+ monitor.setTaskName(taskName);
+ if( module.length > 1 ) {
+ monitor.done();
+ return null;
+ }
// Locally zip it up into the remote tmp folder
- IStatus sup = super.publishModule(method, server, module, publishType, delta, monitor);
+ IStatus sup = super.publishModule(method, server, module, publishType, delta,
+ AbstractServerToolsPublisher.getSubMon(monitor, 50));
+ if( !sup.isOK() ) {
+ monitor.done();
+ return sup;
+ }
+ monitor.setTaskName("Publishing to remote server (dummy)");
+
// set up needed vars
IDeployableServer server2 = ServerConverter.getDeployableServer(server);
String remoteTempDeployRoot = getDeployRoot(module, ServerConverter.getDeployableServer(server));
@@ -81,14 +101,28 @@
// Now transfer the file to RSE
IFileService fs = method2.getFileService();
IFileServiceSubSystem system = method2.getFileServiceSubSystem();
+ ArrayList<IStatus> results = new ArrayList<IStatus>();
+ if( !sup.isOK())
+ results.add(sup);
+
try {
- method2.getFileService().upload(sourcePath.toFile(), destFolder.toString(), name, true, null, null, new NullProgressMonitor());
- //method2.getFileService().move(tempDestFolder.toString(), name, destFolder.toString(), name, new NullProgressMonitor());
+ method2.getFileService().upload(sourcePath.toFile(), destFolder.toString(), name, true, null, null,
+ AbstractServerToolsPublisher.getSubMon(monitor, 150));
} catch( SystemMessageException sme ) {
- // TODO fix or return error
- sme.printStackTrace();
+ IStatus s = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, sme.getMessage(), sme);
+ results.add(s);
}
+ monitor.done();
+ if( results != null && results.size() > 0 ) {
+ MultiStatus ms = new MultiStatus(JBossServerCorePlugin.PLUGIN_ID, IEventCodes.JST_PUB_INC_FAIL,
+ NLS.bind(Messages.IncrementalPublishFail, module[0].getName()), null);
+ IStatus[] results2 = results.toArray(new IStatus[results.size()]);
+ for( int i = 0; i < results.size(); i++ )
+ ms.add(results2[i]);
+ return ms;
+ }
+
return sup;
}
}
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r29273 - branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-02-22 16:52:56 -0500 (Tue, 22 Feb 2011)
New Revision: 29273
Modified:
branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedJSTPublisher.java
Log:
JBIDE-8388 to branch
Modified: branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedJSTPublisher.java
===================================================================
--- branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedJSTPublisher.java 2011-02-22 21:40:25 UTC (rev 29272)
+++ branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedJSTPublisher.java 2011-02-22 21:52:56 UTC (rev 29273)
@@ -17,7 +17,10 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
+import org.eclipse.rse.services.files.IFileService;
+import org.eclipse.rse.subsystems.files.core.servicesubsystem.IFileServiceSubSystem;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.model.IModuleResourceDelta;
@@ -59,6 +62,9 @@
int publishType, IModuleResourceDelta[] delta,
IProgressMonitor monitor) throws CoreException {
+ if( module.length > 1 )
+ return Status.OK_STATUS;
+
// Locally zip it up into the remote tmp folder
IStatus sup = super.publishModule(method, server, module, publishType, delta, monitor);
@@ -73,6 +79,8 @@
String name = sourcePath.lastSegment();
// Now transfer the file to RSE
+ IFileService fs = method2.getFileService();
+ IFileServiceSubSystem system = method2.getFileServiceSubSystem();
try {
method2.getFileService().upload(sourcePath.toFile(), destFolder.toString(), name, true, null, null, new NullProgressMonitor());
//method2.getFileService().move(tempDestFolder.toString(), name, destFolder.toString(), name, new NullProgressMonitor());
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r29272 - branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-02-22 16:40:25 -0500 (Tue, 22 Feb 2011)
New Revision: 29272
Modified:
branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java
Log:
JBIDE-8468 to branch
Modified: branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java
===================================================================
--- branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java 2011-02-22 20:47:23 UTC (rev 29271)
+++ branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java 2011-02-22 21:40:25 UTC (rev 29272)
@@ -115,7 +115,7 @@
args += c.SHUTDOWN_SERVER_ARG + c.SPACE + serverUrl + c.SPACE;
if( jbs.getUsername() != null && !jbs.getUsername().equals("")) //$NON-NLS-1$
args += c.SHUTDOWN_USER_ARG + c.SPACE + jbs.getUsername() + c.SPACE;
- if( jbs.getPassword() != null && !jbs.getUsername().equals("")) //$NON-NLS-1$
+ if( jbs.getPassword() != null && !jbs.getPassword().equals("")) //$NON-NLS-1$
args += c.SHUTDOWN_PASS_ARG + c.SPACE + jbs.getPassword() + c.SPACE;
return args;
}
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r29271 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-02-22 15:47:23 -0500 (Tue, 22 Feb 2011)
New Revision: 29271
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEHostShellModel.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java
Log:
JBIDE-8468 to trunk
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java 2011-02-22 20:40:48 UTC (rev 29270)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java 2011-02-22 20:47:23 UTC (rev 29271)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010 Red Hat, Inc.
+ * Copyright (c) 2011 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,
@@ -12,9 +12,13 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.rse.core;
+import org.jboss.ide.eclipse.as.core.Messages;
+import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
import org.jboss.ide.eclipse.as.core.server.internal.AbstractJBossBehaviourDelegate;
+import org.jboss.ide.eclipse.as.core.server.internal.PollThread;
public class RSEBehaviourDelegate extends AbstractJBossBehaviourDelegate {
+ private PollThread pollThread = null;
public String getBehaviourTypeId() {
return RSEPublishMethod.RSE_ID;
}
@@ -27,4 +31,22 @@
}
RSELaunchDelegate.launchStopServerCommand(getActualBehavior());
}
+
+ public void serverStarting() {
+ pollServer(IServerStatePoller.SERVER_UP);
+ }
+
+ public void serverStopping() {
+ getActualBehavior().setServerStopping();
+ pollServer(IServerStatePoller.SERVER_DOWN);
+ }
+
+ protected void pollServer(final boolean expectedState) {
+ if( this.pollThread != null ) {
+ pollThread.cancel();
+ }
+ this.pollThread = new PollThread(Messages.ServerPollerThreadName, expectedState, getActualBehavior());
+ pollThread.start();
+ }
+
}
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEHostShellModel.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEHostShellModel.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEHostShellModel.java 2011-02-22 20:47:23 UTC (rev 29271)
@@ -0,0 +1,177 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.ide.eclipse.as.rse.core;
+
+import java.util.HashMap;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.rse.core.RSECorePlugin;
+import org.eclipse.rse.core.model.IHost;
+import org.eclipse.rse.core.subsystems.ISubSystem;
+import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
+import org.eclipse.rse.services.shells.IHostShell;
+import org.eclipse.rse.services.shells.IShellService;
+import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.IShellServiceSubSystem;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.ServerCore;
+import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger;
+import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
+import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior;
+import org.jboss.ide.eclipse.as.core.util.ServerConverter;
+import org.jboss.ide.eclipse.as.rse.core.xpl.ConnectAllSubsystemsUtil;
+
+public class RSEHostShellModel {
+
+ private static RSEHostShellModel instance;
+ public static RSEHostShellModel getInstance() {
+ if( instance == null )
+ instance = new RSEHostShellModel();
+ return instance;
+ }
+
+
+ private HashMap<String, ServerShellModel> map =
+ new HashMap<String, ServerShellModel>();
+ RSEHostShellModel() {
+
+ }
+
+ public ServerShellModel getModel(IServer server) {
+ if( map.get(server.getId()) == null ) {
+ map.put(server.getId(), new ServerShellModel(server.getId()));
+ }
+ return map.get(server.getId());
+ }
+
+ public static class ServerShellModel {
+ private String serverId;
+ private IHostShell startupShell;
+ private IHostShell singleUseShell;
+ public ServerShellModel(String id) {
+ this.serverId = id;
+ }
+ public IHostShell getStartupShell() {
+ return startupShell;
+ }
+ public void resetStartupShell() {
+ if( startupShell != null && startupShell.isActive()) {
+ startupShell.exit();
+ startupShell = null;
+ }
+ }
+ public IHostShell createStartupShell(
+ String initialWorkingDirectory, String command,
+ String[] environment, IProgressMonitor monitor)
+ throws CoreException, SystemMessageException {
+ resetStartupShell();
+ IServer s = ServerCore.findServer(serverId);
+ IShellService service = findShellService(s);
+ try {
+ IHostShell hs = service.runCommand(initialWorkingDirectory,
+ command, environment, monitor);
+ startupShell = hs;
+ return hs;
+ } catch(RuntimeException re) {
+ throw new CoreException(new Status(IStatus.ERROR, org.jboss.ide.eclipse.as.rse.core.RSECorePlugin.PLUGIN_ID,
+ re.getMessage(), re));
+ }
+ }
+
+ public void executeRemoteCommand(
+ String initialWorkingDirectory, String command,
+ String[] environment, IProgressMonitor monitor)
+ throws CoreException {
+ IServer s = ServerCore.findServer(serverId);
+ IShellService service = findShellService(s);
+ try {
+ if( singleUseShell == null || !singleUseShell.isActive()) {
+ singleUseShell = service.launchShell(initialWorkingDirectory, environment, monitor);
+ } else {
+ singleUseShell.writeToShell("cd " + initialWorkingDirectory);
+ }
+ singleUseShell.writeToShell(command);
+ } catch(RuntimeException re) {
+ String className = service.getClass().getName();
+ if(className.endsWith(".DStoreShellService")) {
+ throw new CoreException(new Status(IStatus.ERROR, org.jboss.ide.eclipse.as.rse.core.RSECorePlugin.PLUGIN_ID,
+ "no remote daemon installed. Please install a remote daemon or use an RSE server configured for ssh rather than dstore"));
+ }
+ } catch( SystemMessageException sme) {
+ Status s2 = new Status(IStatus.ERROR, org.jboss.ide.eclipse.as.rse.core.RSECorePlugin.PLUGIN_ID, sme.getMessage(), sme);
+ throw new CoreException(s2);
+ }
+ }
+
+ public void executeRemoteCommand(
+ String initialWorkingDirectory, String command,
+ String[] environment, IProgressMonitor monitor,
+ int delay, boolean exit)
+ throws CoreException {
+ executeRemoteCommand(initialWorkingDirectory, command, environment, monitor);
+ delay(delay);
+ if( exit ) {
+ singleUseShell.exit();
+ singleUseShell = null;
+ }
+ }
+
+ }
+
+ public static void delay(int delay /* in ms */) {
+ int x = 0;
+ while( x < delay) {
+ x+=200;
+ try {
+ Thread.sleep(200);
+ } catch(InterruptedException ie) {
+ }
+ }
+ }
+
+ private static DeployableServerBehavior getBehaviour(String serverId) {
+ IServer s = ServerCore.findServer(serverId);
+ return s == null ? null : ServerConverter.getDeployableServerBehavior(s);
+ }
+
+ public static IShellService findShellService(JBossServerBehavior behaviour) throws CoreException {
+ return findShellService(behaviour.getServer());
+ }
+
+ public static IShellService findShellService(IServer server) throws CoreException {
+ RSEUtils.waitForFullInit();
+ if( server != null ) {
+ String connectionName = RSEUtils.getRSEConnectionName(server);
+ IHost host = RSEUtils.findHost(connectionName);
+ if( host == null ) {
+ throw new CoreException(new Status(IStatus.ERROR, org.jboss.ide.eclipse.as.rse.core.RSECorePlugin.PLUGIN_ID,
+ "Host not found. Host may have been deleted or RSE model may not be completely loaded"));
+ }
+
+ // ensure connections
+ new ConnectAllSubsystemsUtil(host).run(new NullProgressMonitor());
+
+ ISubSystem[] systems = RSECorePlugin.getTheSystemRegistry().getSubSystems(host);
+ for( int i = 0; i < systems.length; i++ ) {
+ if( systems[i] instanceof IShellServiceSubSystem) {
+ IShellService service = ((IShellServiceSubSystem)systems[i]).getShellService();
+ return service;
+ }
+ }
+ }
+ throw new CoreException(new Status(IStatus.ERROR, org.jboss.ide.eclipse.as.rse.core.RSECorePlugin.PLUGIN_ID,
+ "No Shell Service Found"));
+ }
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java 2011-02-22 20:40:48 UTC (rev 29270)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java 2011-02-22 20:47:23 UTC (rev 29271)
@@ -23,30 +23,28 @@
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
import org.eclipse.rse.services.shells.IHostOutput;
import org.eclipse.rse.services.shells.IHostShell;
import org.eclipse.rse.services.shells.IHostShellChangeEvent;
import org.eclipse.rse.services.shells.IHostShellOutputListener;
-import org.eclipse.rse.services.shells.IShellService;
-import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.IShellServiceSubSystem;
import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger;
import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller;
+import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.launch.AbstractJBossLaunchConfigType;
import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration;
-import org.jboss.ide.eclipse.as.core.server.internal.launch.StopLaunchConfiguration;
import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration.IStartLaunchSetupParticipant;
import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration.StartLaunchDelegate;
import org.jboss.ide.eclipse.as.core.server.internal.launch.LocalJBossServerStartupLaunchUtil;
+import org.jboss.ide.eclipse.as.core.server.internal.launch.StopLaunchConfiguration;
import org.jboss.ide.eclipse.as.core.util.ArgsUtil;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
-import org.jboss.ide.eclipse.as.rse.core.xpl.ConnectAllSubsystemsUtil;
+import org.jboss.ide.eclipse.as.rse.core.RSEHostShellModel.ServerShellModel;
public class RSELaunchDelegate implements StartLaunchDelegate, IStartLaunchSetupParticipant {
@@ -63,83 +61,47 @@
JBossServerBehavior beh = LocalJBossServerStartupLaunchUtil.getServerBehavior(configuration);
beh.setServerStarting();
String command = configuration.getAttribute(RSE_STARTUP_COMMAND, (String)null);
- IShellService service = null;
try {
- service = findShellService(beh);
- } catch(CoreException ce) {
- beh.setServerStopped();
- throw ce;
- }
- IHostShell hs = null;
+ ServerShellModel model = RSEHostShellModel.getInstance().getModel(beh.getServer());
+ IHostShell shell = model.createStartupShell("/", command, new String[]{}, new NullProgressMonitor());
+ addShellOutputListener(shell);
+ launchPingThread(beh);
+ } catch(SystemMessageException sme) {
+ beh.setServerStopped(); // Not sure when this comes, but we should try to keep track
+ throw new CoreException(new Status(IStatus.ERROR, org.jboss.ide.eclipse.as.rse.core.RSECorePlugin.PLUGIN_ID,
+ sme.getMessage(), sme));
+ }
+ }
+
+ private void launchPingThread(DeployableServerBehavior beh) {
+ // TODO do it properly here
+ RSEHostShellModel.delay(30000);
+ beh.setServerStarted();
+ }
+
+
+ // Only for debugging
+ private void addShellOutputListener(IHostShell shell) {
IHostShellOutputListener listener = null;
listener = new IHostShellOutputListener(){
public void shellOutputChanged(IHostShellChangeEvent event) {
IHostOutput[] out = event.getLines();
for(int i = 0; i < out.length; i++ ) {
// TODO listen here for obvious exceptions or failures
- System.out.println(out[i]);
+ // System.out.println(out[i]);
}
}
};
-
- try {
- hs = service.runCommand("/", command, new String[]{}, new NullProgressMonitor());
- hs.addOutputListener(listener);
- delay(30);
-
- // Now launch ping thread
- } catch(SystemMessageException sme) {
- sme.printStackTrace();
- } catch(RuntimeException re) {
- String className = service.getClass().getName();
- if(re instanceof NullPointerException && className.endsWith(".DStoreShellService")) {
- beh.setServerStopped();
- throw new CoreException(new Status(IStatus.ERROR, org.jboss.ide.eclipse.as.rse.core.RSECorePlugin.PLUGIN_ID,
- "no remote daemon installed. Please install a remote daemon or use an RSE server configured for ssh rather than dstore"));
- }
- }
-
- // Exiting the shell cancels the process. PROBLEM!!!
-// if( hs != null ) {
-// hs.exit();
-// }
- beh.setServerStarted();
+ //shell.addOutputListener(listener);
}
-
- private static void delay(int delay) {
- int x = 1;
- while( x < (delay)) {
- x+=1;
- try {
- Thread.sleep(1000);
- } catch(InterruptedException ie) {
- }
- }
- }
-
public static void launchCommandNoResult(JBossServerBehavior behaviour, int delay, String command) {
- IShellService service = null;
try {
- service = findShellService(behaviour);
- service.initService(new NullProgressMonitor());
- } catch(Exception ce) {
- // TODO log and return
- return;
+ ServerShellModel model = RSEHostShellModel.getInstance().getModel(behaviour.getServer());
+ model.executeRemoteCommand("/", command, new String[]{}, new NullProgressMonitor(), delay, true);
+ } catch( CoreException ce ) {
+ ServerLogger.getDefault().log(behaviour.getServer(), ce.getStatus());
}
- try {
- final IHostShell hs = service.runCommand("/", command, new String[]{}, new NullProgressMonitor());
- if( hs != null ) {
- delay(delay/1000);
- hs.exit();
- }
- } catch( SystemMessageException sme) {
- // TODO
- sme.printStackTrace();
- } catch( RuntimeException re ) {
- // TODO
- re.printStackTrace();
- }
}
public static void launchStopServerCommand(JBossServerBehavior behaviour) {
@@ -147,72 +109,19 @@
String command2 = "";
try {
config = behaviour.getServer().getLaunchConfiguration(false, new NullProgressMonitor());
- String rseHome = behaviour.getServer().getAttribute(RSEUtils.RSE_SERVER_HOME_DIR, (String)null);
- if( rseHome == null ) {
- RSECorePlugin.getDefault().getLog().log(
- new Status(IStatus.ERROR, RSECorePlugin.PLUGIN_ID,
- "Remote Server Home not set."));
- return;
- }
- String defaultCmd = getDefaultStopCommand(behaviour.getServer());
+ String defaultCmd = getDefaultStopCommand(behaviour.getServer(), true);
command2 = config == null ? defaultCmd :
config.getAttribute(RSE_SHUTDOWN_COMMAND, defaultCmd);
+ behaviour.setServerStopping();
+ ServerShellModel model = RSEHostShellModel.getInstance().getModel(behaviour.getServer());
+ model.executeRemoteCommand("/", command2, new String[]{}, new NullProgressMonitor(), 10000, true);
+ if( model.getStartupShell() != null && model.getStartupShell().isActive())
+ model.getStartupShell().writeToShell("exit");
+ behaviour.setServerStopped();
} catch(CoreException ce) {
+ behaviour.setServerStarted();
+ ServerLogger.getDefault().log(behaviour.getServer(), ce.getStatus());
}
-
- behaviour.setServerStopping();
- final JBossServerBehavior behaviour2 = behaviour;
- final String command = command2;
- IShellService service = null;
- try {
- service = findShellService(behaviour);
- } catch(CoreException ce) {
- // TODO log and return
- return;
- }
-
- final boolean[] saving = new boolean[1];
- saving[0] = false;
- final String[] output = new String[1];
- output[0] = null;
- try {
- final IHostShell hs = service.runCommand("/", command, new String[]{}, new NullProgressMonitor());
- hs.addOutputListener(new IHostShellOutputListener(){
- public void shellOutputChanged(IHostShellChangeEvent event) {
- IHostOutput[] out = event.getLines();
- for(int i = 0; i < out.length; i++ ) {
- if( saving[0] ) {
- output[0] = out[i].getString();
- saving[0] = false;
- delay(10);
- behaviour2.setServerStopped();
- hs.exit();
- return;
- }
- /*
- * This is an extreme hack, because for some reason,
- * when the command line comes back, there's an extra space
- * "shutdown .sh"
- */
- System.out.println(out[i]);
- String outNoSpace = out[i].getString().replaceAll(" ", "");
- String commandNoSpace = command.replaceAll(" ", "");
- boolean contains = outNoSpace.contains(commandNoSpace);
- if(!saving[0] && contains)
- saving[0] = true;
- }
- }
- });
-
- } catch( SystemMessageException sme) {
- // TODO
- behaviour.setServerStarted(); // unable to stop the server
- } catch( RuntimeException re ) {
- if( re instanceof NullPointerException && service.getClass().getName().equals("DStoreShellService")) {
- // remote server has no dstore shell service
- behaviour.setServerStopped(); // behaviour.setServerStarted(); // failed
- }
- }
}
@@ -269,7 +178,20 @@
}
public static String getDefaultStopCommand(IServer server) {
- String rseHome = server.getAttribute(RSEUtils.RSE_SERVER_HOME_DIR, "");
+ try {
+ return getDefaultStopCommand(server, false);
+ } catch(CoreException ce) {/* ignore, INTENTIONAL */}
+ return null;
+ }
+
+ public static String getDefaultStopCommand(IServer server, boolean errorOnFail) throws CoreException {
+ String rseHome = server.getAttribute(RSEUtils.RSE_SERVER_HOME_DIR, (String)null);
+ if( errorOnFail && rseHome == null ) {
+ IStatus s = new Status(IStatus.ERROR, RSECorePlugin.PLUGIN_ID,
+ "Remote Server Home not set.");
+ throw new CoreException(s);
+ }
+ rseHome = rseHome == null ? "" : rseHome;
JBossServer jbs = ServerConverter.getJBossServer(server);
@@ -313,25 +235,4 @@
IJBossRuntimeConstants.START_MAIN_TYPE + IJBossRuntimeConstants.SPACE + currentArgs + "&";
return cmd;
}
-
- protected static IShellService findShellService(JBossServerBehavior behaviour) throws CoreException {
- RSEUtils.waitForFullInit();
- String connectionName = RSEUtils.getRSEConnectionName(behaviour.getServer());
- IHost host = RSEUtils.findHost(connectionName);
- if( host == null ) {
- throw new CoreException(new Status(IStatus.ERROR, org.jboss.ide.eclipse.as.rse.core.RSECorePlugin.PLUGIN_ID,
- "Host not found. Host may have been deleted or RSE model may not be completely loaded"));
- }
-
- // ensure connections
- new ConnectAllSubsystemsUtil(host).run(new NullProgressMonitor());
-
- ISubSystem[] systems = RSECorePlugin.getTheSystemRegistry().getSubSystems(host);
- for( int i = 0; i < systems.length; i++ ) {
- if( systems[i] instanceof IShellServiceSubSystem)
- return ((IShellServiceSubSystem)systems[i]).getShellService();
- }
- throw new CoreException(new Status(IStatus.ERROR, org.jboss.ide.eclipse.as.rse.core.RSECorePlugin.PLUGIN_ID, "No Shell Service Found"));
- }
-
}
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r29270 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-02-22 15:40:48 -0500 (Tue, 22 Feb 2011)
New Revision: 29270
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java
Log:
JBIDE-8468 trunk
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java 2011-02-22 18:44:30 UTC (rev 29269)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java 2011-02-22 20:40:48 UTC (rev 29270)
@@ -115,7 +115,7 @@
args += c.SHUTDOWN_SERVER_ARG + c.SPACE + serverUrl + c.SPACE;
if( jbs.getUsername() != null && !jbs.getUsername().equals("")) //$NON-NLS-1$
args += c.SHUTDOWN_USER_ARG + c.SPACE + jbs.getUsername() + c.SPACE;
- if( jbs.getPassword() != null && !jbs.getUsername().equals("")) //$NON-NLS-1$
+ if( jbs.getPassword() != null && !jbs.getPassword().equals("")) //$NON-NLS-1$
args += c.SHUTDOWN_PASS_ARG + c.SPACE + jbs.getPassword() + c.SPACE;
return args;
}
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r29269 - trunk/requirements/soap.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-02-22 13:44:30 -0500 (Tue, 22 Feb 2011)
New Revision: 29269
Modified:
trunk/requirements/soap/build.properties
Log:
update SOA-P 5.1 dep to use GA URL
Modified: trunk/requirements/soap/build.properties
===================================================================
--- trunk/requirements/soap/build.properties 2011-02-22 18:43:10 UTC (rev 29268)
+++ trunk/requirements/soap/build.properties 2011-02-22 18:44:30 UTC (rev 29269)
@@ -10,8 +10,9 @@
soap50.build.archive.md5=b9088f7884c7464419623c596dafe25f
soap50.build.archive.root=jboss-soa-p.5.0.0
-# JBDS-1374, JBIDE-8055, JBIDE-8403 update SOA-P 5.1 - http://jawa05.englab.brq.redhat.com/candidate/SOA-5.1.CR1/unsigned/soa-5....
-soap51.build.uri=http://jawa05.englab.brq.redhat.com/candidate/SOA-5.1.CR1/unsigned/
+# JBDS-1374, JBIDE-8055, JBIDE-8403 update SOA-P 5.1 - http://jawa05.englab.brq.redhat.com/released/SOA-5.1.GA/unsigned/soa-5.1....
+# DO NOT USE stuff in http://porkchop.devel.redhat.com/released/JBossSOAP/5.1/5.1.0/ (not sure why different, but different; also no modeshape/teiid jars)
+soap51.build.uri=http://jawa05.englab.brq.redhat.com/released/SOA-5.1.GA/unsigned/
soap51.build.name=soa-5.1.0.GA
soap51.build.archive=${soap51.build.name}.zip
soap51.build.archive.md5=f3cb81c4c7493a6255620d15233a5671
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r29268 - branches/jbosstools-3.2.x/requirements/soap.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-02-22 13:43:10 -0500 (Tue, 22 Feb 2011)
New Revision: 29268
Modified:
branches/jbosstools-3.2.x/requirements/soap/build.properties
Log:
update SOA-P 5.1 dep to use GA URL
Modified: branches/jbosstools-3.2.x/requirements/soap/build.properties
===================================================================
--- branches/jbosstools-3.2.x/requirements/soap/build.properties 2011-02-22 18:42:59 UTC (rev 29267)
+++ branches/jbosstools-3.2.x/requirements/soap/build.properties 2011-02-22 18:43:10 UTC (rev 29268)
@@ -10,8 +10,9 @@
soap50.build.archive.md5=b9088f7884c7464419623c596dafe25f
soap50.build.archive.root=jboss-soa-p.5.0.0
-# JBDS-1374, JBIDE-8055, JBIDE-8403 update SOA-P 5.1 - http://jawa05.englab.brq.redhat.com/candidate/SOA-5.1.CR1/unsigned/soa-5....
-soap51.build.uri=http://jawa05.englab.brq.redhat.com/candidate/SOA-5.1.CR1/unsigned/
+# JBDS-1374, JBIDE-8055, JBIDE-8403 update SOA-P 5.1 - http://jawa05.englab.brq.redhat.com/released/SOA-5.1.GA/unsigned/soa-5.1....
+# DO NOT USE stuff in http://porkchop.devel.redhat.com/released/JBossSOAP/5.1/5.1.0/ (not sure why different, but different; also no modeshape/teiid jars)
+soap51.build.uri=http://jawa05.englab.brq.redhat.com/released/SOA-5.1.GA/unsigned/
soap51.build.name=soa-5.1.0.GA
soap51.build.archive=${soap51.build.name}.zip
soap51.build.archive.md5=f3cb81c4c7493a6255620d15233a5671
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r29267 - trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2011-02-22 13:42:59 -0500 (Tue, 22 Feb 2011)
New Revision: 29267
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/FileUploadTagTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/InplaceSelectInputTagTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/PickListTagTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ProgressTagTest.java
Log:
Fix wrong assert message
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/FileUploadTagTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/FileUploadTagTest.java 2011-02-22 18:05:19 UTC (rev 29266)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/FileUploadTagTest.java 2011-02-22 18:42:59 UTC (rev 29267)
@@ -85,7 +85,7 @@
"\nbut it is '" + selectedText + "'",
selectedText.trim().startsWith(hasToStartWith));
final String hasEndWith = "</rich:fileUpload>";
- assertTrue("Selected text in Source Pane has to end with '" + hasToStartWith + "'" +
+ assertTrue("Selected text in Source Pane has to end with '" + hasEndWith + "'" +
"\nbut it is '" + selectedText + "'",
selectedText.trim().endsWith(hasEndWith));
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/InplaceSelectInputTagTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/InplaceSelectInputTagTest.java 2011-02-22 18:05:19 UTC (rev 29266)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/InplaceSelectInputTagTest.java 2011-02-22 18:42:59 UTC (rev 29267)
@@ -60,7 +60,7 @@
"\nbut it is '" + selectedText + "'",
selectedText.trim().startsWith(hasToStartWith));
final String hasEndWith = "</rich:inplaceSelect>";
- assertTrue("Selected text in Source Pane has to end with '" + hasToStartWith + "'" +
+ assertTrue("Selected text in Source Pane has to end with '" + hasEndWith + "'" +
"\nbut it is '" + selectedText + "'",
selectedText.trim().endsWith(hasEndWith));
// Click on tag and check correct tag displaying
@@ -85,7 +85,7 @@
assertTrue("Selected text in Source Pane has to start with '" + hasToStartWith + "'" +
"\nbut it is '" + selectedText + "'",
selectedText.trim().startsWith(hasToStartWith));
- assertTrue("Selected text in Source Pane has to end with '" + hasToStartWith + "'" +
+ assertTrue("Selected text in Source Pane has to end with '" + hasEndWith + "'" +
"\nbut it is '" + selectedText + "'",
selectedText.trim().endsWith(hasEndWith));
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/PickListTagTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/PickListTagTest.java 2011-02-22 18:05:19 UTC (rev 29266)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/PickListTagTest.java 2011-02-22 18:42:59 UTC (rev 29267)
@@ -117,7 +117,7 @@
"\nbut it is '" + selectedText + "'",
selectedText.trim().startsWith(hasToStartWith));
String hasEndWith = "</rich:pickList>";
- assertTrue("Selected text in Source Pane has to end with '" + hasToStartWith + "'" +
+ assertTrue("Selected text in Source Pane has to end with '" + hasEndWith + "'" +
"\nbut it is '" + selectedText + "'",
selectedText.trim().endsWith(hasEndWith));
// select first item in VPE
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ProgressTagTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ProgressTagTest.java 2011-02-22 18:05:19 UTC (rev 29266)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ProgressTagTest.java 2011-02-22 18:42:59 UTC (rev 29267)
@@ -52,7 +52,7 @@
"\nbut it is '" + selectedText + "'",
selectedText.trim().startsWith(hasToStartWith));
final String hasEndWith = "</rich:progressBar>";
- assertTrue("Selected text in Source Pane has to end with '" + hasToStartWith + "'" +
+ assertTrue("Selected text in Source Pane has to end with '" + hasEndWith + "'" +
"\nbut it is '" + selectedText + "'",
selectedText.trim().endsWith(hasEndWith));
}
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r29266 - in workspace/bbrodt/bpel: features and 87 other directories.
by jbosstools-commits＠lists.jboss.org
Author: bbrodt
Date: 2011-02-22 13:05:19 -0500 (Tue, 22 Feb 2011)
New Revision: 29266
Added:
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/.classpath
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/.project
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/.settings/
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/.settings/org.eclipse.jdt.core.prefs
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/META-INF/
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/META-INF/MANIFEST.MF
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/bin/
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/bin/org/
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/bin/org/eclipse/
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/bin/org/eclipse/bpel/
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/bin/org/eclipse/bpel/cheatsheet/
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/bin/org/eclipse/bpel/cheatsheet/Activator.class
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/build.properties
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/cheatsheets/
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/cheatsheets/bpel.xml
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/plugin.properties
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/plugin.xml
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/pom.xml
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/src/
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/src/org/
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/src/org/eclipse/
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/src/org/eclipse/bpel/
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/src/org/eclipse/bpel/cheatsheet/
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/src/org/eclipse/bpel/cheatsheet/Activator.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/ResourceMarkerDecorator.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/.classpath
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/.project
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/.settings/
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/.settings/org.eclipse.jdt.core.prefs
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/META-INF/
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/META-INF/MANIFEST.MF
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/bin/
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/bin/org/
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/bin/org/eclipse/
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/bin/org/eclipse/bpel/
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/bin/org/eclipse/bpel/jboss/
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/bin/org/eclipse/bpel/jboss/riftsaw/
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/bin/org/eclipse/bpel/jboss/riftsaw/runtime/
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/bin/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawBPELPublisher.class
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/bin/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawPlugin.class
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/bin/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawServerRuntime.class
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/build.properties
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/definition/
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/definition/riftsaw.xml
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/icons/
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/icons/obj16/
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/icons/obj16/riftsaw.gif
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/plugin.properties
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/plugin.xml
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/pom.xml
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawBPELPublisher.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawPlugin.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawServerRuntime.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/UnknownElementValidator.java
Removed:
workspace/bbrodt/bpel/plugins/org.jboss.tools.bpel.cheatsheet/
workspace/bbrodt/bpel/plugins/org.jboss.tools.bpel.runtimes/
Modified:
workspace/bbrodt/bpel/features/org.jboss.tools.bpel.feature/feature.xml
workspace/bbrodt/bpel/features/org.jboss.tools.bpel.feature/pom.xml
workspace/bbrodt/bpel/features/org.jboss.tools.bpel.tests.feature/pom.xml
workspace/bbrodt/bpel/features/pom.xml
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/pom.xml
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/pom.xml
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/definition/ode.xml
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/pom.xml
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.common.model/META-INF/MANIFEST.MF
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.common.model/pom.xml
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.common.ui/plugin.xml
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.common.ui/pom.xml
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/CommonUIPlugin.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/messages.properties
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/pom.xml
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/model/bpel.ecore
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/BPELPackage.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/OnEvent.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/BPELActivityDeserializer.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BPELPackageImpl.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/OnEventImpl.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELReader.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELWriter.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/BPELConstants.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ElementPlacer.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationBPELReader.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationHelper.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/XSDComparer.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.runtimes/META-INF/MANIFEST.MF
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.runtimes/plugin.properties
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.runtimes/plugin.xml
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.runtimes/pom.xml
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IBPELRuntimeDelegate.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/plugin.xml
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/pom.xml
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Messages.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ForEachAdapter.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddVariableCommand.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/contentassist/ExpressionContentAssistProcessor.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/OperationContentProvider.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/BrowseSelectorDialog.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/TypeSelectorDialog.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/factories/BPELUIObjectFactory.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/messages.properties
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/perspectives/BPELPerspectiveFactory.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/FaultCatchNameSection.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/InvokeImplSection.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/InvokeVariableSection.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/LiteralAssignCategory.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableInitializationSection.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariablePartAssignCategory.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSelector.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELUtil.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/WSDLImportHelper.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage2.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLCustomPage.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.validator/pom.xml
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/ModelQueryImpl.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/Factory.java
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/messages.properties
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.wsil.model/META-INF/MANIFEST.MF
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.wsil.model/pom.xml
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.xpath10/META-INF/MANIFEST.MF
workspace/bbrodt/bpel/plugins/org.eclipse.bpel.xpath10/pom.xml
workspace/bbrodt/bpel/plugins/pom.xml
workspace/bbrodt/bpel/pom.xml
workspace/bbrodt/bpel/releng/maps/project.map
workspace/bbrodt/bpel/releng/psfs/project.subclipse.psf
workspace/bbrodt/bpel/releng/psfs/project.subversive.psf
workspace/bbrodt/bpel/site/pom.xml
workspace/bbrodt/bpel/tests/org.jboss.tools.bpel.ui.bot.test/pom.xml
workspace/bbrodt/bpel/tests/org.jboss.tools.bpel.ui.test/pom.xml
workspace/bbrodt/bpel/tests/pom.xml
Log:
merged build files and manifests with trunk.
updated bundle versions to 0.7.0
Modified: workspace/bbrodt/bpel/features/org.jboss.tools.bpel.feature/feature.xml
===================================================================
--- workspace/bbrodt/bpel/features/org.jboss.tools.bpel.feature/feature.xml 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/features/org.jboss.tools.bpel.feature/feature.xml 2011-02-22 18:05:19 UTC (rev 29266)
@@ -126,14 +126,14 @@
unpack="false"/>
<plugin
- id="org.jboss.tools.bpel.cheatsheet"
+ id="org.eclipse.bpel.cheatsheet"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.jboss.tools.bpel.runtimes"
+ id="org.eclipse.bpel.jboss.riftsaw.runtime"
download-size="0"
install-size="0"
version="0.0.0"
Modified: workspace/bbrodt/bpel/features/org.jboss.tools.bpel.feature/pom.xml
===================================================================
--- workspace/bbrodt/bpel/features/org.jboss.tools.bpel.feature/pom.xml 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/features/org.jboss.tools.bpel.feature/pom.xml 2011-02-22 18:05:19 UTC (rev 29266)
@@ -1,13 +1,13 @@
-<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools.bpel.features</groupId>
+ <groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.jboss.tools.bpel.feature</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
-</project>
+</project>
\ No newline at end of file
Modified: workspace/bbrodt/bpel/features/org.jboss.tools.bpel.tests.feature/pom.xml
===================================================================
--- workspace/bbrodt/bpel/features/org.jboss.tools.bpel.tests.feature/pom.xml 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/features/org.jboss.tools.bpel.tests.feature/pom.xml 2011-02-22 18:05:19 UTC (rev 29266)
@@ -1,13 +1,13 @@
-<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools.bpel.features</groupId>
+ <groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.jboss.tools.bpel.tests.feature</artifactId>
<version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
-</project>
+</project>
\ No newline at end of file
Modified: workspace/bbrodt/bpel/features/pom.xml
===================================================================
--- workspace/bbrodt/bpel/features/pom.xml 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/features/pom.xml 2011-02-22 18:05:19 UTC (rev 29266)
@@ -2,8 +2,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.tools.bpel</groupId>
- <artifactId>features</artifactId>
- <name>bpel.features</name>
+ <artifactId>org.jboss.tools.bpel.features</artifactId>
+ <name>org.jboss.tools.bpel.features</name>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF 2011-02-22 18:05:19 UTC (rev 29266)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.apache.ode.deploy.model; singleton:=true
-Bundle-Version: 0.5.0.qualifier
+Bundle-Version: 0.7.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
@@ -11,7 +11,7 @@
org.eclipse.bpel.apache.ode.deploy.model.dd.util
Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
- org.eclipse.bpel.model;bundle-version="[0.4.0,2.0.0)",
+ org.eclipse.bpel.model;bundle-version="[0.7.0,2.0.0)",
org.eclipse.wst.wsdl,
org.eclipse.xsd;bundle-version="[2.4.0,3.0.0)",
org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/pom.xml
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/pom.xml 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/pom.xml 2011-02-22 18:05:19 UTC (rev 29266)
@@ -1,13 +1,13 @@
-<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools.bpel.plugins</groupId>
+ <groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.eclipse.bpel.apache.ode.deploy.model</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.7.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
-</project>
+</project>
\ No newline at end of file
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF 2011-02-22 18:05:19 UTC (rev 29266)
@@ -2,8 +2,9 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.apache.ode.deploy.ui; singleton:=true
-Bundle-Version: 0.6.0.qualifier
+Bundle-Version: 0.7.0.qualifier
Bundle-Activator: org.eclipse.bpel.apache.ode.deploy.ui.Activator
+Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)",
@@ -11,15 +12,15 @@
org.eclipse.ui.editors;bundle-version="[3.4.0,4.0.0)",
org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)",
org.eclipse.ui.forms;bundle-version="[3.3.100,4.0.0)",
- org.eclipse.bpel.apache.ode.deploy.model;bundle-version="[0.4.0,2.0.0)",
- org.eclipse.bpel.model;bundle-version="[0.4.0,2.0.0)",
+ org.eclipse.bpel.apache.ode.deploy.model;bundle-version="[0.7.0,2.0.0)",
+ org.eclipse.bpel.model;bundle-version="[0.7.0,2.0.0)",
org.eclipse.wst.wsdl,
org.eclipse.xsd;bundle-version="[2.4.0,3.0.0)",
javax.wsdl;bundle-version="[1.5.0,1.6.0)",
org.eclipse.core.databinding;bundle-version="[1.1.0,2.0.0)",
org.eclipse.jface.databinding,
org.eclipse.emf.edit.ui;bundle-version="[2.4.0,3.0.0)",
- org.eclipse.bpel.ui;bundle-version="[0.4.0,2.0.0)",
+ org.eclipse.bpel.ui;bundle-version="[0.7.0,2.0.0)",
org.eclipse.jdt.core;bundle-version="[3.5.0,4.0.0)",
org.eclipse.wst.common.modulecore
Bundle-ActivationPolicy: lazy
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/pom.xml
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/pom.xml 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/pom.xml 2011-02-22 18:05:19 UTC (rev 29266)
@@ -1,13 +1,13 @@
-<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools.bpel.plugins</groupId>
+ <groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.eclipse.bpel.apache.ode.deploy.ui</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.7.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
-</project>
+</project>
\ No newline at end of file
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF 2011-02-22 18:05:19 UTC (rev 29266)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.apache.ode.runtime;singleton:=true
-Bundle-Version: 0.6.0.qualifier
+Bundle-Version: 0.7.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
@@ -11,20 +11,20 @@
org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)",
org.eclipse.jst.server.generic.core;bundle-version="[1.0.305,2.0.0)",
org.eclipse.wst.wsdl;bundle-version="[1.1.200,2.0.0)",
- org.eclipse.bpel.model;bundle-version="0.5.0",
+ org.eclipse.bpel.model;bundle-version="[0.7.0,2.0.0)",
org.eclipse.jem.util;bundle-version="[2.0.100,3.0.0)",
org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.bpel.runtimes;bundle-version="0.5.0",
+ org.eclipse.bpel.runtimes;bundle-version="[0.7.0,2.0.0)",
org.eclipse.jst.server.generic.ui;bundle-version="[1.0.305,2.0.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)",
- org.eclipse.bpel.ui;bundle-version="0.5.0",
+ org.eclipse.bpel.ui;bundle-version="[0.7.0,2.0.0)",
org.apache.xerces;bundle-version="[2.9.0,3.0.0)",
org.eclipse.xsd;bundle-version="[2.4.0,3.0.0)",
org.eclipse.jst.server.ui;bundle-version="[1.0.303,2.0.0)",
org.eclipse.jst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
org.eclipse.jst.server.core;bundle-version="[1.1.0,2.0.0)",
javax.wsdl;bundle-version="[1.5.0,1.6.0)",
- org.eclipse.bpel.apache.ode.deploy.model;bundle-version="0.5.0"
+ org.eclipse.bpel.apache.ode.deploy.model;bundle-version="[0.7.0,2.0.0)"
Bundle-Activator: org.eclipse.bpel.apache.ode.runtime.OdePlugin
Export-Package: org.eclipse.bpel.apache.ode.runtime
Bundle-ActivationPolicy: lazy
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/definition/ode.xml
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/definition/ode.xml 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/definition/ode.xml 2011-02-22 18:05:19 UTC (rev 29266)
@@ -9,17 +9,30 @@
type="directory"
context="runtime"
default="/your_ode_root/" />
+
<property id="tomcat.home"
label="%tomcatHome"
type="directory"
context="runtime"
default="/your_tomcat_root/" />
+ <property id="serverAddress"
+ label="%serverAddress"
+ type="string"
+ context="runtime"
+ default="localhost" />
+
<property id="port"
label="%port"
type="string"
context="runtime"
default="8080" />
+
+ <property id="vmArguments"
+ label="%vmArguments"
+ type="string"
+ context="runtime"
+ default="-Xms128m -Xmx512m -XX:MaxPermSize=256m" />
<port>
<no>${port}</no>
@@ -41,7 +54,7 @@
<mainClass>org.apache.catalina.startup.Bootstrap</mainClass>
<workingDirectory>${tomcat.home}</workingDirectory>
<programArguments>start</programArguments>
- <vmParameters>-Dcatalina.home="${tomcat.home}" -Djava.endorsed.dirs="${tomcat.home}\common\endorsed"</vmParameters>
+ <vmParameters>-Dcatalina.home="${tomcat.home}" -Djava.endorsed.dirs="${tomcat.home}/common/endorsed" ${vmArguments}</vmParameters>
<classpathReference>tomcat</classpathReference>
</start>
@@ -49,7 +62,7 @@
<mainClass>org.apache.catalina.startup.Bootstrap</mainClass>
<workingDirectory>${tomcat.home}</workingDirectory>
<programArguments>stop</programArguments>
- <vmParameters>-Dcatalina.home="${tomcat.home}" -Djava.endorsed.dirs="${tomcat.home}\common\endorsed"</vmParameters>
+ <vmParameters>-Dcatalina.home="${tomcat.home}" -Djava.endorsed.dirs="${tomcat.home}/common/endorsed"</vmParameters>
<classpathReference>tomcat</classpathReference>
</stop>
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/pom.xml
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/pom.xml 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/pom.xml 2011-02-22 18:05:19 UTC (rev 29266)
@@ -1,13 +1,13 @@
-<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools.bpel.plugins</groupId>
+ <groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.eclipse.bpel.apache.ode.runtime</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.7.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
-</project>
+</project>
\ No newline at end of file
Added: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/.classpath
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/.classpath (rev 0)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/.classpath 2011-02-22 18:05:19 UTC (rev 29266)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/.project
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/.project (rev 0)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/.project 2011-02-22 18:05:19 UTC (rev 29266)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.bpel.cheatsheet</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+ </natures>
+</projectDescription>
Added: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/.settings/org.eclipse.jdt.core.prefs 2011-02-22 18:05:19 UTC (rev 29266)
@@ -0,0 +1,8 @@
+#Thu Sep 17 15:54:11 CST 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Added: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/META-INF/MANIFEST.MF
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/META-INF/MANIFEST.MF (rev 0)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/META-INF/MANIFEST.MF 2011-02-22 18:05:19 UTC (rev 29266)
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-Vendor: %providerName
+Bundle-SymbolicName: org.eclipse.bpel.cheatsheet;singleton:=true
+Bundle-Version: 0.7.0.qualifier
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Activator: org.eclipse.bpel.cheatsheet.Activator
+Bundle-ActivationPolicy: lazy
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.ui.cheatsheets
Added: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/bin/org/eclipse/bpel/cheatsheet/Activator.class
===================================================================
(Binary files differ)
Property changes on: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/bin/org/eclipse/bpel/cheatsheet/Activator.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/build.properties
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/build.properties (rev 0)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/build.properties 2011-02-22 18:05:19 UTC (rev 29266)
@@ -0,0 +1,8 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ cheatsheets/,\
+ plugin.xml,\
+ plugin.properties,\
+ build.properties
Added: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/cheatsheets/bpel.xml
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/cheatsheets/bpel.xml (rev 0)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/cheatsheets/bpel.xml 2011-02-22 18:05:19 UTC (rev 29266)
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<cheatsheet title="JBoss BPEL Tutorial">
+
+ <intro>
+ <description>
+ Learn how to use JBoss BPEL editor.
+ </description>
+ </intro>
+
+ <item title="Create a BPEL Project" skip="true">
+ <description>
+ If you want to deploy a bpel staff into JBoss BPEL server, the first step, you need create a BPEL project.
+Of course, if you only need to draw a BPEL process, you don't need to do the step.
+ </description>
+ <subitem
+ label="Create a BPEL project by selecting "File > New > Project... > BPEL 2.0 > BPEL Project" from the menu bar."
+ skip="false">
+ </subitem>
+ <subitem label="On the first page of the "New BPEL Project" Wizard enter a project name in the "Project Name" field. Click "Finish" button.">
+ </subitem>
+ </item>
+
+ <item title="Create a BPEL Process" skip="true">
+ <description>
+ After create a BPEL project, you can create a BPEL process file in the project.
+ </description>
+ <subitem
+ label="Create a BPEL process file by selecting "File > New > Others... > BPEL 2.0 > New BPEL Process File" from the menu bar.">
+ </subitem>
+ <subitem label="On the first page of the "Create a BPEL Process File" Wizard enter a process name in the "BPEL Process Name" field, a process's namesapce in the "Namespace" field, and a process's template in the "Template" field. Click "Next" button.">
+ </subitem>
+ <subitem label="On the second page of the "Create a BPEL Process File" Wizard select the "bpelContent" folder of the BPEL project. Click "Finish" button.">
+ </subitem>
+ </item>
+
+ <item title="Edit the BPEL Process file" skip="true">
+ <description>
+ For getting a useful BPEL process, you need to edit the BPEL process file by adding some BPEL elements.<br/><br/>
+From the "Palette" view, you can add a BPEL element to the BPEL process by dragging and dropping it.<br/><br/>
+From the "Properties" view, you can edit the attributes of a BPEL element.<br/><br/>
+From the "Tray of the BPEL editor", you can add a Partner link, Variable, Correlation Set or Message Exchange to the BPEL process.<br/><br/>
+If the "Properties" view and "Palette" view are not opened, you can open the views by right-clicking the BPEL editor and selecting "Show in Properties", "Show Palette in Palette view".
+
+ </description>
+ </item>
+
+ <item title="Edit the WSDL file" skip="true">
+ <description>
+ For getting a runnable BPEL staff, beside the BPEL process file, you need a WSDL to describe how to use the BPEL process. As default, the system has genereted a WSDL for the BPEL staff. You need to edit it to support your BPEL project. <br/><br/>
+Open the WSDL using the WSDL editor, add "Service" and "Binding" by right-clicking on the WSDL editor, and set the attributes of them in the "Properties" view.
+ </description>
+ </item>
+
+ <item title="Create a deploy.xml file" skip="true">
+ <description>
+ If you want to deploy a BPEL project to JBoss BPEL Runtime, you need to create a deploy.xml file.
+ </description>
+ <subitem label="Create a deploy.xml by selecting "File > New > Other... > BPEL 2.0 > Apache ODE Deployment Descriptor" from the menu bar.">
+ </subitem>
+ <subitem label="On the first page of the "Apache ODE Deployment Descriptor" Wizard choose the "bpelContent" folder of a bpel project in the "BPEL Project" field and enter "deploy.xml" in the "File name" field. Click "Finish" button.">
+ </subitem>
+ <subitem label="Double-click the deploy.xml file to open it in ODE Descriptor Deployment Editor. In the "Inbound Interfaces" section, click the "Associated Port" column and in the dropdown box select a BPEL port that is defined in the WSDL file.The Related Service and Binding Used columns should be automatically filled in. Save the deploy.xml file.">
+ </subitem>
+ </item>
+
+ <item title="Create a JBoss BPEL Server" skip="true">
+ <description>
+ Suppose you have installed the JBoss BPEL Runtime-RiftSaw into a JBoss server, you can create a server in JBoss Tools for JBoss BPEL runtime.
+ </description>
+ <subitem label="Open the "JBoss Server" view by selecting "Windows > Show View > Other... > Server > JBoss Server view" in the menu bar.">
+ </subitem>
+ <subitem label="Right-click the JBoss Server view and select "New > Server" to open the New Server Wizard">
+ </subitem>
+ <subitem label="On the first page of the "New Server" Wizard select "JBoss AS 5.1" in the "Select the server type" field, input a server name in the "Server name" field and select a runtime in the "Server runtime environment" field. Click "Next" button.">
+ </subitem>
+ <subitem label="On the second page of the "New Server" Wizard input your JBoss AS location in the "JBoss AS Location" field. Click "Next" button.">
+ </subitem>
+ <subitem label="On the third page of the "New Server" Wizard select a BPEL resource in the left column, click "Add >" button to add the BPEL resource to the right column. Click "Finish" button.">
+ </subitem>
+ </item>
+
+ <item title="Deploy the BPEL Process into the JBoss BPEL Server" skip="true">
+ <description>
+ If you don't add a BPEL resource into the server in the third step of "Create a JBoss BPEL Server", you can right-click on the server item in the "JBoss Server" view and select the "Add and Removes...", then you can do the step as the third step of "Create a JBoss BPEL Server".
+<br/><br/>
+After these steps, you can start the server to test your BPEL staff.
+ </description>
+ </item>
+</cheatsheet>
Added: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/plugin.properties
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/plugin.properties (rev 0)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/plugin.properties 2011-02-22 18:05:19 UTC (rev 29266)
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2010 JBoss by Red Hat and others.
+# All rights reserved. This program and the accompanying materials
+# are 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:
+# JBoss by Red Hat - Initial implementation.
+###############################################################################
+pluginName=BPEL Cheatsheet
+providerName=JBoss by Red Hat
\ No newline at end of file
Added: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/plugin.xml
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/plugin.xml (rev 0)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/plugin.xml 2011-02-22 18:05:19 UTC (rev 29266)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.5"?>
+<plugin>
+ <extension
+ point="org.eclipse.ui.cheatsheets.cheatSheetContent">
+ <category
+ id="org.eclipse.bpel.cheatsheet"
+ name="BPEL Tutorial">
+ </category>
+ <cheatsheet
+ category="org.eclipse.bpel.cheatsheet"
+ contentFile="$nl$/cheatsheets/bpel.xml"
+ id="org.eclipse.bpel.cheatsheet.bpel"
+ name="BPEL Tutorial">
+ <description>
+ Learn how to use the BPEL editor
+ </description>
+ </cheatsheet>
+ </extension>
+
+</plugin>
\ No newline at end of file
Added: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/pom.xml
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/pom.xml (rev 0)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/pom.xml 2011-02-22 18:05:19 UTC (rev 29266)
@@ -0,0 +1,13 @@
+<project
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools.bpel.plugins</groupId>
+ <artifactId>org.eclipse.bpel.cheatsheet</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+</project>
Added: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/src/org/eclipse/bpel/cheatsheet/Activator.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/src/org/eclipse/bpel/cheatsheet/Activator.java (rev 0)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.cheatsheet/src/org/eclipse/bpel/cheatsheet/Activator.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -0,0 +1,50 @@
+package org.eclipse.bpel.cheatsheet;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+ // The plug-in ID
+ public static final String PLUGIN_ID = "org.eclipse.bpel.cheatsheet";
+
+ // The shared instance
+ private static Activator plugin;
+
+ /**
+ * The constructor
+ */
+ public Activator() {
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin = this;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
+ super.stop(context);
+ }
+
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static Activator getDefault() {
+ return plugin;
+ }
+
+}
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.common.model/META-INF/MANIFEST.MF
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.common.model/META-INF/MANIFEST.MF 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.common.model/META-INF/MANIFEST.MF 2011-02-22 18:05:19 UTC (rev 29266)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.common.model; singleton:=true
-Bundle-Version: 0.5.0.qualifier
+Bundle-Version: 0.7.0.qualifier
Bundle-Activator: org.eclipse.bpel.common.extension.model.Activator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.common.model/pom.xml
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.common.model/pom.xml 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.common.model/pom.xml 2011-02-22 18:05:19 UTC (rev 29266)
@@ -1,13 +1,13 @@
-<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools.bpel.plugins</groupId>
+ <groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.eclipse.bpel.common.model</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.7.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
-</project>
+</project>
\ No newline at end of file
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF 2011-02-22 18:05:19 UTC (rev 29266)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.common.ui; singleton:=true
-Bundle-Version: 0.5.0.qualifier
+Bundle-Version: 0.7.0.qualifier
Bundle-Activator: org.eclipse.bpel.common.ui.CommonUIPlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
@@ -11,7 +11,7 @@
org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
org.eclipse.gef;bundle-version="[3.4.0,4.0.0)",
org.eclipse.emf.ecore.change;bundle-version="[2.4.0,3.0.0)",
- org.eclipse.bpel.model;bundle-version="[0.4.0,1.0.0)"
+ org.eclipse.bpel.model;bundle-version="[0.7.0,2.0.0)"
Eclipse-LazyStart: true
Export-Package: org.eclipse.bpel.common.ui,
org.eclipse.bpel.common.ui.assist,
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.common.ui/plugin.xml
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.common.ui/plugin.xml 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.common.ui/plugin.xml 2011-02-22 18:05:19 UTC (rev 29266)
@@ -59,5 +59,28 @@
name="BPEL Process"
priority="normal"/>
</extension>
+
+ <!-- https://jira.jboss.org/browse/JBIDE-6016 -->
+ <extension
+ point="org.eclipse.ui.decorators">
+ <decorator
+ adaptable="true"
+ location="BOTTOM_LEFT"
+ lightweight="true"
+ label="BPEL File Decorator"
+ state="true"
+ class="org.eclipse.bpel.common.ui.ResourceMarkerDecorator"
+ id="org.eclipse.bpel.ui.decorators">
+ <enablement>
+ <and>
+ <objectClass name="org.eclipse.core.resources.IFile"/>
+ <objectState
+ name="contentTypeId"
+ value="org.eclipse.bpel.contenttype">
+ </objectState>
+ </and>
+ </enablement>
+ </decorator>
+ </extension>
</plugin>
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.common.ui/pom.xml
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.common.ui/pom.xml 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.common.ui/pom.xml 2011-02-22 18:05:19 UTC (rev 29266)
@@ -1,13 +1,13 @@
-<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools.bpel.plugins</groupId>
+ <groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.eclipse.bpel.common.ui</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.7.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
-</project>
+</project>
\ No newline at end of file
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/CommonUIPlugin.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/CommonUIPlugin.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/CommonUIPlugin.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -48,14 +48,16 @@
private static CommonUIPlugin plugin;
private ColorRegistry colorRegistry;
- protected boolean imagesAndColorsInitialized;
+ // https://jira.jboss.org/browse/JBIDE-7762
+ // simplify, simplify, simplify!
+ private ImageRegistry imageRegistry;
+
/**
* The constructor.
*/
public CommonUIPlugin() {
plugin = this;
- imagesAndColorsInitialized = false;
}
/**
@@ -99,20 +101,24 @@
* @see org.eclipse.ui.plugin.AbstractUIPlugin#getImageRegistry()
*/
@Override
- public ImageRegistry getImageRegistry() {
- ImageRegistry result = super.getImageRegistry();
- initialize();
- return result;
+ // https://jira.jboss.org/browse/JBIDE-7724
+ public synchronized ImageRegistry getImageRegistry() {
+ if (imageRegistry == null) {
+ imageRegistry = super.getImageRegistry();
+ initializeImages(Display.getCurrent());
+ }
+ return imageRegistry;
}
/**
* Return color registry.
* @return the color registry.
*/
- public ColorRegistry getColorRegistry() {
+ // https://jira.jboss.org/browse/JBIDE-7724
+ public synchronized ColorRegistry getColorRegistry() {
if (colorRegistry == null) {
colorRegistry = new ColorRegistry();
- initialize();
+ registerColors(Display.getCurrent());
}
return colorRegistry;
}
@@ -198,15 +204,6 @@
colorRegistry.put(ICommonUIConstants.COLOR_SELECTION_HANDLE_CORNER, ColorUtils.getLightShade(selectionColor.getRGB(), 2, 3));
}
- protected void initialize() {
- if (!imagesAndColorsInitialized) {
- imagesAndColorsInitialized = true;
- Display display = Display.getCurrent();
- initializeImages(display);
- registerColors(display);
- }
- }
-
/**
* Method to create an error status object and write an error message to the log
* based on the passed boolean value.
Added: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/ResourceMarkerDecorator.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/ResourceMarkerDecorator.java (rev 0)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/ResourceMarkerDecorator.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -0,0 +1,88 @@
+/*
+ * 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.common.ui;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.IDecoration;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.jface.viewers.ILightweightLabelDecorator;
+
+/**
+ * Lightweight icon decorator for error/warning/info icons in Navigator view
+ *
+ * @see https://jira.jboss.org/browse/JBIDE-6016
+ * @author Bob Brodt
+ * @date Nov 16, 2010
+ */
+public class ResourceMarkerDecorator implements ILightweightLabelDecorator, ICommonUIConstants {
+
+ private static ImageDescriptor img_error = null;
+ private static ImageDescriptor img_warning = null;
+ private static ImageDescriptor img_info = null;
+
+ public ResourceMarkerDecorator()
+ {
+ super();
+ }
+
+ public void addListener(ILabelProviderListener listener) {
+ }
+
+ public void dispose() {
+ }
+
+ public boolean isLabelProperty(Object arg0, String arg1) {
+ return false;
+ }
+
+ public void removeListener(ILabelProviderListener listener) {
+ }
+
+ public void decorate(Object element, IDecoration decoration) {
+ try {
+ int severity = ((IResource)element).findMaxProblemSeverity(IMarker.PROBLEM, true, IResource.DEPTH_ONE);
+ switch (severity) {
+ case IMarker.SEVERITY_ERROR:
+ if (img_error==null)
+ img_error = CommonUIPlugin.getDefault().getImageRegistry().getDescriptor(ICommonUIConstants.ICON_ERROR);
+ decoration.addOverlay(img_error);
+ break;
+ case IMarker.SEVERITY_WARNING:
+ if (img_warning==null)
+ img_warning = CommonUIPlugin.getDefault().getImageRegistry().getDescriptor(ICommonUIConstants.ICON_WARNING);
+ decoration.addOverlay(img_warning);
+ break;
+ case IMarker.SEVERITY_INFO:
+ if (img_info==null)
+ img_info = CommonUIPlugin.getDefault().getImageRegistry().getDescriptor(ICommonUIConstants.ICON_INFO);
+ decoration.addOverlay(img_info);
+ break;
+ }
+ }
+ catch(Exception e) {
+ }
+ }
+}
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/messages.properties
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/messages.properties 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/messages.properties 2011-02-22 18:05:19 UTC (rev 29266)
@@ -31,8 +31,8 @@
SynchronizationManager_refresh_title=File Changed
CompositeEditor_Cannot_disconnect_active_editor=Cannot disconnect active editor\: {0}
# https://jira.jboss.org/browse/JBIDE-7520
-SynchronizationManager_refresh_message=The file {0} \n
- has been changed on the file system.\n
+SynchronizationManager_refresh_message=The file {0} \n\
+ has been changed on the file system.\n\
Do you want to load the changes?
SynchronizationManager_saveButtonLabel=Save
CompositeEditorManager_5=Embedded editors must provide an id. Ignoring editor.
Added: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/.classpath
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/.classpath (rev 0)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/.classpath 2011-02-22 18:05:19 UTC (rev 29266)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/.project
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/.project (rev 0)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/.project 2011-02-22 18:05:19 UTC (rev 29266)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.bpel.jboss.riftsaw.runtime</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+ </natures>
+</projectDescription>
Added: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/.settings/org.eclipse.jdt.core.prefs 2011-02-22 18:05:19 UTC (rev 29266)
@@ -0,0 +1,8 @@
+#Tue Oct 20 16:01:25 CST 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Added: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/META-INF/MANIFEST.MF
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/META-INF/MANIFEST.MF (rev 0)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/META-INF/MANIFEST.MF 2011-02-22 18:05:19 UTC (rev 29266)
@@ -0,0 +1,40 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-Vendor: %providerName
+Bundle-SymbolicName: org.eclipse.bpel.jboss.riftsaw.runtime;singleton:=true
+Bundle-Version: 0.7.0.qualifier
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Activator: org.eclipse.bpel.jboss.riftsaw.runtime.RiftsawPlugin
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.wst.server.core,
+ org.eclipse.wst.web.ui,
+ org.eclipse.wst.common.project.facet.ui,
+ org.eclipse.wst.common.modulecore,
+ org.eclipse.wst.common.frameworks,
+ org.eclipse.wst.common.project.facet.core,
+ org.eclipse.wst.common.frameworks.ui,
+ org.eclipse.jst.server.generic.core,
+ org.eclipse.jst.server.core;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.jst.server.generic.ui;bundle-version="[1.0.305,2.0.0)",
+ org.eclipse.jst.server.ui;bundle-version="[1.0.303,2.0.0)",
+ org.eclipse.jst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.jem.util,
+ org.eclipse.debug.ui,
+ org.eclipse.bpel.model,
+ org.eclipse.emf.ecore,
+ org.eclipse.wst.wsdl,
+ javax.wsdl,
+ org.eclipse.jst.common.frameworks,
+ org.eclipse.wst.web,
+ org.jboss.ide.eclipse.as.core;resolution:=optional,
+ org.jboss.ide.eclipse.archives.webtools;resolution:=optional,
+ org.eclipse.wst.server.ui;resolution:=optional,
+ org.eclipse.ui.navigator,
+ org.eclipse.bpel.runtimes;bundle-version="[0.7.0,2.0.0)"
+Export-Package: org.eclipse.bpel.jboss.riftsaw.runtime
Added: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/bin/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawBPELPublisher.class
===================================================================
(Binary files differ)
Property changes on: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/bin/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawBPELPublisher.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/bin/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawPlugin.class
===================================================================
(Binary files differ)
Property changes on: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/bin/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawPlugin.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/bin/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawServerRuntime.class
===================================================================
(Binary files differ)
Property changes on: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/bin/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawServerRuntime.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/build.properties
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/build.properties (rev 0)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/build.properties 2011-02-22 18:05:19 UTC (rev 29266)
@@ -0,0 +1,6 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ plugin.*,\
+ icons/
Added: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/definition/riftsaw.xml
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/definition/riftsaw.xml (rev 0)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/definition/riftsaw.xml 2011-02-22 18:05:19 UTC (rev 29266)
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:ServerRuntime
+ xmlns:tns="http://eclipse.org/jst/server/generic/ServerTypeDefinition"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://eclipse.org/jst/server/generic/ServerTypeDefinition ServerTypeDefinitionSchema.xsd "
+ name="JBoss Riftsaw" version="v2.x">
+
+ <property id="jbossHome"
+ label="%jbossHome"
+ type="directory"
+ context="runtime"
+ default="/your_server_root" />
+
+ <property id="serverAddress"
+ label="%serverAddress"
+ type="string"
+ context="runtime"
+ default="localhost" />
+
+ <property id="port"
+ label="%port"
+ type="string"
+ context="runtime"
+ default="8080" />
+
+ <property id="serverConfig"
+ label="%jbossServerConfig"
+ type="combo"
+ context="runtime"
+ default="default,all,minimal,other - type your own here" />
+
+ <property id="vmArguments"
+ label="%vmArguments"
+ type="string"
+ context="runtime"
+ default="-Xms128m -Xmx512m -XX:MaxPermSize=256m" />
+
+ <port>
+ <no>${port}</no>
+ <name>Http</name>
+ <protocol>http</protocol>
+ </port>
+
+ <module>
+ <type>bpel.module</type>
+ <publishDir>${jbossHome}/server/${serverConfig}/deploy</publishDir>
+ <publisherReference>org.eclipse.bpel.jboss.riftsaw.runtime.publisher</publisherReference>
+ </module>
+
+ <project>
+ <classpathReference>riftsaw.project</classpathReference>
+ </project>
+
+ <start>
+ <mainClass>org.jboss.Main</mainClass>
+ <workingDirectory>${jbossHome}/bin</workingDirectory>
+ <programArguments>-c ${serverConfig}</programArguments>
+ <vmParameters>-Dprogram.name=run.bat -Djava.endorsed.dirs=${jbossHome}/lib/endorsed ${vmArguments}</vmParameters>
+ <classpathReference>jboss.run</classpathReference>
+ </start>
+
+ <stop>
+ <mainClass>org.jboss.Shutdown</mainClass>
+ <workingDirectory>${jbossHome}/bin</workingDirectory>
+ <programArguments>-S</programArguments>
+ <vmParameters>-Djboss.boot.loader.name=shutdown.bat</vmParameters>
+ <classpathReference>jboss.shutdown</classpathReference>
+ </stop>
+
+ <classpath id="jboss.run" >
+ <archive path="${jbossHome}/bin/run.jar" />
+ </classpath>
+
+ <classpath id="jboss.shutdown" >
+ <archive path="${jbossHome}/bin/shutdown.jar" />
+ </classpath>
+
+ <classpath id="jboss.project" >
+
+
+ <fileset dir="${jbossHome}">
+ <include name="client/*.jar" />
+ <include name="server/default/lib/*.jar" />
+
+ <include name="server/default/deploy/jbossweb.sar/jsf-libs/*.jar" />
+
+ <!-- This will be ignored if EJB3 is not there 5.0 -->
+ <include name="lib/*.jar" />
+ <include name="server/default/deployers/jbossweb.deployer/*.jar" />
+ <include name="server/default/deployers/jboss-aop-jboss5.deployer/*.jar" />
+ <include name="common/lib/*.jar" />
+ <include name="server/default/deploy/jbossweb.sar/*.jar" />
+
+ <!-- for validation to work this library is defined as an archive -->
+ <exclude name="lib/jboss-kernel.jar" />
+ </fileset>
+
+ <!-- leave one generic jar as an archive so that validation works -->
+ <archive path="${jbossHome}/lib/jboss-kernel.jar" />
+
+ </classpath>
+
+</tns:ServerRuntime>
\ No newline at end of file
Added: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/icons/obj16/riftsaw.gif
===================================================================
(Binary files differ)
Property changes on: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/icons/obj16/riftsaw.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/plugin.properties
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/plugin.properties (rev 0)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/plugin.properties 2011-02-22 18:05:19 UTC (rev 29266)
@@ -0,0 +1,33 @@
+###############################################################################
+# Copyright (c) 2010 JBoss by Red Hat and others.
+# All rights reserved. This program and the accompanying materials
+# are 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:
+# University College London - initial API and implementation
+# JBoss by Red Hat - subsequent contributions and maintenance
+###############################################################################
+pluginName = Eclipse BPEL Designer Runtimes
+providerName = JBoss by Red Hat
+
+MODULE_TYPE_NAME=BPEL 2.0 Process
+MODULE_TYPE_DESCRIPTION=Module representing a BPEL process
+
+BPEL_CORE_FACET_LABEL=BPEL 2.0 Facet
+BPEL_CORE_FACET_DESCRIPTION=Enables modelling and deployment of BPEL processes.
+BPEL_FACET_CATEGORY_LABEL=BPEL 2.0
+BPEL_FACET_TEMPLATE_LABEL=BPEL 2.0 Project
+NEW_BPEL_CATEGORY=BPEL 2.0
+NEW_BPEL_PROJECT=BPEL Project
+NEW_BPEL_PROJECT_DESCRIPTION=Create a new BPEL project.
+
+# used by wizard definitions in definition/riftsaw.xml
+pluginName = JBoss Riftsaw Runtime Adapter
+providerName = JBoss by Red Hat
+jbossHome = JBoss App Server home directory:
+jbossServerConfig = Server configuration:
+serverAddress = Server address:
+port = Port:
+vmArguments = VM Arguments:
\ No newline at end of file
Added: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/plugin.xml
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/plugin.xml (rev 0)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/plugin.xml 2011-02-22 18:05:19 UTC (rev 29266)
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+
+ <extension point="org.eclipse.jst.server.generic.core.genericpublisher">
+ <genericpublisher
+ class="org.eclipse.bpel.jboss.riftsaw.runtime.RiftsawBPELPublisher"
+ id="org.eclipse.bpel.jboss.riftsaw.runtime.publisher" />
+ </extension>
+
+ <extension point="org.eclipse.wst.server.core.runtimeTypes">
+ <runtimeType
+ id="org.eclipse.bpel.jboss.riftsaw.runtime.rt"
+ name="JBoss Riftsaw 2.x"
+ description="JBoss Riftsaw 2.x WS-BPEL execution engine - Runtime"
+ vendor="JBoss Community"
+ version="2.2"
+ class="org.eclipse.bpel.jboss.riftsaw.runtime.RiftsawServerRuntime">
+ <moduleType
+ types="bpel.module"
+ versions="1.1, 2.0"/>
+ <moduleType
+ types="jbt.bpel.module"
+ versions="1.1, 2.0"/>
+ </runtimeType>
+ </extension>
+
+ <extension point="org.eclipse.wst.server.core.serverTypes">
+ <serverType
+ runtime="true"
+ class="org.eclipse.jst.server.generic.core.internal.GenericServer"
+ id="org.eclipse.bpel.jboss.riftsaw.runtime.st"
+ initialState="stopped"
+ supportsRemoteHosts="true"
+ runtimeTypeId="org.eclipse.bpel.jboss.riftsaw.runtime.rt"
+ description="JBoss Riftsaw 2.x WS-BPEL execution engine - Server"
+ launchConfigId="org.eclipse.jst.server.generic.core.launchConfigurationType"
+ behaviourClass="org.eclipse.jst.server.generic.core.internal.GenericServerBehaviour"
+ name="JBoss Riftsaw 2.x Server"
+ hasConfiguration="false"
+ startTimeout="480000"
+ stopTimeout="60000"
+ launchModes="run, debug"
+ startBeforePublish="true">
+ </serverType>
+ </extension>
+
+ <extension point="org.eclipse.wst.server.ui.serverImages">
+ <image
+ id="org.eclipse.jst.server.generic.image"
+ icon="icons/obj16/riftsaw.gif"
+ typeIds="org.eclipse.bpel.jboss.riftsaw.runtime.rt"/>
+ <image
+ id="org.eclipse.jst.server.generic.image"
+ icon="icons/obj16/riftsaw.gif"
+ typeIds="org.eclipse.bpel.jboss.riftsaw.runtime.st" />
+ </extension>
+
+ <extension point="org.eclipse.wst.common.project.facet.core.runtimes">
+ <runtime-component-type
+ id="org.eclipse.bpel.jboss.riftsaw.runtime.rt"/>
+
+ <runtime-component-version
+ type="org.eclipse.bpel.jboss.riftsaw.runtime.rt"
+ version="2.0" />
+
+ <adapter>
+ <runtime-component
+ id="org.eclipse.bpel.jboss.riftsaw.runtime.rt"/>
+ <factory
+ class="org.eclipse.jst.server.core.internal.RuntimeClasspathProvider$Factory" />
+ <type
+ class="org.eclipse.jst.common.project.facet.core.IClasspathProvider" />
+ </adapter>
+
+ <supported>
+ <runtime-component
+ id="org.eclipse.bpel.jboss.riftsaw.runtime.rt"
+ version="2.0" />
+ <facet
+ id="bpel.facet.core"
+ version="2.0"/>
+ </supported>
+
+ <supported>
+ <runtime-component
+ id="org.eclipse.bpel.jboss.riftsaw.runtime.rt"
+ version="2.0"/>
+ <facet
+ id="jbt.bpel.facet.core"
+ version="1.1,2.0"/>
+ </supported>
+
+ </extension>
+
+ <extension point="org.eclipse.wst.common.project.facet.ui.images">
+ <image
+ runtime-component-type="org.eclipse.bpel.jboss.riftsaw.runtime.rt"
+ path="icons/obj16/riftsaw.gif"/>
+ </extension>
+
+ <extension point="org.eclipse.wst.common.project.facet.core.runtimes">
+ <adapter>
+ <runtime-component
+ id="org.eclipse.bpel.jboss.riftsaw.runtime.rt" />
+ <factory
+ class="org.eclipse.jst.server.ui.internal.RuntimeLabelProvider$Factory" />
+ <type
+ class="org.eclipse.wst.common.project.facet.ui.IRuntimeComponentLabelProvider" />
+ </adapter>
+ </extension>
+
+ <extension point="org.eclipse.jst.server.core.runtimeFacetMappings">
+ <runtimeFacetMapping
+ runtimeTypeId="org.eclipse.bpel.jboss.riftsaw.runtime.rt"
+ runtime-component="org.eclipse.bpel.jboss.riftsaw.runtime.rt"
+ version="2.0"/>
+
+ <runtimeFacetMapping
+ runtimeTypeId="org.jboss.ide.eclipse.as.runtime.51"
+ runtime-component="org.jboss.ide.eclipse.as.runtime.component"
+ version="5.1"/>
+ </extension>
+
+ <extension point="org.eclipse.jst.server.generic.core.serverdefinition">
+ <serverdefinition
+ id="org.eclipse.bpel.jboss.riftsaw.runtime.rt"
+ definitionfile="definition/riftsaw.xml">
+ </serverdefinition>
+ </extension>
+
+ <extension point="org.eclipse.wst.server.ui.wizardFragments">
+ <fragment
+ id="org.eclipse.jst.server.generic.runtime"
+ typeIds="org.eclipse.bpel.jboss.riftsaw.runtime.rt"
+ class="org.eclipse.jst.server.generic.ui.internal.GenericServerRuntimeWizardFragment" />
+ <fragment
+ id="org.eclipse.jst.server.generic.server"
+ typeIds="org.eclipse.bpel.jboss.riftsaw.runtime.st"
+ class="org.eclipse.jst.server.generic.ui.internal.GenericServerWizardFragment" />
+ </extension>
+
+</plugin>
Added: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/pom.xml
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/pom.xml (rev 0)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/pom.xml 2011-02-22 18:05:19 UTC (rev 29266)
@@ -0,0 +1,13 @@
+<project
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools.bpel.plugins</groupId>
+ <artifactId>org.eclipse.bpel.jboss.riftsaw.runtime</artifactId>
+ <version>0.4.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+</project>
Added: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawBPELPublisher.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawBPELPublisher.java (rev 0)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawBPELPublisher.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -0,0 +1,82 @@
+package org.eclipse.bpel.jboss.riftsaw.runtime;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.bpel.runtimes.publishers.GenericBPELPublisher;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jst.server.core.PublishUtil;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IModuleArtifact;
+import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.server.core.model.IModuleResource;
+import org.eclipse.wst.server.core.model.ModuleDelegate;
+
+public class RiftsawBPELPublisher extends GenericBPELPublisher {
+
+ public RiftsawBPELPublisher() {
+ super();
+ }
+
+ @Override
+ public IStatus[] publish(IModuleArtifact[] artifacts, IProgressMonitor monitor) {
+ // resources will always be null for some weird reason :(
+ // therefore we generate a BPELModuleArtifact
+ // the module id value enables us to get BPEL file path relative to its project
+ IModule[] modules = super.getModule();
+
+ try {
+ IModule last = modules[modules.length-1];
+ IPath root = createDeploymentDestination(last);
+ ModuleDelegate delegate = (ModuleDelegate)last.loadAdapter(ModuleDelegate.class, new NullProgressMonitor());
+ IModuleResource[] resources = delegate.members();
+ PublishUtil.publishFull(resources, root, monitor);
+ } catch( CoreException ce ) {
+ // TODO return bad status
+ }
+ return new IStatus[]{Status.OK_STATUS};
+
+ }
+
+ @Override
+ public IStatus[] unpublish(IProgressMonitor monitor) {
+ IModule[] modules = super.getModule();
+ IModule last = modules[modules.length - 1];
+ IStatus[] result = new Status[modules.length];
+ IPath root = createDeploymentDestination(last);
+ PublishUtil.deleteDirectory(root.toFile(), monitor);
+ return result;
+ }
+
+ /**
+ * This method will create a folder inside the WEB-INF\processes subfolder
+ * of the ODE installation
+ */
+ protected IPath createDeploymentDestination(IModule module) {
+ String moduleName = module.getName();
+ String deployAppName = moduleName;
+
+ // get RIFTSAW_HOME
+ IRuntime serverDef = getServerRuntime().getRuntime();
+ IPath jbossHome = serverDef.getLocation();
+ Map m = getServerRuntime().getServerInstanceProperties();
+ String config = (String)m.get("serverConfig");
+ String home = (String)m.get("jboss.home");
+
+ // append Process name
+ IPath deployTarget = jbossHome.removeLastSegments(1).append("server").append(config).append("deploy").append(deployAppName);
+
+ File f = deployTarget.toFile();
+ if (!f.exists()) {
+ f.mkdir();
+ }
+
+ return deployTarget;
+ }
+}
Added: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawPlugin.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawPlugin.java (rev 0)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawPlugin.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -0,0 +1,142 @@
+/*******************************************************************************
+ * Copyright (c) 2006 University College London Software Systems Engineering
+ * All rights reserved. This program and the accompanying materials
+ * are 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:
+ * Bruno Wassermann - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.bpel.jboss.riftsaw.runtime;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.eclipse.bpel.runtimes.IRuntimesUIConstants;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The main plugin class to be used in the desktop.
+ */
+public class RiftsawPlugin extends AbstractUIPlugin {
+
+ public static final String PLUGIN_ID = "org.eclipse.bpel.jboss.riftsaw.runtime"; //$NON-NLS-1$
+
+ //The shared instance.
+ private static RiftsawPlugin plugin;
+
+ private boolean imagesInitialized = false;
+
+ /**
+ * The constructor.
+ */
+ public RiftsawPlugin() {
+ super();
+ plugin = this;
+ }
+
+ /**
+ * This method is called upon plug-in activation
+ */
+ @Override
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ }
+
+ /**
+ * This method is called when the plug-in is stopped
+ */
+ @Override
+ public void stop(BundleContext context) throws Exception {
+ super.stop(context);
+ plugin = null;
+ }
+
+ /**
+ * Returns the shared instance.
+ *
+ * @return the shared instance.
+ */
+ public static RiftsawPlugin getPlugin() {
+ return plugin;
+ }
+
+ @Override
+ public ImageRegistry getImageRegistry() {
+ ImageRegistry result = super.getImageRegistry();
+ initialize();
+ return result;
+ }
+
+ /**
+ * Returns the image descriptor for the given image ID.
+ * Returns null if there is no such image.
+ */
+ public ImageDescriptor getImageDescriptor(String id) {
+ return getImageRegistry().getDescriptor(id);
+ }
+
+ public Image getImage(String id) {
+ return getImageRegistry().get(id);
+ }
+
+ /**
+ * Creates an image descriptor and places it in the image registry.
+ */
+ private void createImageDescriptor(String id, URL baseURL) {
+ URL url = null;
+ try {
+ url = new URL(baseURL, IRuntimesUIConstants.ICON_PATH + id);
+ } catch (MalformedURLException e) {
+ RiftsawPlugin.log(e);
+ }
+ ImageDescriptor desc = ImageDescriptor.createFromURL(url);
+ getImageRegistry().put(id, desc);
+ }
+
+ protected void initialize() {
+ if (!imagesInitialized) {
+ imagesInitialized = true;
+ initializeImages();
+ }
+ }
+
+ /**
+ * Initializes the table of images used in this plugin.
+ */
+ private void initializeImages() {
+ URL baseURL = getBundle().getEntry("/"); //$NON-NLS-1$
+
+ // TODO make sure you initialize all required icons here
+ createImageDescriptor(IRuntimesUIConstants.ICON_NEWPRJ_WIZARD_BANNER, baseURL);
+ createImageDescriptor(IRuntimesUIConstants.ICON_BPEL_NEW_PRJ, baseURL);
+ createImageDescriptor(IRuntimesUIConstants.ICON_BPEL_PRJ, baseURL);
+ }
+
+ /**
+ * Utility methods for logging exceptions.
+ */
+ public static void log(Exception e, int severity) {
+ IStatus status = null;
+ if (e instanceof CoreException) {
+ status = ((CoreException)e).getStatus();
+ } else {
+ String m = e.getMessage();
+ status = new Status(severity, PLUGIN_ID, 0, m==null? "<no message>" : m, e); //$NON-NLS-1$
+ }
+ System.out.println(e.getClass().getName()+": "+status); //$NON-NLS-1$
+ RiftsawPlugin.getPlugin().getLog().log(status);
+ }
+
+ public static void log(Exception e) {
+ log(e, IStatus.ERROR);
+ }
+}
Added: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawServerRuntime.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawServerRuntime.java (rev 0)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawServerRuntime.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -0,0 +1,27 @@
+package org.eclipse.bpel.jboss.riftsaw.runtime;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.jst.server.generic.core.internal.GenericServerRuntime;
+import org.eclipse.bpel.runtimes.IBPELRuntimeDelegate;
+
+public class RiftsawServerRuntime extends GenericServerRuntime implements IBPELRuntimeDelegate {
+
+ public String getServerAddress()
+ {
+ Map m = getAttribute("generic_server_instance_properties", new HashMap());
+ return (String)m.get("serverAddress");
+ }
+
+ public String getPort()
+ {
+ Map m = getAttribute("generic_server_instance_properties", new HashMap());
+ return (String)m.get("port");
+ }
+
+ public String getDeployDir()
+ {
+ return "";
+ }
+}
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF 2011-02-22 18:05:19 UTC (rev 29266)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.model; singleton:=true
-Bundle-Version: 0.6.0.qualifier
+Bundle-Version: 0.7.0.qualifier
Bundle-Activator: org.eclipse.bpel.model.BPELPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -13,7 +13,7 @@
org.eclipse.wst.wsdl,
org.apache.xerces;bundle-version="[2.9.0,3.0.0)",
javax.wsdl;bundle-version="[1.5.0,1.6.0)",
- org.eclipse.bpel.common.model;bundle-version="[0.4.0,2.0.0)",
+ org.eclipse.bpel.common.model;bundle-version="[0.7.0,2.0.0)",
org.eclipse.wst.xml.core,
org.eclipse.wst.xml.ui,
org.eclipse.wst.xsd.ui
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/pom.xml
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/pom.xml 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/pom.xml 2011-02-22 18:05:19 UTC (rev 29266)
@@ -1,13 +1,13 @@
-<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools.bpel.plugins</groupId>
+ <groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.eclipse.bpel.model</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.7.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
-</project>
+</project>
\ No newline at end of file
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/model/bpel.ecore
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/model/bpel.ecore 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/model/bpel.ecore 2011-02-22 18:05:19 UTC (rev 29266)
@@ -1,590 +1,590 @@
-<?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" 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="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>
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/BPELPackage.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/BPELPackage.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/BPELPackage.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -4936,14 +4936,25 @@
*/
int ON_EVENT__MESSAGE_TYPE = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 6;
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=336003
+ // https://issues.jboss.org/browse/JBIDE-8305
+ // "element" attribute was missing from original model
/**
+ * The feature id for the '<em><b>XSD Element</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int ON_EVENT__XSD_ELEMENT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 7;
+ /**
* The feature id for the '<em><b>Correlation Sets</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int ON_EVENT__CORRELATION_SETS = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 7;
+ int ON_EVENT__CORRELATION_SETS = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 8;
/**
* The feature id for the '<em><b>From Parts</b></em>' containment reference.
@@ -4952,7 +4963,7 @@
* @generated
* @ordered
*/
- int ON_EVENT__FROM_PARTS = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 8;
+ int ON_EVENT__FROM_PARTS = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 9;
/**
* The feature id for the '<em><b>Message Exchange</b></em>' reference.
@@ -4961,7 +4972,7 @@
* @generated
* @ordered
*/
- int ON_EVENT__MESSAGE_EXCHANGE = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 9;
+ int ON_EVENT__MESSAGE_EXCHANGE = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 10;
/**
* The number of structural features of the '<em>On Event</em>' class.
@@ -4970,7 +4981,7 @@
* @generated
* @ordered
*/
- int ON_EVENT_FEATURE_COUNT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 10;
+ int ON_EVENT_FEATURE_COUNT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 11;
/**
* The feature id for the '<em><b>Documentation Element</b></em>' attribute.
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/OnEvent.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/OnEvent.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/OnEvent.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -17,6 +17,7 @@
import org.eclipse.wst.wsdl.Message;
import org.eclipse.wst.wsdl.Operation;
import org.eclipse.wst.wsdl.PortType;
+import org.eclipse.xsd.XSDElementDeclaration;
/**
* <!-- begin-user-doc -->
@@ -223,6 +224,34 @@
*/
void setMessageType(Message value);
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=336003
+ // https://issues.jboss.org/browse/JBIDE-8305
+ // "element" attribute was missing from original model
+ /**
+ * Returns the value of the '<em><b>XSD Element</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>XSD Element</em>' reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>XSDElementDeclaration Type</em>' reference.
+ * @see #setXSDElement(XSDElementDeclaration)
+ * @see org.eclipse.bpel.model.BPELPackage#getOnEvent_XSDElement()
+ * @model required="true"
+ * @generated
+ */
+ XSDElementDeclaration getXSDElement();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.bpel.model.OnEvent#getXSDElement <em>XSDElementDeclaration Type</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>XSDElementDeclaration Type</em>' reference.
+ * @see #getXSDElement()
+ * @generated
+ */
+ void setXSDElement(XSDElementDeclaration value);
/**
* Returns the value of the '<em><b>Correlation Sets</b></em>' containment reference.
* <!-- begin-user-doc -->
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/BPELActivityDeserializer.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/BPELActivityDeserializer.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/BPELActivityDeserializer.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -31,6 +31,9 @@
/**
* This method deserializes elements into instances of classes
* which implement the Activity interface.
+ * https://bugs.eclipse.org/bugs/show_bug.cgi?id=334424
+ * https://issues.jboss.org/browse/JBIDE-8132
+ * Client needs to use the activity if not null
*/
- public Activity unmarshall(QName elementType, Node node, Process process, Map nsMap, ExtensionRegistry extReg, URI uri, BPELReader bpelReader);
+ public Activity unmarshall(QName elementType, Node node, Activity activity, Process process, Map nsMap, ExtensionRegistry extReg, URI uri, BPELReader bpelReader);
}
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BPELPackageImpl.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BPELPackageImpl.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BPELPackageImpl.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -3448,6 +3448,10 @@
createEReference(onEventEClass, ON_EVENT__OPERATION);
createEReference(onEventEClass, ON_EVENT__PORT_TYPE);
createEReference(onEventEClass, ON_EVENT__MESSAGE_TYPE);
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=336003
+ // https://issues.jboss.org/browse/JBIDE-8305
+ // "element" attribute was missing from original model
+ createEReference(onEventEClass, ON_EVENT__XSD_ELEMENT);
createEReference(onEventEClass, ON_EVENT__CORRELATION_SETS);
createEReference(onEventEClass, ON_EVENT__FROM_PARTS);
createEReference(onEventEClass, ON_EVENT__MESSAGE_EXCHANGE);
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/OnEventImpl.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/OnEventImpl.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/OnEventImpl.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -35,6 +35,7 @@
import org.eclipse.wst.wsdl.Message;
import org.eclipse.wst.wsdl.Operation;
import org.eclipse.wst.wsdl.PortType;
+import org.eclipse.xsd.XSDElementDeclaration;
/**
* <!-- begin-user-doc -->
@@ -128,6 +129,16 @@
* @ordered
*/
protected Message messageType;
+
+ /**
+ * The cached value of the '{@link #getXSDElement() <em>XSD Element</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getXSDElement()
+ * @generated
+ * @ordered
+ */
+ protected XSDElementDeclaration xsdElement;
/**
* The cached value of the '{@link #getCorrelationSets() <em>Correlation Sets</em>}' containment reference.
@@ -589,6 +600,59 @@
eNotify(new ENotificationImpl(this, Notification.SET,
BPELPackage.ON_EVENT__MESSAGE_TYPE, oldMessageType,
messageType));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * https://bugs.eclipse.org/bugs/show_bug.cgi?id=336003
+ * https://issues.jboss.org/browse/JBIDE-8305
+ * "element" attribute was missing from original model
+ * <!-- end-user-doc -->
+ * @customized
+ */
+ public XSDElementDeclaration getXSDElement() {
+ Variable variable = getVariable();
+ if (variable != null && variable instanceof Variable) {
+ return (variable).getXSDElement();
+ }
+ if (xsdElement != null && xsdElement.eIsProxy()) {
+ XSDElementDeclaration oldXSDElement = xsdElement;
+ xsdElement = (XSDElementDeclaration) eResolveProxy((InternalEObject) xsdElement);
+ if (xsdElement != oldXSDElement) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+ BPELPackage.ON_EVENT__XSD_ELEMENT, oldXSDElement,
+ xsdElement));
+ }
+ }
+ return xsdElement;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public XSDElementDeclaration basicGetXSDElement() {
+ return xsdElement;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @customized
+ */
+ public void setXSDElement(XSDElementDeclaration newXSDElement) {
+ Variable variable = getVariable();
+ if (variable != null && variable instanceof Variable) {
+ (variable).setXSDElement(newXSDElement);
+ }
+ XSDElementDeclaration oldXSDElement = xsdElement;
+ xsdElement = newXSDElement;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET,
+ BPELPackage.ON_EVENT__XSD_ELEMENT, oldXSDElement,
+ xsdElement));
}
/**
@@ -809,6 +873,11 @@
if (resolve)
return getMessageType();
return basicGetMessageType();
+ case BPELPackage.ON_EVENT__XSD_ELEMENT:
+ // https://issues.jboss.org/browse/JBIDE-8305
+ if (resolve)
+ return getXSDElement();
+ return basicGetXSDElement();
case BPELPackage.ON_EVENT__CORRELATION_SETS:
return getCorrelationSets();
case BPELPackage.ON_EVENT__FROM_PARTS:
@@ -851,6 +920,10 @@
case BPELPackage.ON_EVENT__MESSAGE_TYPE:
setMessageType((Message) newValue);
return;
+ case BPELPackage.ON_EVENT__XSD_ELEMENT:
+ // https://issues.jboss.org/browse/JBIDE-8305
+ setXSDElement((XSDElementDeclaration) newValue);
+ return;
case BPELPackage.ON_EVENT__CORRELATION_SETS:
setCorrelationSets((CorrelationSets) newValue);
return;
@@ -892,6 +965,10 @@
return;
case BPELPackage.ON_EVENT__MESSAGE_TYPE:
setMessageType((Message) null);
+ return;
+ case BPELPackage.ON_EVENT__XSD_ELEMENT:
+ // https://issues.jboss.org/browse/JBIDE-8305
+ setXSDElement((XSDElementDeclaration) null);
return;
case BPELPackage.ON_EVENT__CORRELATION_SETS:
setCorrelationSets((CorrelationSets) null);
@@ -928,6 +1005,9 @@
return portType != null;
case BPELPackage.ON_EVENT__MESSAGE_TYPE:
return messageType != null;
+ case BPELPackage.ON_EVENT__XSD_ELEMENT:
+ // https://issues.jboss.org/browse/JBIDE-8305
+ return xsdElement != null;
case BPELPackage.ON_EVENT__CORRELATION_SETS:
return correlationSets != null;
case BPELPackage.ON_EVENT__FROM_PARTS:
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELReader.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELReader.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELReader.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -829,6 +829,20 @@
QName qName = BPELUtils.createAttributeValue(activityElement, "messageType");
Message messageType = new MessageProxy(getResource().getURI(), qName);
onEvent.setMessageType(messageType);
+ }
+
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=336003
+ // https://issues.jboss.org/browse/JBIDE-8305
+ // "element" attribute was missing from original model
+ // Set xsd element
+ if (activityElement.hasAttribute("element")) {
+ QName qName = BPELUtils.createAttributeValue(activityElement,
+ "element");
+ XSDElementDeclaration element = new XSDElementDeclarationProxy(
+ getResource().getURI(), qName);
+ onEvent.setXSDElement(element);
+ } else {
+ onEvent.setXSDElement(null);
}
// Set correlations
@@ -2352,48 +2366,50 @@
/**
* Converts an XML extensionactivity element to a BPEL ExtensionActivity object.
*/
- protected Activity xml2ExtensionActivity(Element extensionActivityElement) {
- // Do not call setStandardAttributes here because extensionActivityElement
- // doesn't have them.
+ protected Activity xml2ExtensionActivity(Element extensionActivityElement) {
+ // Do not call setStandardAttributes here because extensionActivityElement
+ // doesn't have them.
+ Activity extensionActivity = BPELFactory.eINSTANCE.createExtensionActivity();
+
+ // Find the child element.
+ List<Element> nodeList = getChildElements(extensionActivityElement);
+
+ if (nodeList.size() == 1) {
+ Element child = nodeList.get(0);
+ // We found a child element. Look up a deserializer for this
+ // activity and call it.
+ String localName = child.getLocalName();
+ String namespace = child.getNamespaceURI();
+ QName qname = new QName(namespace, localName);
+ BPELActivityDeserializer deserializer = extensionRegistry.getActivityDeserializer(qname);
+ if (deserializer != null) {
+ // Deserialize the DOM element and return the new Activity
+ Map<String,String> nsMap = getAllNamespacesForElement(child);
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=334424
+ // https://issues.jboss.org/browse/JBIDE-8132
+ extensionActivity = deserializer.unmarshall(qname,child,extensionActivity,process,nsMap,extensionRegistry, getResource().getURI(), this);
+ // Now let's do the standard attributes and elements
+ setStandardAttributes(child, extensionActivity);
+ setStandardElements(child, extensionActivity);
+
+ // Don't do extensibility because extensionActivity is not extensible.
+ // If individual extensionActivity subclasses are actually extensible, they
+ // have to do this themselves in their deserializer.
+
+ // The created Activity that extends from ExtensioActivity should get the
+ // whole <extensionActivity>-DOM-Fragment, this is done here.
+ extensionActivity.setElement(extensionActivityElement);
+ return extensionActivity;
+ }
+ }
+ // Fallback is to create a new extensionActivity.
+ // Bugzilla 324115
+ setStandardAttributes(extensionActivityElement, extensionActivity);
+ setStandardElements(extensionActivityElement, extensionActivity);
+ extensionActivity.setElement(extensionActivityElement);
+ return extensionActivity;
+ }
- // Find the child element.
- List<Element> nodeList = getChildElements(extensionActivityElement);
-
- if (nodeList.size() == 1) {
- Element child = nodeList.get(0);
- // We found a child element. Look up a deserializer for this
- // activity and call it.
- String localName = child.getLocalName();
- String namespace = child.getNamespaceURI();
- QName qname = new QName(namespace, localName);
- BPELActivityDeserializer deserializer = extensionRegistry.getActivityDeserializer(qname);
- if (deserializer != null) {
- // Deserialize the DOM element and return the new Activity
- Map<String,String> nsMap = getAllNamespacesForElement(child);
- Activity activity = deserializer.unmarshall(qname,child,process,nsMap,extensionRegistry,getResource().getURI(), this);
- // Now let's do the standard attributes and elements
- setStandardAttributes(child, activity);
- setStandardElements(child, activity);
-
- // Don't do extensibility because extensionActivity is not extensible.
- // If individual extensionActivity subclasses are actually extensible, they
- // have to do this themselves in their deserializer.
-
- // The created Activity that extends from ExtensioActivity should get the
- // whole <extensionActivity>-DOM-Fragment, this is done here.
- activity.setElement(extensionActivityElement);
- return activity;
- }
- }
- // Fallback is to create a new extensionActivity.
- // https://jira.jboss.org/browse/JBIDE-6917
- Activity activity = BPELFactory.eINSTANCE.createExtensionActivity();
- setStandardAttributes(extensionActivityElement, activity);
- setStandardElements(extensionActivityElement, activity);
- activity.setElement(extensionActivityElement);
- return activity;
- }
-
/**
* Converts an XML wait element to a BPEL Wait object.
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELWriter.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELWriter.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELWriter.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -1332,15 +1332,18 @@
QName qName = new QName(namespace, localName);
BPELActivitySerializer serializer = extensionRegistry
.getActivitySerializer(qName);
+ DocumentFragment fragment = null;
if (serializer != null) {
- DocumentFragment fragment = document.createDocumentFragment();
+ fragment = document.createDocumentFragment();
serializer.marshall(qName, activity, fragment, getProcess(), this);
- Element child = (Element) fragment.getFirstChild();
- activityElement.appendChild(child);
- // Standard attributes
- addStandardAttributes(child, activity);
- // Standard elements
- addStandardElements(child, activity);
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=335458
+ // https://issues.jboss.org/browse/JBIDE-8246
+ // Only append Element nodes generated by the serializer
+ // XML beautification is handled by the ElementPlacer class
+ Element child = getFirstChildElement(fragment);
+ if (child!=null) {
+ activityElement.appendChild(child);
+ }
}
return activityElement;
@@ -1634,7 +1637,8 @@
serializer.marshall(ExtensibleElement.class, qname,
extensibilityElement, fragment, getProcess(),
extensionRegistry, this);
- Element child = (Element) fragment.getFirstChild();
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=335458
+ Element child = getFirstChildElement(fragment);
return child;
} catch (WSDLException e) {
throw new WrappedException(e);
@@ -1648,7 +1652,9 @@
DocumentFragment fragment = document.createDocumentFragment();
serializer.marshall(value, fragment, getProcess(), serviceRef
.eContainer(), this);
- Element child = (Element) fragment.getFirstChild();
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=335458
+ // https://issues.jboss.org/browse/JBIDE-8246
+ Element child = getFirstChildElement(fragment);
return child;
} else {
CDATASection cdata = BPELUtils.createCDATASection(document,
@@ -2072,6 +2078,13 @@
onEventElement.setAttribute("messageType", qNameToString(onEvent,
onEvent.getMessageType().getQName()));
}
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=336003
+ // https://issues.jboss.org/browse/JBIDE-8305
+ // "element" attribute was missing from original model
+ if (onEvent.getXSDElement() != null) {
+ onEventElement.setAttribute("element",
+ onEvent.getXSDElement().getQName());
+ }
if (onEvent.getCorrelationSets() != null) {
onEventElement.appendChild(correlationSets2XML(onEvent
.getCorrelationSets()));
@@ -2363,12 +2376,15 @@
.marshall(ExtensibleElement.class, qname,
extensibilityElement, fragment, getProcess(),
extensionRegistry, this);
- return (Element) fragment.getFirstChild();
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=335458
+ // https://issues.jboss.org/browse/JBIDE-8246
+ Element child = getFirstChildElement(fragment);
+ return child;
} catch (WSDLException e) {
throw new WrappedException(e);
}
}
-
+
protected Element createBPELElement(String tagName) {
String namespaceURI = null;
@@ -2467,4 +2483,17 @@
return addNewRootPrefix("ns", namespace) + ":" + qname.getLocalPart();
}
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=335458
+ // https://issues.jboss.org/browse/JBIDE-8246
+ private Element getFirstChildElement(DocumentFragment fragment) {
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=335458
+ // first child may be a TEXT Node (e.g. whitespace)
+ Node child = fragment.getFirstChild();
+ while (child != null && !(child instanceof Element)) {
+ child = child.getNextSibling();
+ }
+ if (child instanceof Element)
+ return (Element) child;
+ throw new IllegalArgumentException("Document Fragment does not contain any Elements");
+ }
}
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/BPELConstants.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/BPELConstants.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/BPELConstants.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -31,11 +31,11 @@
/** The default query language */
- static final String XMLNS_XPATH_QUERY_LANGUAGE_2007 = "urn:oasis:names:tc:wsbpel:2.0:sublang:xpath1.0";
+ public static final String XMLNS_XPATH_QUERY_LANGUAGE_2007 = "urn:oasis:names:tc:wsbpel:2.0:sublang:xpath1.0";
+
+ /** The "old" default query language */
+ public static final String XMLNS_XPATH_QUERY_LANGUAGE_2004 = "http://www.w3.org/TR/1999/REC-xpath-19991116";
- /** The "old" default query language */
- static final String XMLNS_XPATH_QUERY_LANGUAGE_2004 = "http://www.w3.org/TR/1999/REC-xpath-19991116";
-
/** The current query language */
public static final String XMLNS_XPATH_QUERY_LANGUAGE = XMLNS_XPATH_QUERY_LANGUAGE_2007;
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ElementPlacer.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ElementPlacer.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ElementPlacer.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -214,23 +214,37 @@
// DO:
// Format children of the newChild.
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=335458
+ // traverse the child's descendants also, inserting the
+ // proper indentation for each
+ StringBuffer childIndent = new StringBuffer(indent);
+ Node nextNewChild = newChild;
Node innerChild = newChild.getFirstChild();
- if (innerChild != null) {
+ while (innerChild != null) {
// add "\n" + indent before every child
- while (innerChild != null) {
- if (innerChild.getNodeType() == Node.TEXT_NODE) {
+ Node nextInnerChild = innerChild;
+ while (nextInnerChild != null) {
+ boolean textNodeIsWhitespaceOnly = false;
+ if (nextInnerChild instanceof Text) {
+ String content = ((Text)nextInnerChild).getData();
+ textNodeIsWhitespaceOnly = (content==null || "".equals(content.trim()));
+ }
+ if (textNodeIsWhitespaceOnly) {
// remove an old indentation
- newChild.removeChild(innerChild);
+ nextNewChild.removeChild(nextInnerChild);
} else {
- newChild.insertBefore(newChild.getOwnerDocument()
- .createTextNode("\n" + indent + " "),
- innerChild);
+ nextNewChild.insertBefore(nextNewChild.getOwnerDocument()
+ .createTextNode("\n" + childIndent + " "),
+ nextInnerChild);
}
- innerChild = innerChild.getNextSibling();
+ nextInnerChild = nextInnerChild.getNextSibling();
}
// add "\n" after the last child
- newChild.appendChild(newChild.getOwnerDocument()
- .createTextNode("\n" + indent + " "));
+ nextNewChild.appendChild(nextNewChild.getOwnerDocument()
+ .createTextNode("\n" + childIndent + " "));
+ childIndent.append(" ");
+ nextNewChild = innerChild;
+ innerChild = innerChild.getFirstChild();
}
if (referenceChild != null) {
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationBPELReader.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationBPELReader.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationBPELReader.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -812,7 +812,21 @@
onEvent.setMessageType(null);
}
- // Set correlations
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=336003
+ // https://issues.jboss.org/browse/JBIDE-8305
+ // "element" attribute was missing from original model
+ // Set xsd element
+ if (activityElement.hasAttribute("element")) {
+ QName qName = BPELUtils.createAttributeValue(activityElement,
+ "element");
+ XSDElementDeclaration element = new XSDElementDeclarationProxy(
+ getResource().getURI(), qName);
+ onEvent.setXSDElement(element);
+ } else {
+ onEvent.setXSDElement(null);
+ }
+
+ // Set correlations
Element correlationsElement = ReconciliationHelper
.getBPELChildElementByLocalName(activityElement, "correlations");
if (correlationsElement != null && onEvent.getCorrelations() == null) {
@@ -1757,11 +1771,13 @@
} else if (localName.equals("rethrow")) {
activity = xml2Rethrow(activity, activityElement);
} else if (localName.equals("extensionActivity")) {
- // extensionActivity is a special case. It does not have any
- // standard
- // attributes or elements, nor is it an extensible element.
- // Return immediately.
- activity = xml2ExtensionActivity(activityElement);
+ // extensionActivity is a special case. It does not have any
+ // standard attributes or elements, nor is it an extensible
+ // element. Return immediately.
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=334424
+ // https://issues.jboss.org/browse/JBIDE-8132
+ // Need to pass the activity in to the deserializer
+ activity = xml2ExtensionActivity(activity,activityElement);
return activity;
} else if (localName.equals("opaqueActivity")) {
activity = xml2OpaqueActivity(activity, activityElement);
@@ -2689,9 +2705,10 @@
/**
* Converts an XML extensionactivity element to a BPEL ExtensionActivity
- * object.
+ * object.
*/
- protected Activity xml2ExtensionActivity(Element extensionActivityElement) {
+ protected Activity xml2ExtensionActivity(Activity extensionActivity,
+ Element extensionActivityElement) {
// Do not call setStandardAttributes here because
// extensionActivityElement
// doesn't have them.
@@ -2710,27 +2727,29 @@
.getActivityDeserializer(qname);
if (deserializer != null) {
// Deserialize the DOM element and return the new Activity
- Map<String, String> nsMap = getAllNamespacesForElement(child);
- Activity activity = deserializer.unmarshall(qname, child,
- process, nsMap, extensionRegistry, getResource()
+ Map<String, String> nsMap = getAllNamespacesForElement(child);
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=334424
+ // https://issues.jboss.org/browse/JBIDE-8132
+ // pass the activity that was already created to the serializer
+ extensionActivity = deserializer.unmarshall(qname, child,
+ extensionActivity, process, nsMap, extensionRegistry, getResource()
.getURI(), this);
- // Now let's do the standard attributes and elements
- setStandardAttributes(child, activity);
- setStandardElements(child, activity);
-
- // Don't do extensibility because extensionActivity is not
- // extensible.
- // If individual extensionActivity subclasses are actually
- // extensible, they
- // have to do this themselves in their deserializer.
-
- // The created Activity that extends from ExtensioActivity
- // should get the
- // whole <extensionActivity>-DOM-Fragment, this is done here.
- activity.setElement(extensionActivityElement);
-
- return activity;
+ setStandardAttributes(child, extensionActivity);
+ setStandardElements(child, extensionActivity);
+
+ // Don't do extensibility because extensionActivity is not
+ // extensible.
+ // If individual extensionActivity subclasses are actually
+ // extensible, they
+ // have to do this themselves in their deserializer.
+
+ // The created Activity that extends from ExtensioActivity
+ // should get the
+ // whole <extensionActivity>-DOM-Fragment, this is done here.
+ extensionActivity.setElement(extensionActivityElement);
+
+ return extensionActivity;
}
}
// Fallback is to create a new extensionActivity.
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationHelper.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationHelper.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationHelper.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -211,6 +211,14 @@
reader.xml2Target((Target)element, changedElement);
} else if (element instanceof Targets){
reader.xml2Targets((Targets)element, changedElement);
+ } else if (element instanceof CompensationHandler){
+ // https://issues.jboss.org/browse/JBIDE-8048
+ // this was left out inadevertently
+ reader.xml2CompensationHandler((CompensationHandler)element, changedElement);
+ } else if (element instanceof ExtensibleElement){
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=334424
+ // https://issues.jboss.org/browse/JBIDE-8132
+ reader.xml2ExtensibleElement((ExtensibleElement)element, changedElement);
} else {
System.err.println("Cannot reconcile: " + element.getClass());
// throw new NotImplementedException(element.getClass().toString());
@@ -683,8 +691,29 @@
return;
}
if (parseElement == null) {
- System.err.println("trying to replace attribute on null element:" + element.getClass());
- return;
+ // https://issues.jboss.org/browse/JBIDE-8048
+ // Hack to allow setting an implicit variable's attributes for OnEvent, Catch.
+ // These are not real Variable objects (i.e. they are not XML elements like
+ // real <variable>'s). To do this right, we really should define an
+ // ImplicitVariable model object instead of reusing Variable objects inside
+ // OnEvent and Catch...
+ EObject parent = element.eContainer();
+ if (parent instanceof OnEvent || parent instanceof Catch) {
+ // ignore attempts to set attributes on the parent that aren't in the model
+ for ( EStructuralFeature feature : parent.eClass().getEAllStructuralFeatures()) {
+ if ( feature.getName().equals(attributeName)) {
+ parseElement = ((ExtensibleElement)parent).getElement();
+ break;
+ }
+ }
+ }
+ if (parseElement == null) {
+ System.err.println("trying to replace attribute " + "\"" + attributeName + "\"" +
+ " on null element " + element.getClass() + " contained in " +
+ (element.eContainer() == null ? null : element.eContainer().getClass())
+ );
+ return;
+ }
}
// This is a problem in eclipse3.6, if we use parseElement.getAttribute(attributeName) and the attribute is not in the parseElement,
@@ -744,10 +773,6 @@
if (isLoading(element)) {
return;
}
- if (element.getElement() == null) {
- System.err.println("trying to replace attribute on null element: " + element.getClass());
- return;
- }
replaceAttribute(element, attributeName, attributeValue == null ? null : ElementFactory.getInstance().createName(element, attributeValue));
}
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/XSDComparer.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/XSDComparer.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/XSDComparer.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -351,7 +351,7 @@
type = type.getBaseType();
}
while (!names.isEmpty()) {
- if (s.isEmpty())
+ if ("".equals(s))
s = names.pop();
else
s = s + ":" + names.pop();
@@ -369,8 +369,8 @@
return false;
}
if (name1.equals(name2)) {
- if (elem1.getTargetNamespace() == null || elem1.getTargetNamespace().isEmpty()
- && elem2.getTargetNamespace() == null || elem2.getTargetNamespace().isEmpty())
+ if (elem1.getTargetNamespace() == null || "".equals(elem1.getTargetNamespace())
+ && elem2.getTargetNamespace() == null || "".equals(elem2.getTargetNamespace()))
return true;
if (elem1.getTargetNamespace().equals(elem2.getTargetNamespace()))
@@ -447,7 +447,7 @@
public int getMinOccurs(XSDTerm term) {
String smin = term.getElement().getAttribute("minOccurs");
int min = 1;
- if (smin!=null && !smin.isEmpty()) {
+ if (smin!=null && !"".equals(smin)) {
try {
min = Integer.parseInt(smin);
} catch (NumberFormatException e) {
@@ -465,7 +465,7 @@
public int getMaxOccurs(XSDTerm term) {
String smax = term.getElement().getAttribute("maxOccurs");
int max = 1;
- if (smax!=null && !smax.isEmpty()) {
+ if (smax!=null && !"".equals(smax)) {
try {
max = Integer.parseInt(smax);
} catch (NumberFormatException e) {
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.runtimes/META-INF/MANIFEST.MF
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.runtimes/META-INF/MANIFEST.MF 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.runtimes/META-INF/MANIFEST.MF 2011-02-22 18:05:19 UTC (rev 29266)
@@ -1,33 +1,33 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.bpel.runtimes; singleton:=true
-Bundle-Version: 0.5.0.qualifier
-Bundle-Activator: org.eclipse.bpel.runtimes.RuntimesPlugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.server.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.web.ui;bundle-version="[1.1.200,2.0.0)",
- org.eclipse.wst.common.project.facet.ui;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.200,2.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,2.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.200,2.0.0)",
- org.eclipse.jst.server.generic.core;bundle-version="[1.0.305,2.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.100,3.0.0)",
- org.eclipse.debug.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.bpel.model;bundle-version="0.5.0",
- org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)",
- javax.wsdl;bundle-version="[1.5.0,1.6.0)",
- org.eclipse.wst.wsdl;bundle-version="[1.1.200,2.0.0)",
- org.eclipse.jst.common.frameworks
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.bpel.runtimes,
- org.eclipse.bpel.runtimes.facets,
- org.eclipse.bpel.runtimes.module,
- org.eclipse.bpel.runtimes.publishers,
- org.eclipse.bpel.runtimes.ui.wizards
-Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-Vendor: %providerName
+Bundle-SymbolicName: org.eclipse.bpel.runtimes; singleton:=true
+Bundle-Version: 0.7.0.qualifier
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Activator: org.eclipse.bpel.runtimes.RuntimesPlugin
+Bundle-ActivationPolicy: lazy
+Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.wst.server.core;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.wst.web.ui;bundle-version="[1.1.200,2.0.0)",
+ org.eclipse.wst.common.project.facet.ui;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.wst.common.modulecore;bundle-version="[1.1.200,2.0.0)",
+ org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,2.0.0)",
+ org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.200,2.0.0)",
+ org.eclipse.jst.server.generic.core;bundle-version="[1.0.305,2.0.0)",
+ org.eclipse.jem.util;bundle-version="[2.0.100,3.0.0)",
+ org.eclipse.debug.ui;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.bpel.model,
+ org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)",
+ javax.wsdl;bundle-version="[1.5.0,1.6.0)",
+ org.eclipse.wst.wsdl;bundle-version="[1.1.200,2.0.0)",
+ org.eclipse.jst.common.frameworks
+Export-Package: org.eclipse.bpel.runtimes,
+ org.eclipse.bpel.runtimes.facets,
+ org.eclipse.bpel.runtimes.module,
+ org.eclipse.bpel.runtimes.publishers,
+ org.eclipse.bpel.runtimes.ui.wizards
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.runtimes/plugin.properties
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.runtimes/plugin.properties 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.runtimes/plugin.properties 2011-02-22 18:05:19 UTC (rev 29266)
@@ -1,21 +1,25 @@
-###############################################################################
-# Copyright (c) 2006 University College London.
-# All rights reserved. This program and the accompanying materials
-# are 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
-#
-###############################################################################
-pluginName = Eclipse BPEL Designer Runtimes
-providerName = University College London Software Systems Engineering
-
-MODULE_TYPE_NAME=BPEL 2.0 Process
-MODULE_TYPE_DESCRIPTION=Module representing a BPEL process
-
-BPEL_CORE_FACET_LABEL=BPEL 2.0 Facet
-BPEL_CORE_FACET_DESCRIPTION=Enables modelling and deployment of BPEL processes.
-BPEL_FACET_CATEGORY_LABEL=BPEL 2.0
-BPEL_FACET_TEMPLATE_LABEL=BPEL 2.0 Project
-NEW_BPEL_CATEGORY=BPEL 2.0
-NEW_BPEL_PROJECT=BPEL Project
-NEW_BPEL_PROJECT_DESCRIPTION=Create a new BPEL project.
+###############################################################################
+# Copyright (c) 2006 University College London.
+# All rights reserved. This program and the accompanying materials
+# are 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
+#
+###############################################################################
+pluginName = Eclipse BPEL Designer Runtimes
+providerName = University College London Software Systems Engineering
+
+MODULE_TYPE_NAME=BPEL 2.0 Process
+MODULE_TYPE_DESCRIPTION=Module representing a BPEL process
+
+BPEL_CORE_FACET_LABEL=BPEL 2.0 Facet
+BPEL_CORE_FACET_DESCRIPTION=Enables modelling and deployment of BPEL processes.
+BPEL_FACET_CATEGORY_LABEL=BPEL 2.0
+BPEL_FACET_TEMPLATE_LABEL=BPEL 2.0 Project
+NEW_BPEL_CATEGORY=BPEL 2.0
+NEW_BPEL_PROJECT=BPEL Project
+NEW_BPEL_PROJECT_DESCRIPTION=Create a new BPEL project.
+
+JBT_BPEL_FACET_TEMPLATE_LABEL=JBoss Legacy BPEL 2.0 Project
+JBT_BPEL_CORE_FACET_LABEL=JBoss AS 5.1 BPEL Facet
+JBT_BPEL_CORE_FACET_DESCRIPTION=For migration of JBoss BPEL projects from AS 5.1
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.runtimes/plugin.xml
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.runtimes/plugin.xml 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.runtimes/plugin.xml 2011-02-22 18:05:19 UTC (rev 29266)
@@ -1,193 +1,218 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-
-<!--=========================================================================-->
-<!-- BPEL Designer Runtime Extension Point -->
-<!-- -->
-<!-- Copyright (c) 2006 University College London. -->
-<!-- All rights reserved. This program and the accompanying materials -->
-<!-- are 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 -->
-<!-- -->
-<!--=========================================================================-->
-
-<plugin>
-
-<!--=========================================================================-->
-<!-- New BPEL Project Wizard -->
-<!--=========================================================================-->
-
- <extension
- point="org.eclipse.ui.newWizards">
- <wizard
- name="%NEW_BPEL_PROJECT"
- icon="icons/ctool16/new_bpelprj.gif"
- category="org.eclipse.bpel.wizards"
- project="true"
- class="org.eclipse.bpel.runtimes.ui.wizards.NewBPELProjectWizard"
- id="org.eclipse.bpel.runtimes.wizards.newBPELProject">
- <description>%NEW_BPEL_PROJECT_DESCRIPTION</description>
- </wizard>
- </extension>
-
- <extension point="org.eclipse.wst.common.project.facet.ui.wizardPages">
- <wizard-pages action="bpel.facet.core.install">
- <page class="org.eclipse.bpel.runtimes.ui.wizards.BPELFacetInstallPage"/>
- </wizard-pages>
- </extension>
-
-
-<!--=========================================================================-->
-<!-- BPEL ModuleType -->
-<!--=========================================================================-->
-
- <extension
- id="bpel.module"
- name="%MODULE_TYPE_NAME"
- point="org.eclipse.wst.server.core.moduleTypes">
- </extension>
-
-<!-- The following is needed to make icons for deployable modules occur in -->
-<!-- the Add and Remove Projects wizard -->
-
- <extension point="org.eclipse.wst.server.ui.serverImages">
- <image
- id="org.eclipse.bpel.runtimes.bpel.module"
- typeIds="bpel.module"
- icon="icons/obj16/bpelfacet.gif"/>
- </extension>
-
-<!--=========================================================================-->
-<!-- BPEL Facet -->
-<!--=========================================================================-->
-
- <extension point="org.eclipse.wst.common.project.facet.core.facets">
-
- <project-facet id="bpel.facet.core">
- <label>%BPEL_CORE_FACET_LABEL</label>
- <description>%BPEL_CORE_FACET_DESCRIPTION</description>
- </project-facet>
-
- <project-facet-version facet="bpel.facet.core" version="2.0">
- <group-member id="modules"></group-member>
- <constraint>
- <conflicts group="modules">
- </conflicts>
- </constraint>
- </project-facet-version>
-
-
- <action facet="bpel.facet.core" version="2.0" type="INSTALL" id="bpel.facet.core.install">
- <delegate class="org.eclipse.bpel.runtimes.facets.BPELCoreFacetInstallDelegate"/>
- <config-factory class="org.eclipse.bpel.runtimes.facets.BPELFacetInstallDataModelProvider"/>
- </action>
-
- <category id="bpel.category">
- <label>%BPEL_FACET_CATEGORY_LABEL</label>
- <description>%bpelCoreFacetDescription</description>
- </category>
-
- <template id="template.bpel.core">
- <label>%BPEL_FACET_TEMPLATE_LABEL</label>
- <fixed facet="bpel.facet.core"/>
- </template>
-
- </extension>
-
-<!--=========================================================================-->
-<!-- BPEL Facet Image -->
-<!--=========================================================================-->
-
- <extension point="org.eclipse.wst.common.project.facet.ui.images">
- <image facet="bpel.facet.core" path="icons/obj16/bpelfacet.gif"/>
- </extension>
-
- <extension
- point="org.eclipse.wst.common.modulecore.componentimpl">
- <componentimpl
- typeID="bpel.facet.core"
- class="org.eclipse.bpel.runtimes.facets.BPELVirtualComponent">
- </componentimpl>
- </extension>
-
-
-<!--=========================================================================-->
-<!-- BPEL Module Factory -->
-<!--=========================================================================-->
-
- <extension
- point="org.eclipse.wst.server.core.moduleFactories">
- <moduleFactory
- projects="true"
- class="org.eclipse.bpel.runtimes.module.BPELModuleFactoryDelegate"
- id="org.eclipse.bpel.runtimes.module.moduleFactory">
- <moduleType
- versions="1.1, 2.0"
- types="bpel.module">
- </moduleType>
- </moduleFactory>
- </extension>
-
-<!--=========================================================================-->
-<!-- BPEL Module ArtifactAdapters -->
-<!--=========================================================================-->
-
- <extension point="org.eclipse.wst.server.core.moduleArtifactAdapters">
- <moduleArtifactAdapter
- id="org.eclipse.bpel.runtimes.module.artifactAdapter1"
- class="org.eclipse.bpel.runtimes.module.BPELDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.core.resources.IProject"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- <moduleArtifactAdapter
- id="org.eclipse.bpel.runtimes.module.artifactAdapter2"
- class="org.eclipse.bpel.runtimes.module.BPELDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.core.resources.IFile"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- </extension>
-
-<!--=========================================================================-->
-<!-- BPEL Runtime Adapters -->
-<!--=========================================================================-->
-
- <extension point="org.eclipse.core.runtime.adapters">
- <factory
- class="org.eclipse.bpel.runtimes.module.BPELDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.core.resources.IProject">
- <adapter type="org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.bpel.runtimes.module.BPELDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.core.resources.IFile">
- <adapter type="org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- </extension>
-
-<!--=========================================================================-->
-<!-- TO MAKE PROCESSES ACTUALLY LAUNCHABLE VIA RUN ON SERVER -->
-<!-- -->
-<!-- Implement org.eclipse.wst.server.core.clients in order to specify the -->
-<!-- the client app to be used for launching. -->
-<!-- -->
-<!-- Implement org.eclipse.wst.server.core.launchableAdapters. Might have to -->
-<!-- do this in server-specific way or maybe can resuse some generic server -->
-<!-- framework stuff or maybe can come up with some interface that would -->
-<!-- allow us to implement in runtimes plug-in. -->
-<!-- -->
-<!-- N.B. Launching here means launching a Web service. Hence, can do this -->
-<!-- via the corresponding WTP feature with no code at all from our end. -->
-<!-- -->
-<!-- -->
-<!-- -->
-<!--=========================================================================-->
-
-
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+
+<!--=========================================================================-->
+<!-- BPEL Designer Runtime Extension Point -->
+<!-- -->
+<!-- Copyright (c) 2006 University College London. -->
+<!-- All rights reserved. This program and the accompanying materials -->
+<!-- are 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 -->
+<!-- -->
+<!--=========================================================================-->
+
+<plugin>
+
+<!--=========================================================================-->
+<!-- New BPEL Project Wizard -->
+<!--=========================================================================-->
+
+ <extension
+ point="org.eclipse.ui.newWizards">
+ <wizard
+ name="%NEW_BPEL_PROJECT"
+ icon="icons/ctool16/new_bpelprj.gif"
+ category="org.eclipse.bpel.wizards"
+ project="true"
+ class="org.eclipse.bpel.runtimes.ui.wizards.NewBPELProjectWizard"
+ id="org.eclipse.bpel.runtimes.wizards.newBPELProject">
+ <description>%NEW_BPEL_PROJECT_DESCRIPTION</description>
+ </wizard>
+ </extension>
+
+ <extension point="org.eclipse.wst.common.project.facet.ui.wizardPages">
+ <wizard-pages action="bpel.facet.core.install">
+ <page class="org.eclipse.bpel.runtimes.ui.wizards.BPELFacetInstallPage"/>
+ </wizard-pages>
+ </extension>
+
+
+<!--=========================================================================-->
+<!-- BPEL ModuleType -->
+<!--=========================================================================-->
+
+ <extension
+ id="bpel.module"
+ name="%MODULE_TYPE_NAME"
+ point="org.eclipse.wst.server.core.moduleTypes">
+ </extension>
+
+<!-- The following is needed to make icons for deployable modules occur in -->
+<!-- the Add and Remove Projects wizard -->
+
+ <extension point="org.eclipse.wst.server.ui.serverImages">
+ <image
+ id="org.eclipse.bpel.runtimes.bpel.module"
+ typeIds="bpel.module"
+ icon="icons/obj16/bpelfacet.gif"/>
+ </extension>
+
+<!--=========================================================================-->
+<!-- BPEL Facet -->
+<!--=========================================================================-->
+
+ <extension point="org.eclipse.wst.common.project.facet.core.facets">
+
+ <project-facet id="bpel.facet.core">
+ <label>%BPEL_CORE_FACET_LABEL</label>
+ <description>%BPEL_CORE_FACET_DESCRIPTION</description>
+ </project-facet>
+
+ <project-facet-version facet="bpel.facet.core" version="2.0">
+ <group-member id="modules"></group-member>
+ <constraint>
+ <conflicts group="modules">
+ </conflicts>
+ </constraint>
+ </project-facet-version>
+
+
+ <action facet="bpel.facet.core" version="2.0" type="INSTALL" id="bpel.facet.core.install">
+ <delegate class="org.eclipse.bpel.runtimes.facets.BPELCoreFacetInstallDelegate"/>
+ <config-factory class="org.eclipse.bpel.runtimes.facets.BPELFacetInstallDataModelProvider"/>
+ </action>
+
+ <category id="bpel.category">
+ <label>%BPEL_FACET_CATEGORY_LABEL</label>
+ <description>%bpelCoreFacetDescription</description>
+ </category>
+
+ <template id="template.bpel.core">
+ <label>%BPEL_FACET_TEMPLATE_LABEL</label>
+ <fixed facet="bpel.facet.core"/>
+ </template>
+
+ <project-facet id="jbt.bpel.facet.core">
+ <label>%JBT_BPEL_CORE_FACET_LABEL</label>
+ <description>%JBT_BPEL_CORE_FACET_DESCRIPTION</description>
+ </project-facet>
+
+ <project-facet-version facet="jbt.bpel.facet.core" version="2.0">
+ <group-member id="modules"></group-member>
+ <constraint>
+ <conflicts group="modules">
+ </conflicts>
+ </constraint>
+ </project-facet-version>
+
+
+ <action facet="jbt.bpel.facet.core" version="2.0" type="INSTALL" id="jbt.bpel.facet.core.install">
+ <delegate class="org.eclipse.bpel.runtimes.facets.BPELCoreFacetInstallDelegate"/>
+ <config-factory class="org.eclipse.bpel.runtimes.facets.BPELFacetInstallDataModelProvider"/>
+ </action>
+
+ <template id="template.jbt.bpel.core">
+ <label>%JBT_BPEL_FACET_TEMPLATE_LABEL</label>
+ <fixed facet="jbt.bpel.facet.core"/>
+ </template>
+
+
+ </extension>
+
+<!--=========================================================================-->
+<!-- BPEL Facet Image -->
+<!--=========================================================================-->
+
+ <extension point="org.eclipse.wst.common.project.facet.ui.images">
+ <image facet="bpel.facet.core" path="icons/obj16/bpelfacet.gif"/>
+ </extension>
+
+ <extension
+ point="org.eclipse.wst.common.modulecore.componentimpl">
+ <componentimpl
+ typeID="bpel.facet.core"
+ class="org.eclipse.bpel.runtimes.facets.BPELVirtualComponent">
+ </componentimpl>
+ </extension>
+
+
+<!--=========================================================================-->
+<!-- BPEL Module Factory -->
+<!--=========================================================================-->
+
+ <extension
+ point="org.eclipse.wst.server.core.moduleFactories">
+ <moduleFactory
+ projects="true"
+ class="org.eclipse.bpel.runtimes.module.BPELModuleFactoryDelegate"
+ id="org.eclipse.bpel.runtimes.module.moduleFactory">
+ <moduleType
+ versions="1.1, 2.0"
+ types="bpel.module">
+ </moduleType>
+ </moduleFactory>
+ </extension>
+
+<!--=========================================================================-->
+<!-- BPEL Module ArtifactAdapters -->
+<!--=========================================================================-->
+
+ <extension point="org.eclipse.wst.server.core.moduleArtifactAdapters">
+ <moduleArtifactAdapter
+ id="org.eclipse.bpel.runtimes.module.artifactAdapter1"
+ class="org.eclipse.bpel.runtimes.module.BPELDeployableArtifactAdapterFactory">
+ <enablement>
+ <with variable="selection">
+ <adapt type="org.eclipse.core.resources.IProject"/>
+ </with>
+ </enablement>
+ </moduleArtifactAdapter>
+ <moduleArtifactAdapter
+ id="org.eclipse.bpel.runtimes.module.artifactAdapter2"
+ class="org.eclipse.bpel.runtimes.module.BPELDeployableArtifactAdapterFactory">
+ <enablement>
+ <with variable="selection">
+ <adapt type="org.eclipse.core.resources.IFile"/>
+ </with>
+ </enablement>
+ </moduleArtifactAdapter>
+ </extension>
+
+<!--=========================================================================-->
+<!-- BPEL Runtime Adapters -->
+<!--=========================================================================-->
+
+ <extension point="org.eclipse.core.runtime.adapters">
+ <factory
+ class="org.eclipse.bpel.runtimes.module.BPELDeployableArtifactAdapterFactory"
+ adaptableType="org.eclipse.core.resources.IProject">
+ <adapter type="org.eclipse.debug.ui.actions.ILaunchable"/>
+ </factory>
+ <factory
+ class="org.eclipse.bpel.runtimes.module.BPELDeployableArtifactAdapterFactory"
+ adaptableType="org.eclipse.core.resources.IFile">
+ <adapter type="org.eclipse.debug.ui.actions.ILaunchable"/>
+ </factory>
+ </extension>
+
+<!--=========================================================================-->
+<!-- TO MAKE PROCESSES ACTUALLY LAUNCHABLE VIA RUN ON SERVER -->
+<!-- -->
+<!-- Implement org.eclipse.wst.server.core.clients in order to specify the -->
+<!-- the client app to be used for launching. -->
+<!-- -->
+<!-- Implement org.eclipse.wst.server.core.launchableAdapters. Might have to -->
+<!-- do this in server-specific way or maybe can resuse some generic server -->
+<!-- framework stuff or maybe can come up with some interface that would -->
+<!-- allow us to implement in runtimes plug-in. -->
+<!-- -->
+<!-- N.B. Launching here means launching a Web service. Hence, can do this -->
+<!-- via the corresponding WTP feature with no code at all from our end. -->
+<!-- -->
+<!-- -->
+<!-- -->
+<!--=========================================================================-->
+
+
+</plugin>
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.runtimes/pom.xml
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.runtimes/pom.xml 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.runtimes/pom.xml 2011-02-22 18:05:19 UTC (rev 29266)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.bpel.plugins</groupId>
<artifactId>org.eclipse.bpel.runtimes</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.7.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IBPELRuntimeDelegate.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IBPELRuntimeDelegate.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IBPELRuntimeDelegate.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -2,6 +2,12 @@
public interface IBPELRuntimeDelegate {
+ /*
+ * These are currently only used by the BPEL New File Wizard to
+ * figure out how to build the service address for its WSDL.
+ */
+ public String getServerAddress();
public String getPort();
+ public String getDeployDir();
}
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF 2011-02-22 18:05:19 UTC (rev 29266)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.ui; singleton:=true
-Bundle-Version: 0.6.0.qualifier
+Bundle-Version: 0.7.0.qualifier
Bundle-Activator: org.eclipse.bpel.ui.BPELUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -15,13 +15,13 @@
org.eclipse.jface.text,
org.eclipse.gef;bundle-version="[3.4.0,4.0.0)",
org.eclipse.xsd;bundle-version="[2.4.0,3.0.0)",
- org.eclipse.bpel.common.ui;bundle-version="[0.5.0,1.0.0)",
+ org.eclipse.bpel.common.ui;bundle-version="[0.7.0,2.0.0)",
org.eclipse.wst.wsdl,
- org.eclipse.bpel.common.ui;bundle-version="[0.4.0,2.0.0)",
- org.eclipse.bpel.common.model;bundle-version="[0.4.0,2.0.0)",
- org.eclipse.bpel.model;bundle-version="[0.4.0,2.0.0)",
+ org.eclipse.bpel.common.ui;bundle-version="[0.7.0,2.0.0)",
+ org.eclipse.bpel.common.model;bundle-version="[0.7.0,2.0.0)",
+ org.eclipse.bpel.model;bundle-version="[0.7.0,2.0.0)",
org.eclipse.wst.xml.core,
- org.eclipse.bpel.wsil.model;bundle-version="[0.4.0,2.0.0)",
+ org.eclipse.bpel.wsil.model;bundle-version="[0.7.0,2.0.0)",
org.eclipse.wst.sse.ui,
org.eclipse.wst.sse.core,
javax.wsdl;bundle-version="[1.5.0,1.6.0)",
@@ -72,7 +72,4 @@
org.eclipse.bpel.ui.util.marker,
org.eclipse.bpel.ui.wizards
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: org.eclipse.bpel.runtimes,
- org.eclipse.bpel.validator,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.wst.server.core
+Import-Package: org.eclipse.bpel.validator
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/plugin.xml
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/plugin.xml 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/plugin.xml 2011-02-22 18:05:19 UTC (rev 29266)
@@ -708,7 +708,7 @@
class="org.eclipse.bpel.ui.perspectives.BPELPerspectiveFactory"
icon="icons/obj20/bpel.png"
id="org.eclipse.bpel.ui.perspective"
- name="BPEL Perspective">
+ name="BPEL">
</perspective>
</extension>
</plugin>
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/pom.xml
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/pom.xml 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/pom.xml 2011-02-22 18:05:19 UTC (rev 29266)
@@ -1,13 +1,13 @@
-<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools.bpel.plugins</groupId>
+ <groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.eclipse.bpel.ui</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.7.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
-</project>
+</project>
\ No newline at end of file
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Messages.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Messages.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Messages.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -349,6 +349,7 @@
public static String FaultCatchNameDetails_Namespace__21;
public static String FaultCatchNameDetails_User_defined_15;
public static String FaultCatchNameSection_Variable_Name_3;
+ public static String FaultCatchNameSection_Error_Invalid_Type;
public static String FaultHandlerAdapter_Fault_Handlers_1;
public static String FaultThrowNameDetails_Built_in_14;
public static String FaultThrowNameDetails_Fault_Name__16;
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ForEachAdapter.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ForEachAdapter.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ForEachAdapter.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -12,6 +12,7 @@
import org.eclipse.bpel.model.BPELPackage;
import org.eclipse.bpel.model.ForEach;
+import org.eclipse.bpel.model.Scope;
import org.eclipse.bpel.ui.adapters.delegates.ActivityContainer;
import org.eclipse.bpel.ui.editparts.OutlineTreeEditPart;
import org.eclipse.bpel.ui.editparts.SequenceEditPart;
@@ -55,4 +56,15 @@
Messages.ForEachAdapter_1, AnnotationHelper.getAnnotation(obj.getStartCounterValue()),
};
}
+
+ @Override
+ public boolean canAddObject(Object object, Object child, Object insertBefore) {
+ ForEach forEach = (ForEach)object;
+ if (forEach.getActivity()==null && child instanceof Scope) {
+ return getContainerDelegate(object).canAddObject(object, child, insertBefore);
+ }
+ else
+ return false;
+ }
+
}
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddVariableCommand.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddVariableCommand.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddVariableCommand.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -10,11 +10,18 @@
*******************************************************************************/
package org.eclipse.bpel.ui.commands;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.bpel.model.BPELPackage;
+import org.eclipse.bpel.model.Import;
import org.eclipse.bpel.model.Variable;
+import org.eclipse.bpel.model.Variables;
import org.eclipse.bpel.ui.IBPELUIConstants;
import org.eclipse.bpel.ui.util.ModelHelper;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
/**
@@ -28,7 +35,11 @@
}
@Override
- protected EList<Variable> getList() {
- return ModelHelper.getVariables( target ).getChildren();
+ protected List<Variable> getList() {
+ // https://issues.jboss.org/browse/JBIDE-8048
+ Variables variables = ModelHelper.getVariables( target );
+ if (variables != null)
+ return variables.getChildren();
+ return new ArrayList<Variable>();
}
}
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/contentassist/ExpressionContentAssistProcessor.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/contentassist/ExpressionContentAssistProcessor.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/contentassist/ExpressionContentAssistProcessor.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -107,6 +107,7 @@
static final int PROPTYPE_VARIABLE = 1;
static final int PROPTYPE_FUNCTION = 2;
static final int PROPTYPE_OPERATOR = 4;
+ static final int PROPTYPE_ELEMENT = 8;
ProposalType(int type, String beginsWith) {
theType = type;
@@ -117,6 +118,7 @@
boolean isFunction() { return ((theType & PROPTYPE_FUNCTION) == PROPTYPE_FUNCTION); }
boolean isOperator() { return ((theType & PROPTYPE_OPERATOR) == PROPTYPE_OPERATOR); }
boolean isVariableAndFunction() { return ((theType & (PROPTYPE_VARIABLE | PROPTYPE_FUNCTION)) == (PROPTYPE_VARIABLE | PROPTYPE_FUNCTION)); }
+ boolean isElement() { return ((theType & PROPTYPE_ELEMENT) == PROPTYPE_ELEMENT); }
}
// helper class for defining expression types within xpath expression... used by XPathStack
@@ -134,6 +136,7 @@
static final int EXPRTYPE_NEW_EXPRESSION = 8;
static final int EXPRTYPE_FUNCTION_ARGUMENTS = 9;
static final int EXPRTYPE_FUNCTION_ARGUMENT_SEPARATOR = 10;
+ static final int EXPRTYPE_ELEMENT = 11;
static final int CLASS_NUMERIC = 100;
static final int CLASS_BOOLEAN = 101;
@@ -220,6 +223,9 @@
theTopOfStackExprType = ExpressionType.CLASS_NUMERIC;
}
}
+ else if (currChar == '/' ) {
+ return parseElement();
+ }
else {
theStatus = -1;
return false;
@@ -408,6 +414,71 @@
return proceed;
}
+ private boolean parseElement() throws BadLocationException {
+ theIndex++; // move past / token
+ String variable = DIVIDE;
+ char nextChar;
+ while (theIndex < theOffset) {
+ nextChar = theDocument.getChar(theIndex);
+ if (isLocationPathCharacter(nextChar)) {
+ variable = variable + nextChar;
+ }
+ else if (nextChar == '[') {
+ theCallStack.push(new ExpressionType(ExpressionType.EXPRTYPE_ELEMENT, variable));
+ theCallStack.push(new ExpressionType(ExpressionType.EXPRTYPE_NEW_EXPRESSION, OPEN_BRACKET));
+ theIndex++;
+ boolean proceed = parseBooleanExpression();
+ if (proceed) {
+ nextChar = theDocument.getChar(theIndex);
+ if (nextChar == ']') {
+ try {
+ ExpressionType tempExpr = theCallStack.pop();
+ while (tempExpr.theType != ExpressionType.EXPRTYPE_NEW_EXPRESSION) {
+ // continue popping until we find a new expression type
+ tempExpr = theCallStack.pop();
+ }
+ if (tempExpr != null) {
+ if (tempExpr.theGrammar.compareTo(CLOSE_BRACKET) == 0) {
+ return true;
+ }
+ }
+ }
+ catch (EmptyStackException e) {
+ theStatus = -1;
+ return false;
+ }
+ }
+ else {
+ // in error ... maybe throw something here
+ theStatus = -1;
+ return false;
+ }
+ }
+ else {
+ return proceed;
+ }
+ }
+ else {
+ theCallStack.push(new ExpressionType(ExpressionType.EXPRTYPE_ELEMENT, variable));
+ theTopOfStackExprType = ExpressionType.EXPRTYPE_ELEMENT;
+ theIndex--;
+ return true;
+ }
+ theIndex++;
+ }
+
+ if (theIndex >= theOffset) {
+ theCallStack.push(new ExpressionType(ExpressionType.EXPRTYPE_ELEMENT, variable));
+ theStatus = 1;
+ return false;
+ //return new ProposalType(ProposalType.PROPTYPE_VARIABLE, variable);
+ }
+
+ // shouldn't get here
+ theStatus = -1;
+ return false;
+ }
+
// parse word found in numeric expression
private boolean parseWord() throws BadLocationException {
String word = EMPTY_STRING;
@@ -814,6 +885,9 @@
return (new ProposalType(0, EMPTY_STRING));
}
return new ProposalType(ProposalType.PROPTYPE_OPERATOR, EMPTY_STRING);
+
+ case ExpressionType.EXPRTYPE_ELEMENT:
+ return new ProposalType(ProposalType.PROPTYPE_ELEMENT, EMPTY_STRING);
default:
return (new ProposalType(0, EMPTY_STRING));
@@ -831,7 +905,13 @@
tempContext = startOfFunction(viewer, offset);
if (tempContext != null) {
return new ProposalType(ProposalType.PROPTYPE_FUNCTION, tempContext);
- }
+ }
+
+ tempContext = startOfElement(viewer, offset);
+ if (tempContext != null) {
+ return new ProposalType(ProposalType.PROPTYPE_ELEMENT, tempContext);
+ }
+
return new ProposalType(ProposalType.PROPTYPE_FUNCTION | ProposalType.PROPTYPE_VARIABLE, EMPTY_STRING);
}
@@ -851,13 +931,13 @@
String varlinkStart = EMPTY_STRING;
if (propType.isVariableAndFunction()) {
- theToggle = (theToggle+1) % 4;
+ theToggle = (theToggle+1) % 5;
funcStart = propType.theBeginsWith;
varlinkStart = propType.theBeginsWith;
}
else if (propType.isVariable()) {
if (toggle)
- theToggle = (theToggle+1) % 4;
+ theToggle = (theToggle+1) % 5;
else
theToggle = 0;
funcStart = EMPTY_STRING;
@@ -865,7 +945,7 @@
}
else if (propType.isFunction()) {
if (toggle)
- theToggle = (theToggle+1) % 4;
+ theToggle = (theToggle+1) % 5;
else
theToggle = 1;
funcStart = propType.theBeginsWith;
@@ -873,13 +953,22 @@
}
else if (propType.isOperator()) {
if (toggle)
- theToggle = (theToggle+1) % 4;
+ theToggle = (theToggle+1) % 5;
else
theToggle = 2;
funcStart = EMPTY_STRING;
varlinkStart = EMPTY_STRING;
}
+ else if (propType.isElement()) {
+ if (toggle)
+ theToggle = (theToggle+1) % 5;
+ else
+ theToggle = 3;
+ funcStart = EMPTY_STRING;
+ varlinkStart = EMPTY_STRING;
+ }
+
switch (theToggle) {
case 0:
theContentAssistant.setStatusMessage(Messages.getString("ExpressionContentAssistProcessor.44")); //$NON-NLS-1$
@@ -901,6 +990,9 @@
theContentAssistant.setStatusMessage(Messages.getString("ExpressionContentAssistProcessor.49")); //$NON-NLS-1$
//return generateTemplateProposals(tempStart, offset);
return (fXpathTemplates.computeCompletionProposals(viewer, offset));
+
+ case 4:
+ return generateVariableProposals(varlinkStart, offset);
}
return null;
@@ -1315,5 +1407,306 @@
private boolean isClosingExpressionCharacter(char c) {
return (RESERVED_CLOSING_EXPR_CHARS.indexOf(c) > -1);
- }
+ }
+
+ // simple form of determining if message part or XSD Element is located at offset
+ String startOfElement(ITextViewer viewer, int offset) {
+ int startPosition = offset-1;
+ char currChar;
+ String context = EMPTY_STRING;
+ IDocument document = viewer.getDocument();
+
+ try {
+ while (startPosition >= 0) {
+ currChar = document.getChar(startPosition);
+
+ if (currChar == '/')
+ return context;
+
+ if (!(Character.isLetterOrDigit(currChar)
+ || currChar == '.' || currChar == '@' || currChar == '_'))
+ return null;
+
+ context = currChar + context;
+ startPosition--;
+ }
+ }
+ catch (Exception e) {
+ System.out.println(e.toString());
+ }
+ return null;
+ }
+
+ /**
+ * From model, determine list of XSD elements or message parts the user may want to choose from.
+ */
+
+ ICompletionProposal[] generateElementProposals(String context, int offset) {
+ boolean seekChildren = false;
+
+ String context2;
+ if ((context.length() > 0) && (context.charAt(0) == '/'))
+ context2 = context.substring(1);
+ else
+ context2 = context;
+
+ int slash = context2.indexOf('/');
+ int dot = context2.indexOf('.');
+ int at = context2.indexOf('@');
+
+ if ((slash > -1) || (dot > -1) || (at > -1))
+ seekChildren = true;
+
+ Variable[] variables = BPELUtil.getVisibleVariables((EObject)theModel);
+ ArrayList<ICompletionProposal> results = new ArrayList<ICompletionProposal>();
+ CompletionProposal prop = null;
+ String name;
+ Variable currVar = null;
+ XSDTypeDefinition currXsdType = null;
+ Message currMsg = null;
+ XSDElementDeclaration currXsdElem = null;
+
+ Image varImg = BPELUIPlugin.INSTANCE.getImage(IBPELUIConstants.ICON_VARIABLE_16);
+ Image partImg = BPELUIPlugin.INSTANCE.getImage(IBPELUIConstants.ICON_PART_16);
+ Image elementImg = BPELUIPlugin.INSTANCE.getImage(IBPELUIConstants.ICON_XSD_ELEMENT_DECLARATION_16);
+ Image attrImg = BPELUIPlugin.INSTANCE.getImage(IBPELUIConstants.ICON_XSD_ATTRIBUTE_DECLARATION_16);
+ try
+ {
+ if (seekChildren) {
+ // walk down path
+ int index = 0;
+ int level = 0;
+ int token = -1;
+ char t = 0;
+ String levelName;
+
+ while (index < context2.length()) {
+ t = context2.charAt(index);
+ if ((t == '.') || (t == '/')) {
+ levelName = context2.substring(token+1, index);
+ /*
+ // check for namespace
+ int ns = levelName.indexOf(':');
+ if (ns > -1) {
+ levelNSPrefix = levelName.substring(0, ns);
+ levelName = levelName.substring(ns+1);
+ }
+ else
+ levelNSPrefix = null;
+ */
+
+ // find variable
+ if (level == 0) {
+ for (int i=0; i<variables.length; i++) {
+ if (levelName.compareTo(variables[i].getName()) == 0) {
+ currVar = variables[i];
+ currXsdType = currVar.getType();
+ currMsg = currVar.getMessageType();
+ currXsdElem = currVar.getXSDElement();
+
+ level++;
+ break;
+ }
+ }
+ if (currVar == null)
+ break;
+ }
+ // traverse down
+ else {
+ boolean childFound = false;
+ if (context2.charAt(token) == '.') {
+ if (currMsg != null) {
+ if (currMsg.getParts() != null) {
+ for(Object next : currMsg.getParts().values()) {
+ Part item = (Part) next ;
+ if (levelName.compareTo(item.getName()) == 0) {
+ currXsdType = item.getTypeDefinition();
+ currMsg = item.getEMessage();
+ currXsdElem = item.getElementDeclaration();
+ childFound = true;
+ break;
+ }
+ }
+ }
+ }
+ if (!childFound)
+ break;
+ }
+ // search for child objects
+ else if (context2.charAt(token) == '/') {
+ if (currXsdType == null) {
+ if (currXsdElem != null) {
+ currXsdType = currXsdElem.getTypeDefinition();
+ }
+ }
+ if (currXsdType instanceof XSDComplexTypeDefinition) {
+ XSDComplexTypeDefinition xsdcomplex = (XSDComplexTypeDefinition)currXsdType;
+
+ for(Object next : XSDUtils.getChildElements(xsdcomplex)) {
+ XSDElementDeclaration elem = ((XSDElementDeclaration)next).getResolvedElementDeclaration();
+ String elemName = elem.getName();
+ if (elem.getTargetNamespace() != null) {
+ String elemNSPrefix = getNamespacePrefix(currVar, elem.getTargetNamespace());
+ if (elemNSPrefix != null) {
+ elemName = elemNSPrefix + COLON + elemName;
+ }
+ }
+
+ if (levelName.compareTo(elemName) == 0) {
+ currXsdType = elem.getTypeDefinition();
+ currXsdElem = null;
+ currMsg = null;
+ //currXsdElem = elem.getResolvedElementDeclaration();
+ childFound = true;
+ break;
+ }
+ }
+ }
+ else if (currXsdType instanceof XSDSimpleTypeDefinition) {
+ XSDSimpleTypeDefinition xsdsimple = (XSDSimpleTypeDefinition)currXsdType;
+ //currXsdType = xsdsimple.getBaseType();
+ //XSDSimpleTypeDefinition tempsimple = xsdsimple.getBaseTypeDefinition();
+ //org.eclipse.xsd.XSDParticle temppart = xsdsimple.getComplexType();
+ //XSDSimpleTypeDefinition tempsimple2 = xsdsimple.getItemTypeDefinition();
+ String tempname = xsdsimple.getName();
+ if (levelName.compareTo(tempname) == 0) {
+ childFound = true;
+ }
+ }
+ if (!childFound)
+ break;
+ }
+ }
+ token = index;
+ }
+ else if (t == '@')
+ token = index;
+
+ index++;
+ }
+ // determine if last character is a special character if above is successful
+ if (index == context2.length()) {
+ // looking for parts, attributes or elements?
+ String beginsWith;
+ if ((index-1) == token)
+ beginsWith = EMPTY_STRING;
+ else
+ beginsWith = context2.substring(token+1);
+
+ if ((context2.charAt(token) == '/') || (context2.charAt(token) == '@')) {
+ if (currXsdType == null) {
+ if (currXsdElem != null) {
+ currXsdType = currXsdElem.getTypeDefinition();
+ }
+ }
+ if (currXsdType instanceof XSDComplexTypeDefinition) {
+ XSDComplexTypeDefinition xsdcomplex = (XSDComplexTypeDefinition)currXsdType;
+ @SuppressWarnings("rawtypes")
+ Iterator eaIter;
+ if (context2.charAt(token) == '/')
+ eaIter = XSDUtils.getXSDElementsAndAttributes(xsdcomplex).iterator();
+ else
+ eaIter = XSDUtils.getChildAttributes(xsdcomplex).iterator();
+ Image img = null;
+ String tempReplName = null;
+ String tempDispName = null;
+ String namespace = null;
+ String nsprefix = null;
+ while (eaIter.hasNext()) {
+ Object tempEA = eaIter.next();
+
+ if (tempEA instanceof XSDAttributeDeclaration) {
+ XSDAttributeDeclaration attr = (XSDAttributeDeclaration)tempEA;
+ tempReplName = AT + attr.getName();
+ tempDispName = attr.getName();
+ namespace = attr.getTargetNamespace();
+ if ((namespace != null) && (namespace.length() > 0)) {
+ nsprefix = getNamespacePrefix(currVar, namespace);
+ tempReplName = AT + nsprefix + COLON + attr.getName();
+ tempDispName = nsprefix + COLON + tempDispName;
+ }
+ img = attrImg;
+ }
+ else if (tempEA instanceof XSDElementDeclaration) {
+ XSDElementDeclaration elem = ((XSDElementDeclaration)tempEA).getResolvedElementDeclaration();
+ tempReplName = elem.getName();
+ tempDispName = tempReplName;
+ namespace = elem.getTargetNamespace();
+ if ((namespace != null) && (namespace.length() > 0)) {
+ nsprefix = getNamespacePrefix(currVar, namespace);
+ tempReplName = nsprefix + COLON + tempDispName;
+ tempDispName = tempReplName;
+ }
+ img = elementImg;
+ }
+ if (tempReplName != null) {
+ if ((beginsWith.length() == 0) || (tempDispName != null && tempDispName.startsWith(beginsWith))) {
+ int replOffset = offset-beginsWith.length();
+ int replLen = beginsWith.length();
+ if (context2.charAt(token) == '@') {
+ replOffset--;
+ replLen++;
+ }
+
+ prop = new CompletionProposal(tempReplName, replOffset, replLen,
+ tempReplName.length(), img, tempDispName + " " , //$NON-NLS-1$
+ null, null);
+ results.add(prop);
+ }
+ }
+ tempReplName = null;
+ tempDispName = null;
+ }
+ }
+// else if (currXsdType instanceof XSDSimpleTypeDefinition) {
+// XSDSimpleTypeDefinition simple = (XSDSimpleTypeDefinition)currXsdType;
+// // do nothing?
+// }
+ }
+ // search for parts
+ else if (context2.charAt(token) == '.') {
+ if (currMsg != null) {
+ if (currMsg.getParts() != null) {
+ for(Object next : currMsg.getParts().values() ) {
+ Part item = (Part) next;
+ if ((beginsWith.length() == 0) || (item.getName().startsWith(beginsWith))) {
+ prop = new CompletionProposal(item.getName(), offset-beginsWith.length(), beginsWith.length(),
+ item.getName().length(), partImg, item.getName() + " " , //$NON-NLS-1$
+ null, null);
+ results.add(prop);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ //variables
+ else {
+ for (Variable v : variables) {
+ name = v.getName();
+ if (name.startsWith(context2)) {
+ prop = new CompletionProposal(DIVIDE + name, offset-context.length(), context.length(),
+ name.length()+1, varImg, name + " " , //$NON-NLS-1$
+ null, null);
+ results.add(prop);
+ }
+ }
+ }
+ }
+ catch(IllegalArgumentException ex)
+ {
+ results.toArray(EMPTY_COMPLETION_PROPOSALS);
+ }
+
+ if (results.size() < 1) {
+ return new ICompletionProposal [] {
+ new CompletionProposal(EMPTY_STRING, offset, 0,
+ 0, null, Messages.getString("ExpressionContentAssistProcessor.31"), //$NON-NLS-1$
+ null, null) };
+ }
+
+ return results.toArray(EMPTY_COMPLETION_PROPOSALS);
+ }
+
}
\ No newline at end of file
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/OperationContentProvider.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/OperationContentProvider.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/OperationContentProvider.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -13,8 +13,11 @@
import java.util.List;
import org.eclipse.bpel.model.Invoke;
+import org.eclipse.bpel.model.OnEvent;
+import org.eclipse.bpel.model.PartnerLink;
import org.eclipse.bpel.model.Receive;
import org.eclipse.bpel.model.Reply;
+import org.eclipse.bpel.model.partnerlinktype.Role;
import org.eclipse.wst.wsdl.PortType;
/**
@@ -54,5 +57,19 @@
collectElements ( invoke.getPortType(), list );
return ;
}
+
+ // https://issues.jboss.org/browse/JBIDE-8048
+ // for event handlers, the operation comes from partnerlink role
+ if (input instanceof OnEvent) {
+ OnEvent onEvent = (OnEvent) input;
+ PartnerLink partnerLink = onEvent.getPartnerLink();
+ if (partnerLink != null) {
+ Role myRole = partnerLink.getMyRole();
+ if (myRole != null) {
+ collectElements ( myRole.getPortType(), list );
+ }
+ }
+ return ;
+ }
}
}
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/BrowseSelectorDialog.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/BrowseSelectorDialog.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/BrowseSelectorDialog.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -505,7 +505,7 @@
public void widgetSelected(SelectionEvent arg0) {
// https://jira.jboss.org/browse/JBIDE-7107
// update "OK" button enablement
- refresh();
+ updateOkState();
}
});
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/TypeSelectorDialog.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/TypeSelectorDialog.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/TypeSelectorDialog.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -93,7 +93,7 @@
// https://jira.jboss.org/browse/JBIDE-7107
// set by caller if a selection from the lower tree (typically message parts or XSD elements)
// are required before "OK" button can be enabled.
- protected boolean requireLowerTreeSelection = true;
+ protected boolean requireLowerTreeSelection = false;
/**
@@ -316,4 +316,15 @@
return true;
}
+
+ /**
+ * https://issues.jboss.org/browse/JBIDE-8045
+ * Enable or disable lower tree selection required flag (see this.requireLowerTreeSelection)
+ *
+ * @param enabled
+ */
+ public void setRequireLowerTreeSelection(boolean enabled)
+ {
+ this.requireLowerTreeSelection = enabled;
+ }
}
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/factories/BPELUIObjectFactory.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/factories/BPELUIObjectFactory.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/factories/BPELUIObjectFactory.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -276,7 +276,10 @@
Sequence sequence = BPELFactory.eINSTANCE.createSequence();
sequence.getActivities().add(
BPELFactory.eINSTANCE.createCompensate());
- sequence.getActivities().add(BPELFactory.eINSTANCE.createRethrow());
+ // https://issues.jboss.org/browse/JBIDE-8048
+ // don't generate a rethrow for CompensationHandlers
+ if (result instanceof CatchAll || result instanceof Catch)
+ sequence.getActivities().add(BPELFactory.eINSTANCE.createRethrow());
if (result instanceof Catch) {
Catch _catch = (Catch) result;
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/messages.properties
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/messages.properties 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/messages.properties 2011-02-22 18:05:19 UTC (rev 29266)
@@ -129,7 +129,10 @@
BPELPreferencePage_WSIL_EnterLocation = <enter location>
#
# This has \n for a reason. The wrapping in the widget works, but not as expected.
-BPELPreferencePage_WSIL_Description =
+BPELPreferencePage_WSIL_Description = \
+The document above contains links to other WSIL documents shown below.\n\
+You can add or remove WSIL links to/from the above document.\n\
+The result will be shown in the WSIL browser of the editor.
#
BPELUIRegistry_Expression_language_editors_must_provide_expressionLanguage_and_class__8=Expression language editors must provide expressionLanguage and class.
BPELUtil__unknown_URI__54=<unknown URI>
@@ -248,6 +251,7 @@
FaultCatchNameDetails_User_defined_15=&User-defined
FaultCatchNameSection_Variable_Name_3=Variable Name\:
FaultCatchNameSection_None_0=(none)
+FaultCatchNameSection_Error_Invalid_Type=Data caught by a Fault Handler must be a Message Type or an XSD Element
FaultHandlerAdapter_Fault_Handlers_1=Fault Handlers
FaultThrowNameDetails_Built_in_14=&Built-in
FaultThrowNameDetails_Fault_Name__16=Faul&t Name\:
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/perspectives/BPELPerspectiveFactory.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/perspectives/BPELPerspectiveFactory.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/perspectives/BPELPerspectiveFactory.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -8,7 +8,7 @@
public class BPELPerspectiveFactory implements IPerspectiveFactory {
- private static final String ID_NEW_BPEL_PROJECT_WIZARD="org.jboss.tools.bpel.runtimes.wizards.newBPELProject";
+ private static final String ID_NEW_BPEL_PROJECT_WIZARD="org.eclipse.bpel.runtimes.wizards.newBPELProject";
private static final String ID_NEW_BPEL_FILE_WIZARD="org.eclipse.bpel.ui.newFile";
private static final String ID_NEW_BPEL_DEPLOY_WIZARD="org.eclipse.bpel.apache.ode.deploy.ui.wizards.NewODEDeployWizard";
private static final String ID_PALETTE_VIEW="org.eclipse.gef.ui.palette_view";
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/FaultCatchNameSection.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/FaultCatchNameSection.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/FaultCatchNameSection.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -70,6 +70,7 @@
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gef.commands.Command;
+import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.events.SelectionEvent;
@@ -526,12 +527,17 @@
variable = BPELFactory.eINSTANCE.createVariable();
_catch.setFaultVariable(variable);
}
+ // https://issues.jboss.org/browse/JBIDE-8045
+ // Data caught by fault handler can be either a Message Type
+ // or an XSD Element.
if (type instanceof Message) {
- variable.setMessageType((Message)type);
- } else {
- variable.setMessageType(null);
+ _catch.setFaultMessageType((Message)type);
+ _catch.setFaultElement(null);
}
- _catch.setFaultMessageType(variable.getMessageType());
+ else if (type instanceof XSDElementDeclaration) {
+ _catch.setFaultMessageType(null);
+ _catch.setFaultElement((XSDElementDeclaration)type);
+ }
}
});
getCommandFramework().execute(wrapInShowContextCommand(command));
@@ -562,9 +568,17 @@
if (!command.isEmpty()) getCommandFramework().execute(wrapInShowContextCommand(command));
}
- public void selectXSDType(XSDTypeDefinition xsdType) { store(xsdType); }
- public void selectXSDElement(XSDElementDeclaration xsdElement) { }
- public void selectMessageType(Message message) { store(message); }
+ // https://issues.jboss.org/browse/JBIDE-8045
+ public void selectXSDType(XSDTypeDefinition xsdType) {
+ MessageDialog.openError(null, Messages.SelectionAndCreationDialog_Error_2,
+ Messages.FaultCatchNameSection_Error_Invalid_Type);
+ }
+ public void selectXSDElement(XSDElementDeclaration xsdElement) {
+ store(xsdElement);
+ }
+ public void selectMessageType(Message message) {
+ store(message);
+ }
}
protected void createVariableWidgets(Composite parent) {
@@ -714,6 +728,10 @@
if (_catch.getFaultMessageType() != null) {
variableTypeSelector.setVariableType(_catch.getFaultMessageType());
}
+ // https://issues.jboss.org/browse/JBIDE-8045
+ if (_catch.getFaultElement() != null) {
+ variableTypeSelector.setVariableType(_catch.getFaultElement());
+ }
}
@Override
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/InvokeImplSection.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/InvokeImplSection.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/InvokeImplSection.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -52,6 +52,9 @@
import org.eclipse.bpel.ui.details.providers.PartnerRoleFilter;
import org.eclipse.bpel.ui.details.providers.WSDLFaultContentProvider;
import org.eclipse.bpel.ui.details.tree.ITreeNode;
+import org.eclipse.bpel.ui.details.tree.OperationTreeNode;
+import org.eclipse.bpel.ui.details.tree.PartnerLinkTreeNode;
+import org.eclipse.bpel.ui.details.tree.TreeNode;
import org.eclipse.bpel.ui.dialogs.PartnerLinkRoleSelectorDialog;
import org.eclipse.bpel.ui.dialogs.PartnerLinkTypeSelectorDialog;
import org.eclipse.bpel.ui.proposal.providers.ModelContentProposalProvider;
@@ -89,6 +92,7 @@
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Text;
import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeItem;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.forms.events.HyperlinkAdapter;
import org.eclipse.ui.forms.events.HyperlinkEvent;
@@ -132,6 +136,8 @@
private Composite faultComposite;
private Label faultLabel;
private Text faultText;
+ // https://issues.jboss.org/browse/JBIDE-7861
+ private boolean ignoreQuickPickSelection = false;
private IControlContentAdapter fTextContentAdapter = new TextContentAdapter() {
@Override
@@ -170,20 +176,13 @@
private static List<String> getVariablesNamesInUse(EObject parent) {
List<String> variablesNames = new ArrayList<String>();
- Variables variables;
- for (;parent != null; parent = parent.eContainer()) {
- if (parent instanceof Process) {
- variables = ((Process)parent).getVariables();
- } else if (parent instanceof Scope) {
- variables = ((Scope)parent).getVariables();
- } else {
- continue;
- }
- EList<Variable> variableList = variables.getChildren();
- for (Variable var : variableList) {
- variablesNames.add(var.getName());
- }
- }
+ // https://issues.jboss.org/browse/JBIDE-8042
+ // grab all visible variables, not just Process and Scope variables
+ // NOTE: this includes implicit variables defined in ForEach
+ Variable[] variables = BPELUtil.getVisibleVariables((EObject)parent);
+ for (Variable var : variables) {
+ variablesNames.add(var.getName());
+ }
return variablesNames;
}
@@ -1154,7 +1153,12 @@
quickPickTreeViewer.addSelectionChangedListener( new ISelectionChangedListener () {
public void selectionChanged(SelectionChangedEvent event) {
- quickPickSelectionChanged ( event.getSelection() );
+ // https://issues.jboss.org/browse/JBIDE-7861
+ // ignore if the selection event came from updateQuickPickSelection()
+ if (ignoreQuickPickSelection)
+ ignoreQuickPickSelection = false;
+ else
+ quickPickSelectionChanged ( event.getSelection() );
}
@@ -1189,7 +1193,9 @@
partnerName.setText(EMPTY_STRING);
} else {
ILabeledElement labeledElement = BPELUtil.adapt(partnerLink, ILabeledElement.class);
- partnerName.setText(labeledElement.getLabel(partnerLink));
+ // https://issues.jboss.org/browse/JBIDE-7861
+ partnerName.setText(labeledElement.getLabel(partnerLink));
+ updateQuickPickSelection(partnerLink);
}
}
@@ -1268,7 +1274,42 @@
}
}
+ // https://issues.jboss.org/browse/JBIDE-7861
+ // update the Quick Pick tree with currently selected model object
+ private void updateQuickPickSelection(Object model) {
+
+ ignoreQuickPickSelection = true;
+
+ TreeItem[] items = quickPickTree.getItems();
+ for (int i=0; i<items.length; ++i) {
+ if ( updateQuickPickSelection(model, items[i]))
+ break;
+ }
+ }
+ private boolean updateQuickPickSelection(Object model, TreeItem item)
+ {
+ Object data = item.getData();
+ if ( data instanceof TreeNode ) {
+ Object obj = ((TreeNode)data).getModelObject();
+ if (obj instanceof PartnerLink) {
+ PartnerLink partnerLink = ModelHelper.getPartnerLink(getInput());
+ if (obj!=partnerLink)
+ return false;
+ }
+ if (model==obj) {
+ quickPickTree.setSelection(item);
+ return true;
+ }
+ TreeItem[] items = item.getItems();
+ for (int i=0; i<items.length; ++i) {
+ if ( updateQuickPickSelection(model, items[i]))
+ return true;;
+ }
+ }
+ return false;
+ }
+
private void updatePortTypeWidgets() {
if (interfaceName == null) {
return ;
@@ -1291,6 +1332,8 @@
Operation operation = ModelHelper.getOperation(getInput());
if (operation != null) {
operationText.setText( operation.getName() );
+ // https://issues.jboss.org/browse/JBIDE-7861
+ updateQuickPickSelection(operation);
} else {
operationText.setText ( EMPTY_STRING );
}
@@ -1370,10 +1413,11 @@
PortType portType = ModelHelper.getPortType( model );
List<Command> cmdList = basicCommandList( model , IGNORE_PARTNER_LINK, null );
+ Operation op = null;
if (text.length() > 0) {
- Operation op = (Operation) ModelHelper.findElementByName(
+ op = (Operation) ModelHelper.findElementByName(
portType ,
text,
Operation.class);
@@ -1386,12 +1430,23 @@
}
});
cmd.setNewValue(op);
+ // https://issues.jboss.org/browse/JBIDE-7861
+ // set new operation in the command list
+ for (int i=0; i<cmdList.size(); ++i) {
+ if ( cmdList.get(i) instanceof SetOperationCommand) {
+ cmdList.set(i, cmd);
+ break;
+ }
+ }
}
}
CompoundCommand cmd = new CompoundCommand();
cmd.getCommands().addAll( cmdList );
getCommandFramework().execute ( cmd );
+
+ if (op!=null)
+ updateQuickPickSelection(op);
}
// void findAndSetOrCreateVariable (String text, int direction) {
@@ -1485,19 +1540,24 @@
pl = (PartnerLink) ModelHelper.findElementByName(ModelHelper.getContainingScope(model),
name, PartnerLink.class);
// does not exist
- if (pl == null) {
- createPartnerLink ( ModelHelper.getContainingScope(model), name );
+ if (pl == null) {
+ // https://issues.jboss.org/browse/JBIDE-7861
+ pl = createPartnerLink ( ModelHelper.getContainingScope(model), name );
+ if (pl!=null)
+ updateQuickPickSelection(pl);
return ;
}
}
CompoundCommand cmd = new CompoundCommand();
cmd.getCommands().addAll( basicCommandList(model, pl, null));
- getCommandFramework().execute ( cmd );
+ getCommandFramework().execute ( cmd );
+ if (pl!=null)
+ updateQuickPickSelection(pl);
}
- private void createPartnerLink ( EObject ref , String name ) {
+ private PartnerLink createPartnerLink ( EObject ref , String name ) {
PartnerLink pl = BPELFactory.eINSTANCE.createPartnerLink();
if (name == null) {
@@ -1513,14 +1573,14 @@
BPELUtil.getNCNameValidator());
if (nameDialog.open() == Window.CANCEL) {
- return ;
+ return null;
}
PartnerLinkTypeSelectorDialog dialog = new PartnerLinkTypeSelectorDialog(
partnerName.getShell(),
getInput());
if (dialog.open() == Window.CANCEL) {
- return ;
+ return null;
}
Object result = dialog.getFirstResult();
PartnerLinkType plt = null;
@@ -1539,7 +1599,7 @@
roleDialog.setTitle(Messages.PartnerRoleSelectorDialog_Title_MyRole);
}
if (roleDialog.open() == Window.CANCEL){
- return;
+ return null;
}
if (isInvoke){
pl.setPartnerRole(list.get(roleDialog.getSelectedRole()));
@@ -1569,6 +1629,8 @@
// TODO: Is there any way to refresh quick pick without this hack?
quickPickTreeViewer.setInput ( null );
updateQuickPickWidgets();
+
+ return pl;
}
/**
@@ -1614,6 +1676,10 @@
// org.eclipse.bpel.ui.details.tree.XSDElementDeclarationTreeNode@1e96ffd
//
+ // https://issues.jboss.org/browse/JBIDE-7861
+ if (ignoreQuickPickSelection)
+ return;
+
EObject input = getInput();
List cmdList = basicCommandList( input , null, null);
@@ -1766,7 +1832,16 @@
private Variable findVariable ( EObject input, Message msg , PartnerLink pl ) {
- Variable list[] = ModelHelper.getVariablesOfType( input, msg );
+ Variable list[] = null;
+
+ // https://issues.jboss.org/browse/JBIDE-8048
+ // this property section is also used by OnEvent
+ if (input instanceof OnEvent) {
+ OnEvent oe = (OnEvent)input;
+ list = new Variable[] { oe.getVariable() };
+ }
+ else
+ list = ModelHelper.getVariablesOfType( input, msg );
if ( list.length == 1 ) {
return list[0];
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/InvokeVariableSection.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/InvokeVariableSection.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/InvokeVariableSection.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -64,6 +64,8 @@
import org.eclipse.jface.window.Window;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.events.FocusEvent;
+import org.eclipse.swt.events.FocusListener;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.graphics.Point;
@@ -379,7 +381,21 @@
}
}
});
+
+ // https://issues.jboss.org/browse/JBIDE-8048
+ // do the same thing when variable name widget loses focus
+ inputVariableText.addFocusListener(new FocusListener() {
+ public void focusGained(FocusEvent arg0) {
+ }
+
+ public void focusLost(FocusEvent arg0) {
+ findAndSetOrCreateVariable(inputVariableText.getText(),
+ isInvoke() ? ModelHelper.OUTGOING
+ : ModelHelper.INCOMING);
+ }
+ });
+
data = new FlatFormData();
data.right = new FlatFormAttachment(100, 0);
data.top = new FlatFormAttachment(inputVariableText, +2, SWT.TOP);
@@ -417,6 +433,11 @@
FlatFormData data;
final Composite composite = this.outputVariableComposite = createFlatFormComposite(parent);
+ if (isReceive()) {
+ // https://issues.jboss.org/browse/JBIDE-8048
+ // don't even bother creating widgets we will never use
+ return composite;
+ }
data = new FlatFormData();
if (top == null) {
@@ -1019,7 +1040,9 @@
}
private boolean isReceive() {
- return getInput() instanceof Receive || getInput() instanceof OnMessage;
+ // https://issues.jboss.org/browse/JBIDE-8048
+ // OnEvent is also a type of Receive
+ return getInput() instanceof Receive || getInput() instanceof OnMessage || getInput() instanceof OnEvent;
}
/**
@@ -1078,6 +1101,11 @@
private void updateInputVariableWidgets() {
inputVariableComposite.setVisible(!isReply());
+ if (getInput() instanceof OnEvent) {
+ // https://issues.jboss.org/browse/JBIDE-8048
+ // hide the proposal drop-down button - user must enter variable name
+ inputVariableButton.setVisible(false);
+ }
if (isReply())
return;
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/LiteralAssignCategory.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/LiteralAssignCategory.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/LiteralAssignCategory.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -1,146 +1,149 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.bpel.ui.properties;
-
-import org.eclipse.bpel.common.ui.flatui.FlatFormAttachment;
-import org.eclipse.bpel.common.ui.flatui.FlatFormData;
-import org.eclipse.bpel.model.From;
-import org.eclipse.bpel.model.resource.BPELResource;
-import org.eclipse.bpel.model.util.BPELUtils;
-import org.eclipse.bpel.ui.IBPELUIConstants;
-import org.eclipse.bpel.ui.Messages;
-import org.eclipse.bpel.ui.adapters.IVirtualCopyRuleSide;
-import org.eclipse.bpel.ui.util.BPELUtil;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Text;
-
-
-/**
- * An AssignCategory where the user can type in a literal value (note: NOT an expression).
- *
- * TODO: his could be an XML editor one day ...
- */
-
-public class LiteralAssignCategory extends AssignCategoryBase {
-
- Text fLiteralText;
-
- protected LiteralAssignCategory (BPELPropertySection ownerSection ) {
- super(ownerSection);
- }
-
- /**
- * @see org.eclipse.bpel.ui.properties.IAssignCategory#getName()
- */
-
- @Override
- public String getName() {
- return Messages.LiteralAssignCategory_Fixed_Value_1;
- }
-
- @Override
- protected String getLabelFlatFormatString() {
- return IBPELUIConstants.FORMAT_CMD_EDIT;
- }
-
- @Override
- protected void createClient2(Composite parent) {
- FlatFormData data;
-
-
- fLiteralText = fWidgetFactory.createText(parent, EMPTY_STRING, SWT.V_SCROLL | SWT.MULTI);
- data = new FlatFormData();
- data.left = new FlatFormAttachment(0, 0);
- data.right = new FlatFormAttachment(100, 0);
- //data.top = new FlatFormAttachment(typeComposite, IDetailsAreaConstants.VSPACE);
- data.top = new FlatFormAttachment(0,0);
- data.bottom = new FlatFormAttachment(100, 0);
- fLiteralText.setLayoutData(data);
-
- fChangeHelper.startListeningTo(fLiteralText);
- }
-
-
- /**
- * @see org.eclipse.bpel.ui.properties.IAssignCategory#isCategoryForModel(org.eclipse.emf.ecore.EObject)
- */
-
- @Override
- public boolean isCategoryForModel (EObject aModel) {
- From from = BPELUtil.adapt(aModel, From.class);
- return (from != null && from.getLiteral() != null);
- }
-
- @Override
- protected void load (IVirtualCopyRuleSide aModel) {
-
- From from = BPELUtil.adapt(aModel.getCopyRuleSide(), From.class);
-
- fChangeHelper.startNonUserChange();
- String fromString = EMPTY_STRING;
- if (from != null) {
- fromString = from.getLiteral();
- }
- if (fromString == null) {
- fromString = EMPTY_STRING;
- }
-
- fLiteralText.setText(fromString);
- fChangeHelper.finishNonUserChange();
- }
-
-
- @Override
- protected void store (IVirtualCopyRuleSide aModel) {
-
- From from = BPELUtil.adapt(aModel.getCopyRuleSide(), From.class);
-
- String expr = fLiteralText.getText();
-
- from.setLiteral(expr);
-
- if (expr == null) {
- from.setUnsafeLiteral(Boolean.FALSE);
- } else {
- // test if the unsafe literal can be converted into an element and serialized safely
- if (BPELUtils.convertStringToNode(from, expr, (BPELResource)getBPELEditor().getResource()) != null) {
- from.setUnsafeLiteral(Boolean.TRUE);
- } else {
- from.setUnsafeLiteral(Boolean.FALSE);
- MessageDialog.openWarning(fLiteralText.getShell(),
- Messages.LiteralAssignCategory_Warning_1,
- Messages.LiteralAssignCategory_Literal_not_XML_2);
- }
- }
-
- }
-
- /**
- * @see org.eclipse.bpel.ui.properties.BPELPropertySection#getUserContext()
- */
- @Override
- public Object getUserContext() {
- return null;
- }
-
- /**
- * @see org.eclipse.bpel.ui.properties.BPELPropertySection#restoreUserContext(java.lang.Object)
- */
-
- @Override
- public void restoreUserContext(Object userContext) {
- fLiteralText.setFocus();
- }
-
-}
+/*******************************************************************************
+ * Copyright (c) 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are 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:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.bpel.ui.properties;
+
+import org.eclipse.bpel.common.ui.flatui.FlatFormAttachment;
+import org.eclipse.bpel.common.ui.flatui.FlatFormData;
+import org.eclipse.bpel.model.From;
+import org.eclipse.bpel.model.resource.BPELResource;
+import org.eclipse.bpel.model.util.BPELUtils;
+import org.eclipse.bpel.ui.IBPELUIConstants;
+import org.eclipse.bpel.ui.Messages;
+import org.eclipse.bpel.ui.adapters.IVirtualCopyRuleSide;
+import org.eclipse.bpel.ui.util.BPELUtil;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Text;
+
+
+/**
+ * An AssignCategory where the user can type in a literal value (note: NOT an expression).
+ *
+ * TODO: his could be an XML editor one day ...
+ */
+
+public class LiteralAssignCategory extends AssignCategoryBase {
+
+ Text fLiteralText;
+
+ protected LiteralAssignCategory (BPELPropertySection ownerSection ) {
+ super(ownerSection);
+ }
+
+ /**
+ * @see org.eclipse.bpel.ui.properties.IAssignCategory#getName()
+ */
+
+ @Override
+ public String getName() {
+ return Messages.LiteralAssignCategory_Fixed_Value_1;
+ }
+
+ @Override
+ protected String getLabelFlatFormatString() {
+ return IBPELUIConstants.FORMAT_CMD_EDIT;
+ }
+
+ @Override
+ protected void createClient2(Composite parent) {
+ FlatFormData data;
+
+
+ fLiteralText = fWidgetFactory.createText(parent, EMPTY_STRING, SWT.V_SCROLL | SWT.MULTI);
+ data = new FlatFormData();
+ data.left = new FlatFormAttachment(0, 0);
+ data.right = new FlatFormAttachment(100, 0);
+ //data.top = new FlatFormAttachment(typeComposite, IDetailsAreaConstants.VSPACE);
+ data.top = new FlatFormAttachment(0,0);
+ data.bottom = new FlatFormAttachment(100, 0);
+ fLiteralText.setLayoutData(data);
+
+ fChangeHelper.startListeningTo(fLiteralText);
+ }
+
+
+ /**
+ * @see org.eclipse.bpel.ui.properties.IAssignCategory#isCategoryForModel(org.eclipse.emf.ecore.EObject)
+ */
+
+ @Override
+ public boolean isCategoryForModel (EObject aModel) {
+ From from = BPELUtil.adapt(aModel, From.class);
+ return (from != null && from.getLiteral() != null);
+ }
+
+ @Override
+ protected void load (IVirtualCopyRuleSide aModel) {
+
+ From from = BPELUtil.adapt(aModel.getCopyRuleSide(), From.class);
+
+ fChangeHelper.startNonUserChange();
+ try {
+ String fromString = EMPTY_STRING;
+ if (from != null) {
+ fromString = from.getLiteral();
+ }
+ if (fromString == null) {
+ fromString = EMPTY_STRING;
+ }
+
+ fLiteralText.setText(fromString);
+ } finally {
+ fChangeHelper.finishNonUserChange();
+ }
+ }
+
+
+ @Override
+ protected void store (IVirtualCopyRuleSide aModel) {
+
+ From from = BPELUtil.adapt(aModel.getCopyRuleSide(), From.class);
+
+ String expr = fLiteralText.getText();
+
+ from.setLiteral(expr);
+
+ if (expr == null) {
+ from.setUnsafeLiteral(Boolean.FALSE);
+ } else {
+ // test if the unsafe literal can be converted into an element and serialized safely
+ if (BPELUtils.convertStringToNode(from, expr, (BPELResource)getBPELEditor().getResource()) != null) {
+ from.setUnsafeLiteral(Boolean.TRUE);
+ } else {
+ from.setUnsafeLiteral(Boolean.FALSE);
+ MessageDialog.openWarning(fLiteralText.getShell(),
+ Messages.LiteralAssignCategory_Warning_1,
+ Messages.LiteralAssignCategory_Literal_not_XML_2);
+ }
+ }
+
+ }
+
+ /**
+ * @see org.eclipse.bpel.ui.properties.BPELPropertySection#getUserContext()
+ */
+ @Override
+ public Object getUserContext() {
+ return null;
+ }
+
+ /**
+ * @see org.eclipse.bpel.ui.properties.BPELPropertySection#restoreUserContext(java.lang.Object)
+ */
+
+ @Override
+ public void restoreUserContext(Object userContext) {
+ fLiteralText.setFocus();
+ }
+
+}
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableInitializationSection.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableInitializationSection.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableInitializationSection.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -293,7 +293,7 @@
From from = fVariable.getFrom();
if (from!=null) {
String literal = from.getLiteral();
- if (literal==null || literal.isEmpty()) {
+ if (literal==null || "".equals(literal.trim())) {
literal = createDefaultInitializer(getBPELEditor(), fVariable, null);
from.setLiteral(literal);
}
@@ -350,7 +350,7 @@
String literal = EMPTY_STRING;
if ( from!=null && to!=null) {
literal = from.getLiteral();
- if (literal==null || literal.isEmpty()) {
+ if (literal==null || "".equals(literal.trim())) {
literal = createDefaultInitializer(bpelEditor, to.getVariable(), to.getPart());
from.setLiteral(literal);
}
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariablePartAssignCategory.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariablePartAssignCategory.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariablePartAssignCategory.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -39,23 +39,27 @@
import org.eclipse.bpel.ui.util.XSDUtils;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
import org.eclipse.swt.widgets.Tree;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.wst.wsdl.Message;
import org.eclipse.wst.wsdl.Part;
import org.eclipse.xsd.XSDAttributeDeclaration;
import org.eclipse.xsd.XSDElementDeclaration;
import org.eclipse.xsd.XSDNamedComponent;
import org.eclipse.xsd.XSDTypeDefinition;
+import org.eclipse.xsd.impl.XSDTypeDefinitionImpl;
/**
* An AssignCategory presenting a tree from which the user can select any of: -
@@ -477,10 +481,10 @@
side.setQuery(null);
}
- /*
// https://jira.jboss.org/browse/JBIDE-7351
- // remove all of this: don't ask to initialize variables whenever focus
- // changes - this makes for a bad user experience!
+ // TODO: Think about how to implement this in a way that makes sense...
+ // currently, a popup dialog asks the user to initialize variables whenever
+ // focus changes - this makes for a bad user experience!
// From?
if (side.isSource())
return;
@@ -490,23 +494,22 @@
if (query == null)
return;
Variable var = side.getVariable();
- if (isInitializerExist(var, side))
- return;
- if (MessageDialog
- .openQuestion(
- PlatformUI.getWorkbench().getActiveWorkbenchWindow()
- .getShell(),
- "Initializer",
- NLS
- .bind(
- "Variable {0} doesn't have initializer. Should it be generated?",
- (new Object[] { var.getName() })))) {
- initTargetVariable(var, side);
+ if (needInitializer(var, side)) {
+ if (MessageDialog
+ .openQuestion(
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow()
+ .getShell(),
+ "Initializer",
+ NLS
+ .bind(
+ "Variable {0} doesn't have initializer. Should it be generated?",
+ (new Object[] { var.getName() })))) {
+ initTargetVariable(var, side);
+ }
}
- */
}
- private boolean isInitializerExist(Variable var, IVirtualCopyRuleSide side) {
+ private boolean needInitializer(Variable var, IVirtualCopyRuleSide side) {
Assign a = (Assign) ((To) side.getCopyRuleSide()).getContainer()
.getContainer();
EList<Copy> list = a.getCopy();
@@ -523,9 +526,53 @@
if (p == null)
continue;
if (p.equals(side.getPart()))
- return true;
+ return false;
}
- return false;
+
+ // https://issues.jboss.org/browse/JBIDE-8048
+ // check if initialization is possible: this is not possible if the
+ // variable is implicit (e.g. in a ForEach or OnEvent)
+ String rootElement = null;
+ String uriWSDL = null;
+
+ // Variable is defined using "messageType"
+ Message msg = var.getMessageType();
+ if (msg != null && !msg.eIsProxy()) {
+ // https://jira.jboss.org/browse/JBIDE-6697
+ // from eclipse.org/bpel rev 1.17 on 7/23/2010 3:13AM bugzilla 302943 by gqian: apply the patch from bugzilla
+ if (side.getPart() != null) {
+ XSDElementDeclaration declaration = side.getPart().getElementDeclaration();
+ if (declaration != null) {
+ uriWSDL = declaration.getSchema().getSchemaLocation();
+ rootElement = declaration.getName();
+ }
+ }
+ }
+
+ // can we construct an initializer for this variable?
+ // Variable is defined using "type"
+ XSDTypeDefinitionImpl type = (XSDTypeDefinitionImpl)var.getType();
+ if (type != null && !type.eIsProxy()) {
+ QName qname = new QName(type.getTargetNamespace(), type.getName());
+ rootElement = qname.getLocalPart();
+ uriWSDL = type.eResource().getURI().toString();
+ }
+
+ // Variable is defined using "element"
+ XSDElementDeclaration element = var.getXSDElement();
+ if (element != null && !element.eIsProxy()) {
+ QName qname = new QName(element.getTargetNamespace(), element
+ .getName());
+ rootElement = qname.getLocalPart();
+ uriWSDL = element.eResource().getURI().toString();
+ }
+
+ // Incomplete variable definition
+ if (rootElement == null || uriWSDL == null) {
+ return false;
+ }
+
+ return true;
}
private void initTargetVariable(Variable var, IVirtualCopyRuleSide side) {
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSelector.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSelector.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSelector.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -617,7 +617,10 @@
dataTypeNameText.addHyperlinkListener(new HyperlinkAdapter() {
@Override
public void linkActivated(HyperlinkEvent e) {
- BPELUtil.openEditor(getVariableType(), bpelEditor);
+ // https://issues.jboss.org/browse/JBIDE-8048
+ // don't bother trying to open editor if variable is not defined
+ if (getVariableType() != null)
+ BPELUtil.openEditor(getVariableType(), bpelEditor);
}
});
@@ -686,8 +689,10 @@
data.left = new FlatFormAttachment(dataTypeTreeLabel,0, SWT.LEFT);
data.top = new FlatFormAttachment(dataTypeTreeLabel,0, SWT.BOTTOM);
data.right = new FlatFormAttachment(100, -IDetailsAreaConstants.HSPACE) ;
- data.bottom = new FlatFormAttachment(100, -IDetailsAreaConstants.HSPACE);
- dataTypeTree.setLayoutData(data);
+ // https://issues.jboss.org/browse/JBIDE-8048
+ // make the message structure viewer a wee bit larger than just a single line
+ data.bottom = new FlatFormAttachment(dataTypeTreeLabel,150, SWT.BOTTOM); //new FlatFormAttachment(100, -IDetailsAreaConstants.HSPACE);
+ dataTypeTree.setLayoutData(data);
}
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELUtil.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELUtil.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELUtil.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -1394,11 +1394,13 @@
}
return true;
}
- });
- returnObjects.remove(0); //remove the scope containing the compensate
+ });
+ // https://issues.jboss.org/browse/JBIDE-8044
+ if (!returnObjects.isEmpty())
+ returnObjects.remove(0); //remove the scope containing the compensate
return returnObjects;
- }
- throw new IllegalArgumentException();
+ }
+ throw new IllegalArgumentException();
}
public static Object resolveXSDObject(Object xsdObject) {
@@ -1721,13 +1723,14 @@
public static void openEditor(EObject modelObject, BPELEditor editor) {
try {
+ // https://issues.jboss.org/browse/JBIDE-8044
+ Assert.isNotNull(modelObject);
+ Assert.isNotNull(modelObject.eResource());
// https://jira.jboss.org/browse/JBIDE-7351
// try to resolve proxies here, otherwise we don't know editor input
if (modelObject.eIsProxy()) {
modelObject = EmfModelQuery.resolveProxy(editor.getProcess(), modelObject);
}
- Assert.isNotNull(modelObject);
- Assert.isNotNull(modelObject.eResource());
IFile file = BPELUtil.getFileFromURI(modelObject.eResource().getURI());
IDE.openEditor(editor.getSite().getWorkbenchWindow().getActivePage(), file);
} catch (PartInitException ex) {
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/WSDLImportHelper.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/WSDLImportHelper.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/WSDLImportHelper.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -334,8 +334,9 @@
// BaseURI source = new BaseURI(sourceURI);
// return source.getRelativeURI(targetURI);
// TODO: this is probably bogus.
+ // https://issues.jboss.org/browse/JBIDE-8087
String result = targetURI.deresolve(sourceURI, true, true, true)
- .toFileString();
+ .toString();
// When absolute URLs
return (result == null ? targetURI.toString() : result);
}
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -152,10 +152,10 @@
Messages.NewFileWizard_WSDLCustomPage_Name);
addPage(fMainPage);
+ addPage(fContainerPage);
addPage(wsdlPage);
- addPage(fContainerPage);
- wsdlPage.setPreviousPage(fMainPage);
- fContainerPage.setPreviousPage(wsdlPage);
+ wsdlPage.setPreviousPage(fContainerPage);
+ fContainerPage.setPreviousPage(fMainPage);
}
/**
@@ -213,6 +213,16 @@
return container.getProject();
return null;
}
+
+ public IResource getResourceContainer()
+ {
+ IContainer container = fContainerPage.getResourceContainer();
+ if (container == null) {
+ container = mContainer;
+ }
+ return container;
+ }
+
/**
* Return the BPEL files container in which we can generate process from the
* template.
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage2.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage2.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage2.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -72,7 +72,8 @@
Messages.NewFileWizardPage2_1,
Messages.NewFileWizardPage2_2 );
-
+
+ fResourceComposite.setSelectedResource(((NewFileWizard)getWizard()).getResourceContainer());
setControl( composite );
}
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLCustomPage.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLCustomPage.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLCustomPage.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -76,34 +76,6 @@
setDescription(Messages.NewFileWizard_WSDLCustomPage_Description);
setImageDescriptor(BPELUIPlugin.INSTANCE
.getImageDescriptor(IBPELUIConstants.ICON_WIZARD_BANNER));
-
-
- // TODO: test code - implement this when we switch over to generic runtime support
- // for deployment to jboss/riftsaw and others...
- try {
- IProject project = ((NewFileWizard)getWizard()).getProject();
- IFacetedProject facetedProject = null;
- facetedProject = ProjectFacetsManager.create(project);
- if (facetedProject != null
- && ProjectFacetsManager.isProjectFacetDefined(IBPELModuleFacetConstants.BPEL20_PROJECT_FACET))
- {
- IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(IBPELModuleFacetConstants.BPEL20_PROJECT_FACET);
- IRuntime rt = facetedProject.getPrimaryRuntime();
- String id = rt.getProperty("id");
- org.eclipse.wst.server.core.IRuntime rt2 = ServerCore.findRuntime(id);
- IRuntimeType rtt = rt2.getRuntimeType();
- RuntimeDelegate delegate = (RuntimeDelegate) rt2.getAdapter(RuntimeDelegate.class);
- if (delegate instanceof IBPELRuntimeDelegate) {
- // get port, server address and deploy directory
- // to build service name for WSDL
- }
- }
- }
- catch(Exception e)
- {
-
- }
-
}
public void createControl(Composite parent) {
@@ -217,6 +189,40 @@
bindingLabel.setVisible(true);
bindingField.setVisible(true);
}
+
+ if (visible) {
+
+ // TODO: test code - implement this when we switch over to generic runtime support
+ // for deployment to jboss/riftsaw and others...
+ try {
+ IProject project = ((NewFileWizard)getWizard()).getProject();
+ IFacetedProject facetedProject = null;
+ facetedProject = ProjectFacetsManager.create(project);
+ if (facetedProject != null
+ && ProjectFacetsManager.isProjectFacetDefined(IBPELModuleFacetConstants.BPEL20_PROJECT_FACET))
+ {
+ IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(IBPELModuleFacetConstants.BPEL20_PROJECT_FACET);
+ IRuntime rt = facetedProject.getPrimaryRuntime();
+ String id = rt.getProperty("id");
+ org.eclipse.wst.server.core.IRuntime rt2 = ServerCore.findRuntime(id);
+ IRuntimeType rtt = rt2.getRuntimeType();
+ RuntimeDelegate delegate = (RuntimeDelegate) rt2.getAdapter(RuntimeDelegate.class);
+ if (delegate instanceof IBPELRuntimeDelegate) {
+ // get port, server address and deploy directory
+ // to build service name for WSDL
+ IBPELRuntimeDelegate bpelDelegate = (IBPELRuntimeDelegate)delegate;
+ String address = bpelDelegate.getServerAddress();
+ String port = bpelDelegate.getPort();
+ String deployDir = bpelDelegate.getDeployDir();
+ addressField.setText("http://" + address + ":" + port + deployDir + "/" + serviceNameField.getText().trim());
+ }
+ }
+ }
+ catch(Exception e)
+ {
+
+ }
+ }
}
protected boolean validatePage() {
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF 2011-02-22 18:05:19 UTC (rev 29266)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.validator;singleton:=true
-Bundle-Version: 0.6.0.qualifier
+Bundle-Version: 0.7.0.qualifier
Bundle-Activator: org.eclipse.bpel.validator.Activator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -11,12 +11,12 @@
org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.xsd;bundle-version="[2.4.0,3.0.0)",
org.eclipse.wst.wsdl,
- org.eclipse.bpel.model;bundle-version="[0.4.0,2.0.0)",
- org.eclipse.bpel.common.model;bundle-version="[0.4.0,2.0.0)",
+ org.eclipse.bpel.model;bundle-version="[0.7.0,2.0.0)",
+ org.eclipse.bpel.common.model;bundle-version="[0.7.0,2.0.0)",
org.eclipse.wst.validation,
org.eclipse.wst.wsdl.validation,
org.eclipse.wst.xml.core,
- org.eclipse.bpel.xpath10;bundle-version="[0.4.0,1.0.0)",
+ org.eclipse.bpel.xpath10;bundle-version="[0.7.0,2.0.0)",
javax.wsdl;bundle-version="[1.5.0,1.6.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.validator/pom.xml
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.validator/pom.xml 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.validator/pom.xml 2011-02-22 18:05:19 UTC (rev 29266)
@@ -1,13 +1,13 @@
-<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools.bpel.plugins</groupId>
+ <groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.eclipse.bpel.validator</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.7.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
-</project>
+</project>
\ No newline at end of file
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/ModelQueryImpl.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/ModelQueryImpl.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/ModelQueryImpl.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -27,6 +27,7 @@
import org.eclipse.bpel.validator.model.IModelQuery;
import org.eclipse.bpel.validator.model.INode;
import org.eclipse.bpel.validator.model.NodeAttributeValueFilter;
+import org.eclipse.bpel.validator.model.NodeNameFilter;
import org.eclipse.bpel.validator.model.Selector;
import org.eclipse.bpel.validator.model.UndefinedNode;
import org.eclipse.bpel.validator.model.XNotImplemented;
@@ -216,17 +217,35 @@
IFilter<INode> aFilterByName = new NodeAttributeValueFilter(IConstants.AT_NAME, name );
IFilter<INode> aFilterByFaultVariable = new NodeAttributeValueFilter(IConstants.AT_FAULT_VARIABLE, name );
-
+ IFilter<INode> aFilterByVariable = new NodeAttributeValueFilter(IConstants.AT_VARIABLE, name );
+ IFilter<INode> aFilterByCounterName = new NodeAttributeValueFilter(IConstants.AT_COUNTER_NAME, name );
+ IFilter<INode> nFilterForEach = new NodeNameFilter(IConstants.ND_FOR_EACH);
+
while (context != null) {
if (Filters.SCOPE_OR_PROCESS.select (context) ) {
+ // select variables defined in a scope or process
INode var = mSelector.selectNode(context,IConstants.ND_VARIABLES,IConstants.ND_VARIABLE,aFilterByName);
if (var != null) {
return var;
}
+ // select catch name defined in faultHandlers
var = mSelector.selectNode(context,IConstants.ND_FAULT_HANDLERS,IConstants.ND_CATCH,aFilterByFaultVariable);
if (var != null) {
return var;
}
+ // https://issues.jboss.org/browse/JBIDE-8044
+ // select variable defined in onEvent of eventHandlers
+ var = mSelector.selectNode(context,IConstants.ND_EVENT_HANDLERS,IConstants.ND_ON_EVENT,aFilterByVariable);
+ if (var != null) {
+ return var;
+ }
+ // select counterName defined in forEach
+ INode parent = mSelector.selectParent(context,nFilterForEach);
+ if (parent != null) {
+ if (aFilterByCounterName.select(parent)) {
+ return parent;
+ }
+ }
}
context = context.parentNode();
}
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/Factory.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/Factory.java 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/Factory.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -50,7 +50,13 @@
String nsURI = qname.getNamespaceURI();
if (nsURI.equals(IConstants.XMLNS_BPEL) || nsURI.equals(IConstants.XMLNS_BPEL20_OLD)) {
- return createValidator ( qname.getLocalPart() );
+ // Bugzilla 324165
+ // https://issues.jboss.org/browse/JBIDE-6825
+ // handle unknown BPEL elements
+ Validator validator = createValidator ( qname.getLocalPart() );
+ if (validator==null)
+ validator = new UnknownElementValidator();
+ return validator;
}
return null;
Added: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/UnknownElementValidator.java
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/UnknownElementValidator.java (rev 0)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/UnknownElementValidator.java 2011-02-22 18:05:19 UTC (rev 29266)
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2010 JBoss, Inc. and others
+ * All rights reserved. This program and the accompanying materials
+ * are 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
+ */
+package org.eclipse.bpel.validator.rules;
+
+import org.eclipse.bpel.validator.model.IProblem;
+
+/*
+ * This validator handles unknown BPEL elements. Actually not a validator at all, just an error reporter.
+ *
+ * @see Bugzilla 324165
+ * @see https://issues.jboss.org/browse/JBIDE-6825
+ * @author Bob Brodt
+ * @date Aug 13, 2010
+ */
+public class UnknownElementValidator extends CValidator {
+
+ @Override
+ protected void start () {
+ super.start();
+
+ IProblem problem = createError();
+
+ problem.fill("BPELC_UNKNOWN__ELEMENT",
+ toString(mNode.nodeName()),
+ mNode.nodeName().getNamespaceURI());
+ }
+
+ @Override
+ public void checkParentNode () {
+ }
+}
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/messages.properties
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/messages.properties 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/messages.properties 2011-02-22 18:05:19 UTC (rev 29266)
@@ -626,10 +626,10 @@
# {0} : node
# {1} : fault QName
BPELC_CATCH__STANDARD_FAULT.summary = Standard fault "{1}" cannot be \
- handled in <{0}> when existOnStandardFaults is set to yes.
+ handled in <{0}> when exitOnStandardFaults is set to yes.
BPELC_CATCH__STANDARD_FAULT = Standard fault "{1}" cannot be \
- handled in <{0}> when existOnStandardFaults is set to yes.
-BPELC_CATCH__STANDARD_FAULT.fix = Remove the handler or disable exit on standard faults.
+ handled in <{0}> when exitOnStandardFaults is set to yes.
+BPELC_CATCH__STANDARD_FAULT.fix = Remove the handler or set "Exit On Standard Faults" to "No" for this process.
#
# BPELC_CATCH__EXIST
# {0}: node name
@@ -922,3 +922,15 @@
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
+#
+# Bugzilla 324165
+# https://issues.jboss.org/browse/JBIDE-6825
+#
+# ------------- Unknown BPEL Element ---------------------
+# BPELC_UNKNOWN__ELEMENT
+# {0}: node
+# {1}: namespace URI
+#
+BPELC_UNKNOWN__ELEMENT.summary = BPEL element <{0}> is not supported.
+BPELC_UNKNOWN__ELEMENT = BPEL element <{0}> in namespace "{1}" is not supported by this implementation.
+BPELC_UNKNOWN__ELEMENT.fix = Remove the element <{0}> or contact the vendor to obtain the necessary plug-in(s)
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.wsil.model/META-INF/MANIFEST.MF
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.wsil.model/META-INF/MANIFEST.MF 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.wsil.model/META-INF/MANIFEST.MF 2011-02-22 18:05:19 UTC (rev 29266)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.wsil.model; singleton:=true
-Bundle-Version: 0.5.0.qualifier
+Bundle-Version: 0.7.0.qualifier
Bundle-ClassPath: wsli-model.jar
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -26,5 +26,5 @@
org.eclipse.bpel.wsil.model.inspection"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)";visibility:=reexport
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.wsil.model/pom.xml
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.wsil.model/pom.xml 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.wsil.model/pom.xml 2011-02-22 18:05:19 UTC (rev 29266)
@@ -1,13 +1,13 @@
-<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools.bpel.plugins</groupId>
+ <groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.eclipse.bpel.wsil.model</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.7.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
-</project>
+</project>
\ No newline at end of file
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.xpath10/META-INF/MANIFEST.MF
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.xpath10/META-INF/MANIFEST.MF 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.xpath10/META-INF/MANIFEST.MF 2011-02-22 18:05:19 UTC (rev 29266)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.xpath10
-Bundle-Version: 0.5.0.qualifier
+Bundle-Version: 0.7.0.qualifier
Bundle-Localization: plugin
Bundle-ClassPath: .,
lib/antlr-runtime-3.0.1.jar
Modified: workspace/bbrodt/bpel/plugins/org.eclipse.bpel.xpath10/pom.xml
===================================================================
--- workspace/bbrodt/bpel/plugins/org.eclipse.bpel.xpath10/pom.xml 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/org.eclipse.bpel.xpath10/pom.xml 2011-02-22 18:05:19 UTC (rev 29266)
@@ -1,13 +1,13 @@
-<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools.bpel.plugins</groupId>
+ <groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.eclipse.bpel.xpath10</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.7.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
-</project>
+</project>
\ No newline at end of file
Modified: workspace/bbrodt/bpel/plugins/pom.xml
===================================================================
--- workspace/bbrodt/bpel/plugins/pom.xml 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/plugins/pom.xml 2011-02-22 18:05:19 UTC (rev 29266)
@@ -2,8 +2,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.tools.bpel</groupId>
- <artifactId>plugins</artifactId>
- <name>bpel.plugins</name>
+ <artifactId>org.jboss.tools.bpel.plugins</artifactId>
+ <name>org.jboss.tools.bpel.plugins</name>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
@@ -16,8 +16,8 @@
<module>org.eclipse.bpel.validator</module>
<module>org.eclipse.bpel.wsil.model</module>
<module>org.eclipse.bpel.xpath10</module>
- <module>org.jboss.tools.bpel.cheatsheet</module>
- <module>org.jboss.tools.bpel.runtimes</module>
+ <module>org.eclipse.bpel.cheatsheet</module>
+ <module>org.eclipse.bpel.jboss.riftsaw.runtime</module>
<module>org.eclipse.bpel.runtimes</module>
</modules>
</project>
Modified: workspace/bbrodt/bpel/pom.xml
===================================================================
--- workspace/bbrodt/bpel/pom.xml 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/pom.xml 2011-02-22 18:05:19 UTC (rev 29266)
@@ -2,15 +2,15 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.tools</groupId>
- <artifactId>bpel</artifactId>
- <name>bpel.all</name>
+ <artifactId>org.jboss.tools.bpel.all</artifactId>
+ <name>org.jboss.tools.bpel.all</name>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
+ <module>plugins</module>
<module>features</module>
- <module>plugins</module>
+ <module>site</module>
<module>tests</module>
- <module>site</module>
</modules>
</project>
Modified: workspace/bbrodt/bpel/releng/maps/project.map
===================================================================
--- workspace/bbrodt/bpel/releng/maps/project.map 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/releng/maps/project.map 2011-02-22 18:05:19 UTC (rev 29266)
@@ -14,8 +14,8 @@
plugin@org.eclipse.bpel.wsil.model=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/bpel/plugins/org.eclipse.bpel.wsil.model
plugin@org.eclipse.bpel.xpath10=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/bpel/plugins/org.eclipse.bpel.xpath10
plugin@org.jboss.tools.bpel.as.integration=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/bpel/plugins/org.jboss.tools.bpel.as.integration
-plugin@org.jboss.tools.bpel.cheatsheet=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet
-plugin@org.jboss.tools.bpel.runtimes=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/bpel/plugins/org.jboss.tools.bpel.runtimes
+plugin@org.eclipse.bpel.cheatsheet=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/bpel/plugins/org.eclipse.bpel.cheatsheet
+plugin@org.eclipse.bpel.jboss.riftsaw.runtime=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/bpel/plugins/org.eclipse.bpel.jboss.riftsaw.runtime
feature@org.jboss.tools.bpel.tests.sdk.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/bpel/features/org.jboss.tools.bpel.tests.sdk.feature
feature@org.jboss.tools.bpel.tests.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/bpel/features/org.jboss.tools.bpel.tests.feature
Modified: workspace/bbrodt/bpel/releng/psfs/project.subclipse.psf
===================================================================
--- workspace/bbrodt/bpel/releng/psfs/project.subclipse.psf 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/releng/psfs/project.subclipse.psf 2011-02-22 18:05:19 UTC (rev 29266)
@@ -18,8 +18,8 @@
<project reference="0.9.3,http://anonsvn.jboss.org/repos/jbosstools/trunk/bpel/plugins/org.ec..."/>
<project reference="0.9.3,http://anonsvn.jboss.org/repos/jbosstools/trunk/bpel/plugins/org.ec..."/>
<project reference="0.9.3,http://anonsvn.jboss.org/repos/jbosstools/trunk/bpel/plugins/org.jb..."/>
- <project reference="0.9.3,http://anonsvn.jboss.org/repos/jbosstools/trunk/bpel/plugins/org.jb..."/>
- <project reference="0.9.3,http://anonsvn.jboss.org/repos/jbosstools/trunk/bpel/plugins/org.jb..."/>
+ <project reference="0.9.3,http://anonsvn.jboss.org/repos/jbosstools/trunk/bpel/plugins/org.ec..."/>
+ <project reference="0.9.3,http://anonsvn.jboss.org/repos/jbosstools/trunk/bpel/plugins/org.ec..."/>
<project reference="0.9.3,http://anonsvn.jboss.org/repos/jbosstools/trunk/bpel/features/org.j..."/>
<project reference="0.9.3,http://anonsvn.jboss.org/repos/jbosstools/trunk/bpel/features/org.j..."/>
Modified: workspace/bbrodt/bpel/releng/psfs/project.subversive.psf
===================================================================
--- workspace/bbrodt/bpel/releng/psfs/project.subversive.psf 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/releng/psfs/project.subversive.psf 2011-02-22 18:05:19 UTC (rev 29266)
@@ -18,8 +18,8 @@
<project reference="1.0.1,http://anonsvn.jboss.org/repos/jbosstools/trunk/bpel/plugins/org.ec..."/>
<project reference="1.0.1,http://anonsvn.jboss.org/repos/jbosstools/trunk/bpel/plugins/org.ec..."/>
<project reference="1.0.1,http://anonsvn.jboss.org/repos/jbosstools/trunk/bpel/plugins/org.jb..."/>
- <project reference="1.0.1,http://anonsvn.jboss.org/repos/jbosstools/trunk/bpel/plugins/org.jb..."/>
- <project reference="1.0.1,http://anonsvn.jboss.org/repos/jbosstools/trunk/bpel/plugins/org.jb..."/>
+ <project reference="1.0.1,http://anonsvn.jboss.org/repos/jbosstools/trunk/bpel/plugins/org.ec..."/>
+ <project reference="1.0.1,http://anonsvn.jboss.org/repos/jbosstools/trunk/bpel/plugins/org.ec..."/>
<project reference="1.0.1,http://anonsvn.jboss.org/repos/jbosstools/trunk/bpel/features/org.j..."/>
<project reference="1.0.1,http://anonsvn.jboss.org/repos/jbosstools/trunk/bpel/features/org.j..."/>
Modified: workspace/bbrodt/bpel/site/pom.xml
===================================================================
--- workspace/bbrodt/bpel/site/pom.xml 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/site/pom.xml 2011-02-22 18:05:19 UTC (rev 29266)
@@ -1,14 +1,14 @@
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
-
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.bpel</groupId>
- <artifactId>bpel.site</artifactId>
- <name>bpel.site</name>
+ <artifactId>org.jboss.tools.bpel.site</artifactId>
+ <name>org.jboss.tools.bpel.site</name>
<version>0.0.1-SNAPSHOT</version>
<packaging>eclipse-update-site</packaging>
-</project>
+</project>
\ No newline at end of file
Modified: workspace/bbrodt/bpel/tests/org.jboss.tools.bpel.ui.bot.test/pom.xml
===================================================================
--- workspace/bbrodt/bpel/tests/org.jboss.tools.bpel.ui.bot.test/pom.xml 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/tests/org.jboss.tools.bpel.ui.bot.test/pom.xml 2011-02-22 18:05:19 UTC (rev 29266)
@@ -1,13 +1,13 @@
-<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.bpel.tests</groupId>
<artifactId>org.jboss.tools.bpel.ui.bot.test</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
-</project>
+</project>
\ No newline at end of file
Modified: workspace/bbrodt/bpel/tests/org.jboss.tools.bpel.ui.test/pom.xml
===================================================================
--- workspace/bbrodt/bpel/tests/org.jboss.tools.bpel.ui.test/pom.xml 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/tests/org.jboss.tools.bpel.ui.test/pom.xml 2011-02-22 18:05:19 UTC (rev 29266)
@@ -1,12 +1,12 @@
-<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools.bpel.tests</groupId>
+ <groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.jboss.tools.bpel.ui.test</artifactId>
<version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
@@ -16,4 +16,5 @@
<emma.instrument.bundles>org.eclipse.bpel.ui,org.eclipse.bpel.common.ui,org.eclipse.bpel.common.model,org.eclipse.bpel.model</emma.instrument.bundles>
</properties>
-</project>
+
+</project>
\ No newline at end of file
Modified: workspace/bbrodt/bpel/tests/pom.xml
===================================================================
--- workspace/bbrodt/bpel/tests/pom.xml 2011-02-22 17:54:50 UTC (rev 29265)
+++ workspace/bbrodt/bpel/tests/pom.xml 2011-02-22 18:05:19 UTC (rev 29266)
@@ -2,8 +2,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.tools.bpel</groupId>
- <artifactId>tests</artifactId>
- <name>bpel.tests</name>
+ <artifactId>org.jboss.tools.bpel.tests</artifactId>
+ <name>org.jboss.tools.bpel.tests</name>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r29265 - workspace/bbrodt/bpel.
by jbosstools-commits＠lists.jboss.org
Author: bbrodt
Date: 2011-02-22 12:54:50 -0500 (Tue, 22 Feb 2011)
New Revision: 29265
Removed:
workspace/bbrodt/bpel/docs/
Log:
replace this folder with trunk version
14 years, 7 months
- 1
- 0