JBoss Tools SVN: r26356 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core: src/org/jboss/tools/deltacloud/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-09 06:59:04 -0500 (Tue, 09 Nov 2010)
New Revision: 26356
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
Log:
[JBIDE-7521] storing cloud after it has been edited
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-11-09 11:53:44 UTC (rev 26355)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-11-09 11:59:04 UTC (rev 26356)
@@ -1,3 +1,7 @@
+2010-11-09 André Dietisheim <adietish(a)redhat.com>
+
+ * src/org/jboss/tools/deltacloud/core/DeltaCloud.java (editCloud): [JBIDE-7521] storing cloud after it has been edited
+
2010-11-05 André Dietisheim <adietish(a)redhat.com>
* src/org/jboss/tools/deltacloud/core/DeltaCloud.java (performInstanceAction):
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-11-09 11:53:44 UTC (rev 26355)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-11-09 11:59:04 UTC (rev 26356)
@@ -99,6 +99,7 @@
this.username = username;
this.type = type;
storePassword(url, username, passwd);
+ save();
}
private void storePassword(String url, String username, String passwd) {
15 years, 5 months
JBoss Tools SVN: r26355 - trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/utils.
by jbosstools-commits＠lists.jboss.org
Author: jlukas(a)redhat.com
Date: 2010-11-09 06:53:44 -0500 (Tue, 09 Nov 2010)
New Revision: 26355
Modified:
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/utils/StrutsUIEditorBot.java
Log:
fixing broken build
Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/utils/StrutsUIEditorBot.java
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/utils/StrutsUIEditorBot.java 2010-11-09 10:39:53 UTC (rev 26354)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/utils/StrutsUIEditorBot.java 2010-11-09 11:53:44 UTC (rev 26355)
@@ -42,51 +42,51 @@
super(reference, new SWTWorkbenchBot());
}
- @Override
- protected void init() throws WidgetNotFoundException {
- UIThreadRunnable.syncExec(new VoidResult() {
+// @Override
+// protected void init() throws WidgetNotFoundException {
+// UIThreadRunnable.syncExec(new VoidResult() {
+//
+// public void run() {
+// final IEditorPart/*EditorPartWrapper*/ editor = partReference.getEditor(true);
+// EditorPart/*StrutsEditor*/ ep = null;
+// try {
+// Field f = editor.getClass().getDeclaredField("editor");
+// f.setAccessible(true);
+// Object/*StrutsConfigEditor*/ o = f.get(editor);
+// f.setAccessible(false);
+// f = o.getClass().getDeclaredField("guiEditor");
+// f.setAccessible(true);
+// Object/*StrutsConfigGuiEditor*/ o2 = f.get(o);
+// f.setAccessible(false);
+// Method m = o2.getClass().getMethod("getGUI");
+// ep = (EditorPart) m.invoke(o2);
+// } catch (SecurityException e) {
+// L.log(Level.WARNING, e.getMessage(), e);
+// } catch (NoSuchFieldException e) {
+// L.log(Level.WARNING, e.getMessage(), e);
+// } catch (IllegalArgumentException e) {
+// L.log(Level.WARNING, e.getMessage(), e);
+// } catch (IllegalAccessException e) {
+// L.log(Level.WARNING, e.getMessage(), e);
+// } catch (NoSuchMethodException e) {
+// L.log(Level.WARNING, e.getMessage(), e);
+// } catch (InvocationTargetException e) {
+// L.log(Level.WARNING, e.getMessage(), e);
+// }
+// graphicalViewer = (GraphicalViewer) ep.getAdapter(GraphicalViewer.class);
+// final Control control = graphicalViewer.getControl();
+// if (control instanceof FigureCanvas) {
+// canvas = new SWTBotGefFigureCanvas((FigureCanvas) control);
+// }
+// editDomain = graphicalViewer.getEditDomain();
+// }
+// });
+//
+// if (graphicalViewer == null) {
+// throw new WidgetNotFoundException("Editor does not adapt to a GraphicalViewer");
+// }
+// }
- public void run() {
- final IEditorPart/*EditorPartWrapper*/ editor = partReference.getEditor(true);
- EditorPart/*StrutsEditor*/ ep = null;
- try {
- Field f = editor.getClass().getDeclaredField("editor");
- f.setAccessible(true);
- Object/*StrutsConfigEditor*/ o = f.get(editor);
- f.setAccessible(false);
- f = o.getClass().getDeclaredField("guiEditor");
- f.setAccessible(true);
- Object/*StrutsConfigGuiEditor*/ o2 = f.get(o);
- f.setAccessible(false);
- Method m = o2.getClass().getMethod("getGUI");
- ep = (EditorPart) m.invoke(o2);
- } catch (SecurityException e) {
- L.log(Level.WARNING, e.getMessage(), e);
- } catch (NoSuchFieldException e) {
- L.log(Level.WARNING, e.getMessage(), e);
- } catch (IllegalArgumentException e) {
- L.log(Level.WARNING, e.getMessage(), e);
- } catch (IllegalAccessException e) {
- L.log(Level.WARNING, e.getMessage(), e);
- } catch (NoSuchMethodException e) {
- L.log(Level.WARNING, e.getMessage(), e);
- } catch (InvocationTargetException e) {
- L.log(Level.WARNING, e.getMessage(), e);
- }
- graphicalViewer = (GraphicalViewer) ep.getAdapter(GraphicalViewer.class);
- final Control control = graphicalViewer.getControl();
- if (control instanceof FigureCanvas) {
- canvas = new SWTBotGefFigureCanvas((FigureCanvas) control);
- }
- editDomain = graphicalViewer.getEditDomain();
- }
- });
-
- if (graphicalViewer == null) {
- throw new WidgetNotFoundException("Editor does not adapt to a GraphicalViewer");
- }
- }
-
public void selectPage(final String page) {
IWorkbenchPart p = ((EditorPartWrapper) (getReference().getPart(true))).getEditor();
assert p instanceof ObjectMultiPageEditor;
@@ -101,11 +101,12 @@
}
public Control/*FigureCanvas*/ getControl() {
- return UIThreadRunnable.syncExec(new Result<Control>() {
-
- public Control run() {
- return graphicalViewer.getControl();
- }
- });
+ return null;
+// return UIThreadRunnable.syncExec(new Result<Control>() {
+//
+// public Control run() {
+// return graphicalViewer.getControl();
+// }
+// });
}
}
15 years, 5 months
JBoss Tools SVN: r26354 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-11-09 05:39:53 -0500 (Tue, 09 Nov 2010)
New Revision: 26354
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
Log:
https://jira.jboss.org/browse/JBDS-1395
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2010-11-09 10:12:21 UTC (rev 26353)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2010-11-09 10:39:53 UTC (rev 26354)
@@ -460,21 +460,6 @@
* see https://bugs.eclipse.org/bugs/show_bug.cgi?id=302950
*/
cmpEdTl = parent;
- cmpEdTl.addFocusListener(new FocusListener() {
-
- @Override
- public void focusLost(FocusEvent e) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void focusGained(FocusEvent e) {
- System.out.println();
-
- }
- });
-
GridLayout layoutEdTl = new GridLayout(2, false);
layoutEdTl.verticalSpacing = 0;
layoutEdTl.marginHeight = 0;
15 years, 5 months
JBoss Tools SVN: r26353 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-09 05:12:21 -0500 (Tue, 09 Nov 2010)
New Revision: 26353
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java
Log:
cleanup
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java 2010-11-09 09:03:59 UTC (rev 26352)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java 2010-11-09 10:12:21 UTC (rev 26353)
@@ -13,14 +13,11 @@
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.ViewPart;
@@ -49,34 +46,37 @@
private TreeViewer viewer;
private Action collapseall;
- private Action doubleClickAction;
public void createPartControl(Composite parent) {
- viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
- viewer.setContentProvider(new CloudViewContentProvider());
- viewer.setLabelProvider(new CloudViewLabelProvider());
- viewer.setInput(new CVRootElement(viewer));
- viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
- getSite().setSelectionProvider(viewer); // for tabbed properties
+ viewer = createTreeViewer(parent);
// Create the help context id for the viewer's control
PlatformUI.getWorkbench().getHelpSystem().setHelp(viewer.getControl(), HELP_CONTEXTID);
makeActions();
- hookContextMenu();
- hookDoubleClickAction();
+ hookContextMenu(viewer.getTree());
contributeToActionBars();
DeltaCloudManager.getDefault().addCloudManagerListener(this);
}
+ private TreeViewer createTreeViewer(Composite parent) {
+ TreeViewer viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
+ viewer.setContentProvider(new CloudViewContentProvider());
+ viewer.setLabelProvider(new CloudViewLabelProvider());
+ viewer.setInput(new CVRootElement(viewer));
+ viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+ getSite().setSelectionProvider(viewer);
+ return viewer;
+ }
+
@Override
public void dispose() {
DeltaCloudManager.getDefault().removeCloudManagerListener(this);
super.dispose();
}
- private void hookContextMenu() {
- IMenuManager contextMenu = UIUtils.createContextMenu(viewer.getControl());
- UIUtils.registerContributionManager(CONTEXT_MENU_ID, contextMenu, viewer.getControl());
+ private void hookContextMenu(Control control) {
+ IMenuManager contextMenu = UIUtils.createContextMenu(control);
+ UIUtils.registerContributionManager(CONTEXT_MENU_ID, contextMenu, control);
}
private void contributeToActionBars() {
@@ -93,15 +93,6 @@
private void makeActions() {
collapseall = createCollapseAllAction();
-
- doubleClickAction = new Action() {
- public void run() {
- ISelection selection = viewer.getSelection();
- @SuppressWarnings("unused")
- Object obj = ((IStructuredSelection) selection).getFirstElement();
- }
- };
-
}
private Action createCollapseAllAction() {
@@ -116,14 +107,7 @@
return collapseAll;
}
- private void hookDoubleClickAction() {
- viewer.addDoubleClickListener(new IDoubleClickListener() {
- public void doubleClick(DoubleClickEvent event) {
- doubleClickAction.run();
- }
- });
- }
-
+ @Override
public void setFocus() {
viewer.getControl().setFocus();
}
15 years, 5 months
JBoss Tools SVN: r26352 - in trunk: tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: lzoubek(a)redhat.com
Date: 2010-11-09 04:03:59 -0500 (Tue, 09 Nov 2010)
New Revision: 26352
Modified:
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/TutorialTest.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java
Log:
JBIDE-5711 fixed incompatibilities between SWTBot 2.0.1 and bot extensions
Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/TutorialTest.java
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/TutorialTest.java 2010-11-09 07:46:50 UTC (rev 26351)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/TutorialTest.java 2010-11-09 09:03:59 UTC (rev 26352)
@@ -36,6 +36,7 @@
import org.eclipse.swtbot.swt.finder.matchers.WidgetOfType;
import org.eclipse.swtbot.swt.finder.results.Result;
import org.eclipse.swtbot.swt.finder.results.VoidResult;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotBrowser;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotStyledText;
@@ -331,7 +332,7 @@
gui.save();
util.waitForNonIgnoredJobs();
new SWTBotGefContextMenu(gui.getControl(), "Run on Server").click();
- SWTBotBrowserExt browser = bot.browser();
+ SWTBotBrowser browser = bot.browser();
bot.sleep(7500);
browser.refresh();
bot.sleep(5000);
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java 2010-11-09 07:46:50 UTC (rev 26351)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java 2010-11-09 09:03:59 UTC (rev 26352)
@@ -115,17 +115,6 @@
}
}
- @SuppressWarnings("unchecked")
- public SWTBotBrowserExt browser() {
- try {
- List<Browser> bsrs = (List<Browser>) widgets(widgetOfType(Browser.class));
- return new SWTBotBrowserExt(bsrs.get(0));
- } catch (WidgetNotFoundException ex) {
- throw new WidgetNotFoundException(
- "Could not find widget of type Browser", ex);
- }
- }
-
public SWTBotScaleExt scale() {
return scale(0);
}
15 years, 5 months
JBoss Tools SVN: r26351 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-09 02:46:50 -0500 (Tue, 09 Nov 2010)
New Revision: 26351
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/pom.xml
Log:
increased version
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF 2010-11-09 07:46:07 UTC (rev 26350)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF 2010-11-09 07:46:50 UTC (rev 26351)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: DeltaCloud Core (Experimental)
Bundle-SymbolicName: org.jboss.tools.deltacloud.core
-Bundle-Version: 0.0.1.qualifier
+Bundle-Version: 0.1.0.qualifier
Bundle-Activator: org.jboss.tools.deltacloud.core.Activator
Bundle-Vendor: Red Hat Inc.
Require-Bundle: org.eclipse.core.runtime,
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/pom.xml
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/pom.xml 2010-11-09 07:46:07 UTC (rev 26350)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/pom.xml 2010-11-09 07:46:50 UTC (rev 26351)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.deltacloud.plugins</groupId>
<artifactId>org.jboss.tools.deltacloud.core</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
15 years, 5 months
JBoss Tools SVN: r26350 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-09 02:46:07 -0500 (Tue, 09 Nov 2010)
New Revision: 26350
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/META-INF/MANIFEST.MF
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/pom.xml
Log:
increased version
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/META-INF/MANIFEST.MF 2010-11-09 05:54:52 UTC (rev 26349)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/META-INF/MANIFEST.MF 2010-11-09 07:46:07 UTC (rev 26350)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jboss.tools.deltacloud.ui; singleton:=true
-Bundle-Version: 0.0.1.qualifier
+Bundle-Version: 0.1.0.qualifier
Bundle-Activator: org.jboss.tools.deltacloud.ui.Activator
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/pom.xml
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/pom.xml 2010-11-09 05:54:52 UTC (rev 26349)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/pom.xml 2010-11-09 07:46:07 UTC (rev 26350)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.deltacloud.plugins</groupId>
<artifactId>org.jboss.tools.deltacloud.ui</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
15 years, 5 months
JBoss Tools SVN: r26349 - trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2010-11-09 00:54:52 -0500 (Tue, 09 Nov 2010)
New Revision: 26349
Modified:
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationHelper.java
Log:
JBIDE-7504: fix the NPE when create a eventhandler for a scope
Modified: trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationHelper.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationHelper.java 2010-11-09 05:49:18 UTC (rev 26348)
+++ trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationHelper.java 2010-11-09 05:54:52 UTC (rev 26349)
@@ -1005,16 +1005,14 @@
reconcile(th, th.getElement());
System.err.println("TerminationHandler patch ok");
} else if (child instanceof OnEvent) {
-
+
} else if (child instanceof OnAlarm) {
- Activity activity = ((OnAlarm) child).getActivity();
- if(((OnAlarm) child).getActivity() != null) {
- Element childElement = ((WSDLElement)activity).getElement();
- if (childElement == null) {
- childElement = ElementFactory.getInstance().createElement(((ExtensibleElement)activity), child);
- ((ExtensibleElement)activity).setElement(childElement);
- }
- }
+ // fix https://jira.jboss.org/browse/JBIDE-7480
+ OnAlarm o = (OnAlarm)child;
+ Activity a = o.getActivity();
+ Element s = ReconciliationHelper.getBPELChildElementByLocalName(o.getElement(), BPELConstants.ND_SCOPE);
+ a.setElement(s);
+ reconcile(a, s);
} else if (child instanceof FaultHandler) {
FaultHandler c = (FaultHandler)child;
EList<Catch> _catch = c.getCatch();
@@ -1025,7 +1023,22 @@
reconcile(ch, catchElement);
}
System.err.println("FaultHandler patch ok");
- }
+ } else if (child instanceof EventHandler) {
+ // fix https://jira.jboss.org/browse/JBIDE-7504
+ EventHandler e = (EventHandler)child;
+ EList<OnEvent> _onEvent = e.getEvents();
+ OnEvent on = _onEvent.get(0);
+ Element onElement = ReconciliationHelper.getBPELChildElementByLocalName(e.getElement(), BPELConstants.ND_ON_EVENT);
+ on.setElement(onElement);
+ reconcile(on, onElement);
+ } else if (child instanceof CompensationHandler) {
+ // fix https://jira.jboss.org/browse/JBIDE-7504
+ CompensationHandler c = (CompensationHandler)child;
+ Activity a = c.getActivity();
+ Element s = ReconciliationHelper.getBPELChildElementByLocalName(c.getElement(), BPELConstants.ND_SEQUENCE);
+ a.setElement(s);
+ reconcile(a, s);
+ }
}
15 years, 5 months
JBoss Tools SVN: r26348 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-11-09 00:49:18 -0500 (Tue, 09 Nov 2010)
New Revision: 26348
Modified:
trunk/build/parent/pom.xml
Log:
switch to more current swtbot site
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2010-11-09 05:31:23 UTC (rev 26347)
+++ trunk/build/parent/pom.xml 2010-11-09 05:49:18 UTC (rev 26348)
@@ -29,10 +29,9 @@
<target.platform.classifier.local>local
</target.platform.classifier.local>
- <!-- Set this to a path on your own machine, or use remote URL like http://download.jboss.org/jbosstools/updates/target-platform/latest/
- Can also generate a local.target file which will always point to your local repo w/o having to edit here.
- See local.target profile below for more information.
- -->
+ <!-- Set this to a path on your own machine, or use remote URL like http://download.jboss.org/jbosstools/updates/target-platform/latest/
+ Can also generate a local.target file which will always point to your local
+ repo w/o having to edit here. See local.target profile below for more information. -->
<target.platform.site>file://home/hudson/static_build_env/jbds/target-platform/e361-wtp322.target/
</target.platform.site>
</properties>
@@ -193,9 +192,9 @@
</issueManagement>
<profiles>
- <!-- TODO: remove this when no one depends on it; replace with unified.target, not multiuple.target,
- since no one should need to resolve against all these sites (and one site is by far faster) !
- -->
+ <!-- TODO: remove this when no one depends on it; replace with unified.target,
+ not multiuple.target, since no one should need to resolve against all these
+ sites (and one site is by far faster) ! -->
<profile>
<id>helios</id>
<activation>
@@ -224,9 +223,9 @@
</build>
</profile>
- <!-- Target platform file pointing at a single update site from which to resolve.
- See unified.site if you want to resolve against a site w/o using the unified.target file
- -->
+ <!-- Target platform file pointing at a single update site from which to
+ resolve. See unified.site if you want to resolve against a site w/o using
+ the unified.target file -->
<profile>
<id>unified.target</id>
<activation>
@@ -259,14 +258,9 @@
which points to a local repo. You can do this by hand or generate it from
multiple.target using: cd ~/trunk/build/target-platform; ant See also the
README in target-platform/ folder for additional usage examples. You can
- also run `ant help`.
-
- If you want to build the target-platform/pom.xml AND generate a local repo
- + local.target file ALL AT THE SAME TIME, you can do:
-
- mvn clean install -Plocal -f /path/to/target-platform/pom.xml
-
- -->
+ also run `ant help`. If you want to build the target-platform/pom.xml AND
+ generate a local repo + local.target file ALL AT THE SAME TIME, you can do:
+ mvn clean install -Plocal -f /path/to/target-platform/pom.xml -->
<profile>
<id>local.target</id>
<activation>
@@ -314,11 +308,10 @@
</repository>
</repositories>
</profile>
-
- <!-- if you have a local repo mirror of the unified.site, you can use this profile with the
- -Dtarget.platform.site=file://path/to/repo
- to resolve dependencies without needing to use a local.target file
- -->
+
+ <!-- if you have a local repo mirror of the unified.site, you can use this
+ profile with the -Dtarget.platform.site=file://path/to/repo to resolve dependencies
+ without needing to use a local.target file -->
<profile>
<id>local.site</id>
<activation>
@@ -362,9 +355,9 @@
</profile>
<!-- Time saver: to build everything from scratch from a single repo containing
- all deps in unified.target, but without using the target file to filter site contents
- (may end up using a different version of a dependency if site contains multiple versions)
- -->
+ all deps in unified.target, but without using the target file to filter site
+ contents (may end up using a different version of a dependency if site contains
+ multiple versions) -->
<profile>
<id>unified.site</id>
<activation>
@@ -493,10 +486,19 @@
<enabled>true</enabled>
</releases>
</repository>
- <!--repository> <id>swtbot-helios</id> <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/
- </url> <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots>
- <releases> <enabled>true</enabled> </releases> </repository -->
<repository>
+ <id>swtbot-helios</id>
+ <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <!-- repository>
<id>jboss-swtbot-helios</id>
<url>http://download.jboss.org/jbosstools/updates/requirements/swtbot-helios/
</url>
@@ -507,7 +509,7 @@
<releases>
<enabled>true</enabled>
</releases>
- </repository>
+ </repository -->
<repository>
<id>m2eclipse</id>
<url>http://m2eclipse.sonatype.org/sites/m2e/</url>
15 years, 5 months