JBoss Tools SVN: r31802 - branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-06-03 06:15:18 -0400 (Fri, 03 Jun 2011)
New Revision: 31802
Modified:
branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewEARAction.java
branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewEJBJARAction.java
branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewWARAction.java
branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/PreviewPage.java
Log:
JBIDE-8303 - to maintenance
Modified: branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewEARAction.java
===================================================================
--- branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewEARAction.java 2011-06-03 09:57:43 UTC (rev 31801)
+++ branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewEARAction.java 2011-06-03 10:15:18 UTC (rev 31802)
@@ -27,6 +27,7 @@
import org.jboss.ide.eclipse.archives.ui.wizards.AbstractArchiveWizard;
import org.jboss.ide.eclipse.archives.webtools.Messages;
import org.jboss.ide.eclipse.archives.webtools.archivetypes.EarArchiveType;
+import org.jboss.ide.eclipse.archives.webtools.archivetypes.WarArchiveType;
public class NewEARAction implements IActionDelegate {
@@ -85,11 +86,9 @@
super(wiz, Messages.EarPreview, Messages.EarPreview,
ArchivesSharedImages.getImageDescriptor(ArchivesSharedImages.IMG_EAR));
}
- protected void addToPackage() {
- IArchiveType type = ArchivesCore.getInstance().getExtensionManager().getArchiveType(EarArchiveType.ID);
- type.fillDefaultConfiguration(wizard.getProject().getName(), wizard.getArchive(), new NullProgressMonitor());
+ protected String getArchiveTypeId() {
+ return EarArchiveType.ID;
}
-
protected String getDescriptionMessage() {
return Messages.EarDescription;
}
Modified: branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewEJBJARAction.java
===================================================================
--- branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewEJBJARAction.java 2011-06-03 09:57:43 UTC (rev 31801)
+++ branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewEJBJARAction.java 2011-06-03 10:15:18 UTC (rev 31802)
@@ -25,6 +25,7 @@
import org.jboss.ide.eclipse.archives.ui.ArchivesSharedImages;
import org.jboss.ide.eclipse.archives.ui.wizards.AbstractArchiveWizard;
import org.jboss.ide.eclipse.archives.webtools.Messages;
+import org.jboss.ide.eclipse.archives.webtools.archivetypes.EarArchiveType;
import org.jboss.ide.eclipse.archives.webtools.archivetypes.EjbArchiveType;
public class NewEJBJARAction implements IActionDelegate {
@@ -79,11 +80,9 @@
super(wiz, Messages.EjbJarPreview, Messages.EjbJarPreview,
ArchivesSharedImages.getImageDescriptor(ArchivesSharedImages.IMG_NEW_JAR_WIZARD));
}
- protected void addToPackage() {
- IArchiveType type = ArchivesCore.getInstance().getExtensionManager().getArchiveType(EjbArchiveType.ID);
- type.fillDefaultConfiguration(wizard.getProject().getName(), wizard.getArchive(), new NullProgressMonitor());
+ protected String getArchiveTypeId() {
+ return EjbArchiveType.ID;
}
-
protected String getDescriptionMessage() {
return Messages.EjbJarDescription;
}
Modified: branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewWARAction.java
===================================================================
--- branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewWARAction.java 2011-06-03 09:57:43 UTC (rev 31801)
+++ branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewWARAction.java 2011-06-03 10:15:18 UTC (rev 31802)
@@ -79,9 +79,9 @@
super(wiz, Messages.WarPreview, Messages.WarPreview,
ArchivesSharedImages.getImageDescriptor(ArchivesSharedImages.IMG_NEW_WAR_WIZARD));
}
- protected void addToPackage() {
- IArchiveType type = ArchivesCore.getInstance().getExtensionManager().getArchiveType(WarArchiveType.WAR_PACKAGE_TYPE);
- type.fillDefaultConfiguration(wizard.getProject().getName(), wizard.getArchive(), new NullProgressMonitor());
+
+ protected String getArchiveTypeId() {
+ return WarArchiveType.WAR_PACKAGE_TYPE;
}
protected String getDescriptionMessage() {
Modified: branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/PreviewPage.java
===================================================================
--- branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/PreviewPage.java 2011-06-03 09:57:43 UTC (rev 31801)
+++ branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/PreviewPage.java 2011-06-03 10:15:18 UTC (rev 31802)
@@ -21,6 +21,7 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ILabelProviderListener;
@@ -41,13 +42,16 @@
import org.eclipse.ui.ide.IDE;
import org.eclipse.wst.server.core.IModuleArtifact;
import org.eclipse.wst.server.core.internal.ServerPlugin;
+import org.jboss.ide.eclipse.archives.core.ArchivesCore;
import org.jboss.ide.eclipse.archives.core.model.IArchive;
import org.jboss.ide.eclipse.archives.core.model.IArchiveFolder;
+import org.jboss.ide.eclipse.archives.core.model.IArchiveType;
import org.jboss.ide.eclipse.archives.ui.providers.ArchivesContentProviderDelegate;
import org.jboss.ide.eclipse.archives.ui.providers.ArchivesLabelProvider;
import org.jboss.ide.eclipse.archives.ui.wizards.AbstractArchiveWizard;
import org.jboss.ide.eclipse.archives.ui.wizards.WizardPageWithNotification;
import org.jboss.ide.eclipse.archives.webtools.Messages;
+import org.jboss.ide.eclipse.archives.webtools.archivetypes.WarArchiveType;
public abstract class PreviewPage extends WizardPageWithNotification {
@@ -97,13 +101,10 @@
protected void fillGroups() {
}
public boolean isPageComplete() {
- return hasCreated;
+ return true;
}
public void pageEntered(int button) {
- if( !hasCreated ) {
- addToPackage();
- hasCreated = true;
- }
+ addToPackage();
fillWidgets(wizard.getArchive());
// if it's already a module type project, hide the meta inf stuff
@@ -117,7 +118,17 @@
getWizard().getContainer().updateButtons();
}
- protected abstract void addToPackage();
+ protected void addToPackage() {
+ if( !hasCreated ) {
+ hasCreated = true;
+ String archiveTypeId = getArchiveTypeId();
+ IArchiveType type = ArchivesCore.getInstance().getExtensionManager().getArchiveType(archiveTypeId);
+ type.fillDefaultConfiguration(wizard.getProject().getName(), wizard.getArchive(), new NullProgressMonitor());
+ }
+ }
+
+ protected abstract String getArchiveTypeId();
+
protected void fillWidgets(IArchive pkg) {
previewViewer.setInput(pkg);
previewViewer.expandAll();
@@ -135,7 +146,9 @@
return result;
}
- public void pageExited(int button) {}
+ public void pageExited(int button) {
+ addToPackage();
+ }
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r31801 - branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-06-03 05:57:43 -0400 (Fri, 03 Jun 2011)
New Revision: 31801
Modified:
branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
Log:
JBIDE-9062 - wst.web module types
Modified: branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-06-03 09:41:59 UTC (rev 31800)
+++ branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-06-03 09:57:43 UTC (rev 31801)
@@ -169,6 +169,9 @@
id="org.jboss.ide.eclipse.as.runtime.32"
version="3.2">
<moduleType
+ types="wst.web"
+ versions="1.0,1.2,1.3,1.4"/>
+ <moduleType
types="jst.web"
versions="2.2, 2.3, 2.4"/>
<moduleType
@@ -195,6 +198,9 @@
id="org.jboss.ide.eclipse.as.runtime.40"
version="4.0">
<moduleType
+ types="wst.web"
+ versions="1.0,1.2,1.3,1.4"/>
+ <moduleType
types="jst.web"
versions="2.2, 2.3, 2.4, 2.5"/>
<moduleType
@@ -231,6 +237,9 @@
id="org.jboss.ide.eclipse.as.runtime.42"
version="4.2">
<moduleType
+ types="wst.web"
+ versions="1.0,1.2,1.3,1.4"/>
+ <moduleType
types="jst.web"
versions="2.2, 2.3, 2.4, 2.5"/>
<moduleType
@@ -267,6 +276,9 @@
id="org.jboss.ide.eclipse.as.runtime.50"
version="5.0">
<moduleType
+ types="wst.web"
+ versions="1.0,1.2,1.3,1.4"/>
+ <moduleType
types="jst.web"
versions="2.2, 2.3, 2.4, 2.5"/>
<moduleType
@@ -314,6 +326,9 @@
types="jst.appclient"
versions="5.0"/>
<moduleType
+ types="wst.web"
+ versions="1.0,1.2,1.3,1.4"/>
+ <moduleType
types="jst.web"
versions="2.2, 2.3, 2.4, 2.5"/>
<moduleType
@@ -358,6 +373,9 @@
types="jst.appclient"
versions="5.0, 6.0"/>
<moduleType
+ types="wst.web"
+ versions="1.0,1.2,1.3,1.4"/>
+ <moduleType
types="jst.web"
versions="2.2, 2.3, 2.4, 2.5, 3.0"/>
<moduleType
@@ -404,6 +422,9 @@
types="jst.appclient"
versions="5.0"/>
<moduleType
+ types="wst.web"
+ versions="1.0,1.2,1.3,1.4"/>
+ <moduleType
types="jst.web"
versions="2.2, 2.3, 2.4, 2.5"/>
<moduleType
@@ -441,6 +462,9 @@
types="jst.appclient"
versions="5.0"/>
<moduleType
+ types="wst.web"
+ versions="1.0,1.2,1.3,1.4"/>
+ <moduleType
types="jst.web"
versions="2.2, 2.3, 2.4, 2.5"/>
<moduleType
@@ -488,6 +512,9 @@
types="jst.appclient"
versions="1.2,1.3,1.4,5.0,6.0"/>
<moduleType
+ types="wst.web"
+ versions="1.0,1.2,1.3,1.4"/>
+ <moduleType
types="jst.web"
versions="2.2, 2.3, 2.4, 2.5,3.0"/>
<moduleType
@@ -681,6 +708,7 @@
<runtime-component
id="org.jboss.ide.eclipse.as.runtime.stripped.component"
version="1.0"/>
+ <facet id="wst.web" version="1.0,1.2,1.3,1.4"/>
<facet id="jst.web" version="2.2,2.3,2.4,2.5"/>
<facet id="jst.java" version="1.3,1.4,5.0,6.0"/>
<facet id="jst.utility" version="1.0"/>
@@ -703,6 +731,7 @@
<runtime-component
id="org.jboss.ide.eclipse.eap.runtime.component"
version="4.3"/>
+ <facet id="wst.web" version="1.0,1.2,1.3,1.4"/>
<facet id="jst.web" version="2.2,2.3,2.4,2.5"/>
<facet id="jst.java" version="1.3,1.4,5.0,6.0"/>
<facet id="jst.utility" version="1.0"/>
@@ -715,6 +744,7 @@
<runtime-component
id="org.jboss.ide.eclipse.eap.runtime.component"
version="5.0"/>
+ <facet id="wst.web" version="1.0,1.2,1.3,1.4"/>
<facet id="jst.web" version="2.2,2.3,2.4,2.5"/>
<facet id="jst.java" version="1.3,1.4,5.0,6.0"/>
<facet id="jst.utility" version="1.0"/>
@@ -752,6 +782,7 @@
<runtime-component
id="org.jboss.ide.eclipse.as.runtime.component"
version="3.2"/>
+ <facet id="wst.web" version="1.0,1.2,1.3,1.4"/>
<facet id="jst.web" version="2.2,2.3,2.4"/>
<facet id="jst.java" version="1.3,1.4,5.0,6.0"/>
<facet id="jst.utility" version="1.0"/>
@@ -765,6 +796,7 @@
<runtime-component
id="org.jboss.ide.eclipse.as.runtime.component"
version="4.0"/>
+ <facet id="wst.web" version="1.0,1.2,1.3,1.4"/>
<facet id="jst.web" version="2.2,2.3,2.4,2.5"/>
<facet id="jst.java" version="1.3,1.4,5.0,6.0"/>
<facet id="jst.utility" version="1.0"/>
@@ -778,6 +810,7 @@
<runtime-component
id="org.jboss.ide.eclipse.as.runtime.component"
version="4.2"/>
+ <facet id="wst.web" version="1.0,1.2,1.3,1.4"/>
<facet id="jst.web" version="2.2,2.3,2.4,2.5"/>
<facet id="jst.java" version="1.3,1.4,5.0,6.0"/>
<facet id="jst.utility" version="1.0"/>
@@ -791,6 +824,7 @@
<runtime-component
id="org.jboss.ide.eclipse.as.runtime.component"
version="5.0"/>
+ <facet id="wst.web" version="1.0,1.2,1.3,1.4"/>
<facet id="jst.web" version="2.2,2.3,2.4,2.5"/>
<facet id="jst.java" version="1.3,1.4,5.0,6.0"/>
<facet id="jst.utility" version="1.0"/>
@@ -804,6 +838,7 @@
<runtime-component
id="org.jboss.ide.eclipse.as.runtime.component"
version="5.1"/>
+ <facet id="wst.web" version="1.0,1.2,1.3,1.4"/>
<facet id="jst.web" version="2.2,2.3,2.4,2.5"/>
<facet id="jst.java" version="1.3,1.4,5.0,6.0"/>
<facet id="jst.utility" version="1.0"/>
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r31800 - in branches/jbosstools-3.2.x/as/plugins: org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-06-03 05:41:59 -0400 (Fri, 03 Jun 2011)
New Revision: 31800
Modified:
branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java
branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java
Log:
JBIDE-8908 to maintenance
Modified: branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java
===================================================================
--- branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2011-06-03 09:38:37 UTC (rev 31799)
+++ branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2011-06-03 09:41:59 UTC (rev 31800)
@@ -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,
@@ -49,6 +49,7 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.PlatformUI;
@@ -65,11 +66,23 @@
import org.jboss.ide.eclipse.as.rse.core.RSEUtils;
import org.jboss.ide.eclipse.as.ui.Messages;
import org.jboss.ide.eclipse.as.ui.UIUtil;
+import org.jboss.ide.eclipse.as.ui.editor.DeploymentModuleOptionCompositeAssistant;
import org.jboss.ide.eclipse.as.ui.editor.IDeploymentTypeUI;
+import org.jboss.ide.eclipse.as.ui.editor.ModuleDeploymentPage;
import org.jboss.ide.eclipse.as.ui.editor.ServerModeSection;
import org.jboss.ide.eclipse.as.ui.editor.ServerModeSectionComposite.ChangeServerPropertyCommand;
public class RSEDeploymentPreferenceUI implements IDeploymentTypeUI {
+ static {
+ DeploymentModuleOptionCompositeAssistant.browseBehaviorMap.put("rse", new DeploymentModuleOptionCompositeAssistant.IBrowseBehavior() {
+ public String openBrowseDialog(ModuleDeploymentPage page, String original) {
+ String current = page.getServer().getAttribute(RSEUtils.RSE_SERVER_HOST, (String)null);
+ IHost h = findHost(current, null);
+ return browseClicked4(new Shell(), h);
+ }
+ });
+ }
+
public RSEDeploymentPreferenceUI() {
// Do nothing
}
@@ -213,6 +226,10 @@
}
public void widgetSelected(SelectionEvent e) {
+ String browseVal = browseClicked3();
+ if (browseVal != null) {
+ deployText.setText(browseVal);
+ }
}
});
@@ -239,6 +256,10 @@
}
public void widgetSelected(SelectionEvent e) {
+ String browseVal = browseClicked3();
+ if (browseVal != null) {
+ tempDeployText.setText(browseVal);
+ }
}
});
}
@@ -402,16 +423,7 @@
}
protected String browseClicked3() {
- SystemRemoteFileDialog d = new SystemRemoteFileDialog(
- rseBrowse.getShell(), "Browse remote system", combo.getHost());
- if( d.open() == Dialog.OK) {
- Object o = d.getOutputObject();
- if( o instanceof IRemoteFile ) {
- String path = ((IRemoteFile)o).getAbsolutePath();
- return path;
- }
- }
- return null;
+ return browseClicked4(getShell(), combo.getHost());
}
protected IJBossServerRuntime getRuntime() {
@@ -509,11 +521,7 @@
}
public IHost findHost(String name) {
- for( int i = 0; i < hosts.length; i++ ) {
- if( hosts[i].getAliasName().equals(name))
- return hosts[i];
- }
- return null;
+ return RSEDeploymentPreferenceUI.findHost(name, hosts);
}
public Combo getCombo() {
@@ -650,4 +658,28 @@
}
}
}
+
+
+ public static IHost findHost(String name, IHost[] hosts) {
+ if( hosts == null )
+ hosts = RSECorePlugin.getTheSystemRegistry().getHostsBySubSystemConfigurationCategory("files");
+ for( int i = 0; i < hosts.length; i++ ) {
+ if( hosts[i].getAliasName().equals(name))
+ return hosts[i];
+ }
+ return null;
+ }
+
+ protected static String browseClicked4(Shell s, IHost host) {
+ SystemRemoteFileDialog d = new SystemRemoteFileDialog(
+ s, "Browse remote system", host);
+ if( d.open() == Dialog.OK) {
+ Object o = d.getOutputObject();
+ if( o instanceof IRemoteFile ) {
+ String path = ((IRemoteFile)o).getAbsolutePath();
+ return path;
+ }
+ }
+ return null;
+ }
}
Modified: branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java
===================================================================
--- branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java 2011-06-03 09:38:37 UTC (rev 31799)
+++ branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java 2011-06-03 09:41:59 UTC (rev 31800)
@@ -230,9 +230,7 @@
}
public void widgetSelected(SelectionEvent e) {
- DirectoryDialog d = new DirectoryDialog(new Shell());
- d.setFilterPath(page.makeGlobal(deployText.getText()));
- String x = d.open();
+ String x = openBrowseDialog(deployText.getText());
if (x != null) {
deployText.setText(page.makeRelative(x));
}
@@ -260,9 +258,7 @@
}
public void widgetSelected(SelectionEvent e) {
- DirectoryDialog d = new DirectoryDialog(new Shell());
- d.setFilterPath(page.makeGlobal(tempDeployText.getText()));
- String x = d.open();
+ String x = openBrowseDialog(tempDeployText.getText());
if (x != null)
tempDeployText.setText(page.makeRelative(x));
}
@@ -341,7 +337,28 @@
updateWidgets();
return section;
}
+ public static interface IBrowseBehavior {
+ public String openBrowseDialog(ModuleDeploymentPage page, String original);
+ }
+ public static HashMap<String, IBrowseBehavior> browseBehaviorMap = new HashMap<String, IBrowseBehavior>();
+ static {
+ browseBehaviorMap.put(LocalPublishMethod.LOCAL_PUBLISH_METHOD, new IBrowseBehavior() { //$NON-NLS-1$
+ public String openBrowseDialog(ModuleDeploymentPage page, String original) {
+ DirectoryDialog d = new DirectoryDialog(new Shell());
+ d.setFilterPath(page.makeGlobal(original));
+ return d.open();
+ }
+ });
+ }
+ protected String openBrowseDialog(String original) {
+ String mode = getServer().getAttributeHelper().getAttribute(IDeployableServer.SERVER_MODE, LocalPublishMethod.LOCAL_PUBLISH_METHOD);
+ IBrowseBehavior beh = browseBehaviorMap.get(mode);
+ if( beh == null )
+ beh = browseBehaviorMap.get(LocalPublishMethod.LOCAL_PUBLISH_METHOD); //$NON-NLS-1$
+ return beh.openBrowseDialog(page, original);
+ }
+
protected boolean getShowRadios() {
IRuntime rt = getServer().getServer().getRuntime();
boolean showRadios = true;
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r31799 - in trunk: runtime/tests/org.jboss.tools.runtime.test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-06-03 05:38:37 -0400 (Fri, 03 Jun 2011)
New Revision: 31799
Modified:
trunk/examples/tests/org.jboss.tools.project.examples.test/pom.xml
trunk/runtime/tests/org.jboss.tools.runtime.test/pom.xml
Log:
JBIDE-8518 fix pom.xml files in JBT and JBDS repo such that only component root poms reference parent pom (all others just look up to .. for parent)
Modified: trunk/examples/tests/org.jboss.tools.project.examples.test/pom.xml
===================================================================
--- trunk/examples/tests/org.jboss.tools.project.examples.test/pom.xml 2011-06-03 09:16:52 UTC (rev 31798)
+++ trunk/examples/tests/org.jboss.tools.project.examples.test/pom.xml 2011-06-03 09:38:37 UTC (rev 31799)
@@ -13,8 +13,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <systemProperties>-Djbosstools.test.jboss.home.4.2=${requirement.build.root}/jboss-4.2.3.GA
- -Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.0.1.GA</systemProperties>
+ <systemProperties>-Djbosstools.test.jboss.home.4.2=${requirement.build.root}/jboss-4.2.3.GA -Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.0.1.GA</systemProperties>
</properties>
<build>
<plugins>
Modified: trunk/runtime/tests/org.jboss.tools.runtime.test/pom.xml
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.test/pom.xml 2011-06-03 09:16:52 UTC (rev 31798)
+++ trunk/runtime/tests/org.jboss.tools.runtime.test/pom.xml 2011-06-03 09:38:37 UTC (rev 31799)
@@ -13,13 +13,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <systemProperties>-Djbosstools.test.jboss.home.4.2=${requirement.build.root}/jboss-4.2.3.GA
- -Djbosstools.test.jboss.home.5.1=${requirement.build.root}/jboss-5.1.0.GA
- -Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.0.1.GA
- -Djbosstools.test.seam.2.2.0.GA.home=${requirement.build.root}/jboss-seam-2.2.0.GA
- -Djbosstools.test.eap.4.3.home=${requirement.build.root}/jboss-eap-4.3
- -Dskip.runtime.scanner=true
- -Djbosstools.test.jboss.home.7.0=${requirement.build.root}/jboss-7.0.0.Beta3</systemProperties>
+ <systemProperties>-Djbosstools.test.jboss.home.4.2=${requirement.build.root}/jboss-4.2.3.GA -Djbosstools.test.jboss.home.5.1=${requirement.build.root}/jboss-5.1.0.GA -Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.0.1.GA -Djbosstools.test.seam.2.2.0.GA.home=${requirement.build.root}/jboss-seam-2.2.0.GA -Djbosstools.test.eap.4.3.home=${requirement.build.root}/jboss-eap-4.3 -Dskip.runtime.scanner=true -Djbosstools.test.jboss.home.7.0=${requirement.build.root}/jboss-7.0.0.Beta3</systemProperties>
</properties>
<build>
<plugins>
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r31798 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2011-06-03 05:16:52 -0400 (Fri, 03 Jun 2011)
New Revision: 31798
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeVisualLinkCreator.java
Log:
https://issues.jboss.org/browse/JBIDE-9063 , PATCH was applied.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeVisualLinkCreator.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeVisualLinkCreator.java 2011-06-03 08:23:28 UTC (rev 31797)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeVisualLinkCreator.java 2011-06-03 09:16:52 UTC (rev 31798)
@@ -146,9 +146,24 @@
textContainer.appendChild(text);
}
}
-
+ copyAttribute(sourceNode, a,"id"); //$NON-NLS-1$
+ copyAttribute(sourceNode, a,"rel"); //$NON-NLS-1$
+ copyAttribute(sourceNode, a,"tabindex"); //$NON-NLS-1$
return creatorInfo;
}
+ /**
+ * Copies attribute from source node to visual node
+ * @param sourceNode
+ * @param a
+ * @param attrName
+ */
+ private void copyAttribute(Node sourceNode, nsIDOMElement a, String attrName) {
+ Element sourceA = (Element) sourceNode;
+ String attrValue = sourceA.getAttribute(attrName);
+ if ((attrValue != null) && (attrValue.length() > 0)) {
+ a.setAttribute(attrName, attrValue);
+ }
+ }
@Override
public boolean isRecreateAtAttrChange(VpePageContext pageContext,
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r31797 - trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-06-03 04:23:28 -0400 (Fri, 03 Jun 2011)
New Revision: 31797
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewEARAction.java
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewEJBJARAction.java
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewWARAction.java
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/PreviewPage.java
Log:
JBIDE-8303 - archive wizard's "perform finish" is inactive on page1
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewEARAction.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewEARAction.java 2011-06-03 06:08:10 UTC (rev 31796)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewEARAction.java 2011-06-03 08:23:28 UTC (rev 31797)
@@ -27,6 +27,7 @@
import org.jboss.ide.eclipse.archives.ui.wizards.AbstractArchiveWizard;
import org.jboss.ide.eclipse.archives.webtools.Messages;
import org.jboss.ide.eclipse.archives.webtools.archivetypes.EarArchiveType;
+import org.jboss.ide.eclipse.archives.webtools.archivetypes.WarArchiveType;
public class NewEARAction implements IActionDelegate {
@@ -85,11 +86,9 @@
super(wiz, Messages.EarPreview, Messages.EarPreview,
ArchivesSharedImages.getImageDescriptor(ArchivesSharedImages.IMG_EAR));
}
- protected void addToPackage() {
- IArchiveType type = ArchivesCore.getInstance().getExtensionManager().getArchiveType(EarArchiveType.ID);
- type.fillDefaultConfiguration(wizard.getProject().getName(), wizard.getArchive(), new NullProgressMonitor());
+ protected String getArchiveTypeId() {
+ return EarArchiveType.ID;
}
-
protected String getDescriptionMessage() {
return Messages.EarDescription;
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewEJBJARAction.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewEJBJARAction.java 2011-06-03 06:08:10 UTC (rev 31796)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewEJBJARAction.java 2011-06-03 08:23:28 UTC (rev 31797)
@@ -25,6 +25,7 @@
import org.jboss.ide.eclipse.archives.ui.ArchivesSharedImages;
import org.jboss.ide.eclipse.archives.ui.wizards.AbstractArchiveWizard;
import org.jboss.ide.eclipse.archives.webtools.Messages;
+import org.jboss.ide.eclipse.archives.webtools.archivetypes.EarArchiveType;
import org.jboss.ide.eclipse.archives.webtools.archivetypes.EjbArchiveType;
public class NewEJBJARAction implements IActionDelegate {
@@ -79,11 +80,9 @@
super(wiz, Messages.EjbJarPreview, Messages.EjbJarPreview,
ArchivesSharedImages.getImageDescriptor(ArchivesSharedImages.IMG_NEW_JAR_WIZARD));
}
- protected void addToPackage() {
- IArchiveType type = ArchivesCore.getInstance().getExtensionManager().getArchiveType(EjbArchiveType.ID);
- type.fillDefaultConfiguration(wizard.getProject().getName(), wizard.getArchive(), new NullProgressMonitor());
+ protected String getArchiveTypeId() {
+ return EjbArchiveType.ID;
}
-
protected String getDescriptionMessage() {
return Messages.EjbJarDescription;
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewWARAction.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewWARAction.java 2011-06-03 06:08:10 UTC (rev 31796)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewWARAction.java 2011-06-03 08:23:28 UTC (rev 31797)
@@ -79,9 +79,9 @@
super(wiz, Messages.WarPreview, Messages.WarPreview,
ArchivesSharedImages.getImageDescriptor(ArchivesSharedImages.IMG_NEW_WAR_WIZARD));
}
- protected void addToPackage() {
- IArchiveType type = ArchivesCore.getInstance().getExtensionManager().getArchiveType(WarArchiveType.WAR_PACKAGE_TYPE);
- type.fillDefaultConfiguration(wizard.getProject().getName(), wizard.getArchive(), new NullProgressMonitor());
+
+ protected String getArchiveTypeId() {
+ return WarArchiveType.WAR_PACKAGE_TYPE;
}
protected String getDescriptionMessage() {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/PreviewPage.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/PreviewPage.java 2011-06-03 06:08:10 UTC (rev 31796)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/PreviewPage.java 2011-06-03 08:23:28 UTC (rev 31797)
@@ -21,6 +21,7 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ILabelProviderListener;
@@ -41,13 +42,16 @@
import org.eclipse.ui.ide.IDE;
import org.eclipse.wst.server.core.IModuleArtifact;
import org.eclipse.wst.server.core.internal.ServerPlugin;
+import org.jboss.ide.eclipse.archives.core.ArchivesCore;
import org.jboss.ide.eclipse.archives.core.model.IArchive;
import org.jboss.ide.eclipse.archives.core.model.IArchiveFolder;
+import org.jboss.ide.eclipse.archives.core.model.IArchiveType;
import org.jboss.ide.eclipse.archives.ui.providers.ArchivesContentProviderDelegate;
import org.jboss.ide.eclipse.archives.ui.providers.ArchivesLabelProvider;
import org.jboss.ide.eclipse.archives.ui.wizards.AbstractArchiveWizard;
import org.jboss.ide.eclipse.archives.ui.wizards.WizardPageWithNotification;
import org.jboss.ide.eclipse.archives.webtools.Messages;
+import org.jboss.ide.eclipse.archives.webtools.archivetypes.WarArchiveType;
public abstract class PreviewPage extends WizardPageWithNotification {
@@ -97,13 +101,10 @@
protected void fillGroups() {
}
public boolean isPageComplete() {
- return hasCreated;
+ return true;
}
public void pageEntered(int button) {
- if( !hasCreated ) {
- addToPackage();
- hasCreated = true;
- }
+ addToPackage();
fillWidgets(wizard.getArchive());
// if it's already a module type project, hide the meta inf stuff
@@ -117,7 +118,17 @@
getWizard().getContainer().updateButtons();
}
- protected abstract void addToPackage();
+ protected void addToPackage() {
+ if( !hasCreated ) {
+ hasCreated = true;
+ String archiveTypeId = getArchiveTypeId();
+ IArchiveType type = ArchivesCore.getInstance().getExtensionManager().getArchiveType(archiveTypeId);
+ type.fillDefaultConfiguration(wizard.getProject().getName(), wizard.getArchive(), new NullProgressMonitor());
+ }
+ }
+
+ protected abstract String getArchiveTypeId();
+
protected void fillWidgets(IArchive pkg) {
previewViewer.setInput(pkg);
previewViewer.expandAll();
@@ -135,7 +146,9 @@
return result;
}
- public void pageExited(int button) {}
+ public void pageExited(int button) {
+ addToPackage();
+ }
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r31796 - trunk/as/plugins/org.jboss.ide.eclipse.as.core.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-06-03 02:08:10 -0400 (Fri, 03 Jun 2011)
New Revision: 31796
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
Log:
JBIDE-9062
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-06-03 03:12:20 UTC (rev 31795)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-06-03 06:08:10 UTC (rev 31796)
@@ -190,6 +190,9 @@
id="org.jboss.ide.eclipse.as.runtime.32"
version="3.2">
<moduleType
+ types="wst.web"
+ versions="1.0,1.2,1.3,1.4"/>
+ <moduleType
types="jst.web"
versions="2.2, 2.3, 2.4"/>
<moduleType
@@ -216,6 +219,9 @@
id="org.jboss.ide.eclipse.as.runtime.40"
version="4.0">
<moduleType
+ types="wst.web"
+ versions="1.0,1.2,1.3,1.4"/>
+ <moduleType
types="jst.web"
versions="2.2, 2.3, 2.4, 2.5"/>
<moduleType
@@ -252,6 +258,9 @@
id="org.jboss.ide.eclipse.as.runtime.42"
version="4.2">
<moduleType
+ types="wst.web"
+ versions="1.0,1.2,1.3,1.4"/>
+ <moduleType
types="jst.web"
versions="2.2, 2.3, 2.4, 2.5"/>
<moduleType
@@ -288,6 +297,9 @@
id="org.jboss.ide.eclipse.as.runtime.50"
version="5.0">
<moduleType
+ types="wst.web"
+ versions="1.0,1.2,1.3,1.4"/>
+ <moduleType
types="jst.web"
versions="2.2, 2.3, 2.4, 2.5"/>
<moduleType
@@ -335,6 +347,9 @@
types="jst.appclient"
versions="5.0"/>
<moduleType
+ types="wst.web"
+ versions="1.0,1.2,1.3,1.4"/>
+ <moduleType
types="jst.web"
versions="2.2, 2.3, 2.4, 2.5"/>
<moduleType
@@ -379,6 +394,9 @@
types="jst.appclient"
versions="5.0, 6.0"/>
<moduleType
+ types="wst.web"
+ versions="1.0,1.2,1.3,1.4"/>
+ <moduleType
types="jst.web"
versions="2.2, 2.3, 2.4, 2.5, 3.0"/>
<moduleType
@@ -425,6 +443,9 @@
types="jst.appclient"
versions="5.0, 6.0"/>
<moduleType
+ types="wst.web"
+ versions="1.0,1.2,1.3,1.4"/>
+ <moduleType
types="jst.web"
versions="2.2, 2.3, 2.4, 2.5, 3.0"/>
<moduleType
@@ -471,6 +492,9 @@
types="jst.appclient"
versions="5.0"/>
<moduleType
+ types="wst.web"
+ versions="1.0,1.2,1.3,1.4"/>
+ <moduleType
types="jst.web"
versions="2.2, 2.3, 2.4, 2.5"/>
<moduleType
@@ -508,6 +532,9 @@
types="jst.appclient"
versions="5.0"/>
<moduleType
+ types="wst.web"
+ versions="1.0,1.2,1.3,1.4"/>
+ <moduleType
types="jst.web"
versions="2.2, 2.3, 2.4, 2.5"/>
<moduleType
@@ -555,6 +582,9 @@
types="jst.appclient"
versions="1.2,1.3,1.4,5.0,6.0"/>
<moduleType
+ types="wst.web"
+ versions="1.0,1.2,1.3,1.4"/>
+ <moduleType
types="jst.web"
versions="2.2, 2.3, 2.4, 2.5,3.0"/>
<moduleType
@@ -770,6 +800,7 @@
<runtime-component
id="org.jboss.ide.eclipse.as.runtime.stripped.component"
version="1.0"/>
+ <facet id="wst.web" version="1.0,1.2,1.3,1.4"/>
<facet id="jst.web" version="2.2,2.3,2.4,2.5"/>
<facet id="jst.java" version="1.3,1.4,5.0,6.0"/>
<facet id="jst.utility" version="1.0"/>
@@ -792,6 +823,7 @@
<runtime-component
id="org.jboss.ide.eclipse.eap.runtime.component"
version="4.3"/>
+ <facet id="wst.web" version="1.0,1.2,1.3,1.4"/>
<facet id="jst.web" version="2.2,2.3,2.4,2.5"/>
<facet id="jst.java" version="1.3,1.4,5.0,6.0"/>
<facet id="jst.utility" version="1.0"/>
@@ -804,6 +836,7 @@
<runtime-component
id="org.jboss.ide.eclipse.eap.runtime.component"
version="5.0"/>
+ <facet id="wst.web" version="1.0,1.2,1.3,1.4"/>
<facet id="jst.web" version="2.2,2.3,2.4,2.5"/>
<facet id="jst.java" version="1.3,1.4,5.0,6.0"/>
<facet id="jst.utility" version="1.0"/>
@@ -844,6 +877,7 @@
<runtime-component
id="org.jboss.ide.eclipse.as.runtime.component"
version="3.2"/>
+ <facet id="wst.web" version="1.0,1.2,1.3,1.4"/>
<facet id="jst.web" version="2.2,2.3,2.4"/>
<facet id="jst.java" version="1.3,1.4,5.0,6.0"/>
<facet id="jst.utility" version="1.0"/>
@@ -857,6 +891,7 @@
<runtime-component
id="org.jboss.ide.eclipse.as.runtime.component"
version="4.0"/>
+ <facet id="wst.web" version="1.0,1.2,1.3,1.4"/>
<facet id="jst.web" version="2.2,2.3,2.4,2.5"/>
<facet id="jst.java" version="1.3,1.4,5.0,6.0"/>
<facet id="jst.utility" version="1.0"/>
@@ -870,6 +905,7 @@
<runtime-component
id="org.jboss.ide.eclipse.as.runtime.component"
version="4.2"/>
+ <facet id="wst.web" version="1.0,1.2,1.3,1.4"/>
<facet id="jst.web" version="2.2,2.3,2.4,2.5"/>
<facet id="jst.java" version="1.3,1.4,5.0,6.0"/>
<facet id="jst.utility" version="1.0"/>
@@ -883,6 +919,7 @@
<runtime-component
id="org.jboss.ide.eclipse.as.runtime.component"
version="5.0"/>
+ <facet id="wst.web" version="1.0,1.2,1.3,1.4"/>
<facet id="jst.web" version="2.2,2.3,2.4,2.5"/>
<facet id="jst.java" version="1.3,1.4,5.0,6.0"/>
<facet id="jst.utility" version="1.0"/>
@@ -896,6 +933,7 @@
<runtime-component
id="org.jboss.ide.eclipse.as.runtime.component"
version="5.1"/>
+ <facet id="wst.web" version="1.0,1.2,1.3,1.4"/>
<facet id="jst.web" version="2.2,2.3,2.4,2.5"/>
<facet id="jst.java" version="1.3,1.4,5.0,6.0"/>
<facet id="jst.utility" version="1.0"/>
@@ -909,6 +947,7 @@
<runtime-component
id="org.jboss.ide.eclipse.as.runtime.component"
version="6.0"/>
+ <facet id="wst.web" version="1.0,1.2,1.3,1.4"/>
<facet id="jst.web" version="2.2,2.3,2.4,2.5,3.0"/>
<facet id="jst.java" version="5.0,6.0"/>
<facet id="jst.utility" version="1.0"/>
@@ -922,6 +961,7 @@
<runtime-component
id="org.jboss.ide.eclipse.as.runtime.component"
version="7.0"/>
+ <facet id="wst.web" version="1.0,1.2,1.3,1.4"/>
<facet id="jst.web" version="2.2,2.3,2.4,2.5,3.0"/>
<facet id="jst.java" version="5.0,6.0"/>
<facet id="jst.utility" version="1.0"/>
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r31795 - in trunk/bpel/docs/reference/en-US: images/reference and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-06-02 23:12:20 -0400 (Thu, 02 Jun 2011)
New Revision: 31795
Added:
trunk/bpel/docs/reference/en-US/images/reference/BPEL_Designer_03.png
trunk/bpel/docs/reference/en-US/images/reference/BPEL_Designer_04.png
trunk/bpel/docs/reference/en-US/images/reference/BPEL_Designer_05.png
Modified:
trunk/bpel/docs/reference/en-US/reference.xml
Log:
updated with new content
Added: trunk/bpel/docs/reference/en-US/images/reference/BPEL_Designer_03.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/BPEL_Designer_03.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/BPEL_Designer_04.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/BPEL_Designer_04.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/BPEL_Designer_05.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/BPEL_Designer_05.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/bpel/docs/reference/en-US/reference.xml
===================================================================
--- trunk/bpel/docs/reference/en-US/reference.xml 2011-06-03 02:57:52 UTC (rev 31794)
+++ trunk/bpel/docs/reference/en-US/reference.xml 2011-06-03 03:12:20 UTC (rev 31795)
@@ -1078,6 +1078,20 @@
<para>
Most basic activities will require some additional configuration. See <xref linkend="Reference-Property_sections" /> for more information.
</para>
+ <section>
+ <title>Start and End</title>
+ <para>
+ Every BPEL process has implicit <property>Start</property> <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/BPEL_Designer_04.png"/>
+ </imageobject>
+ </inlinemediaobject> and <property>End</property> <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/BPEL_Designer_05.png"/>
+ </imageobject>
+ </inlinemediaobject> activities. These do not correspond to actual BPEL elements however, and are simply placeholders for visualizing the beginning and end of the process flow:
+ </para>
+ </section>
</section>
</section>
</section>
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r31794 - in trunk/bpel/docs/reference/en-US: images/reference and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-06-02 22:57:52 -0400 (Thu, 02 Jun 2011)
New Revision: 31794
Added:
trunk/bpel/docs/reference/en-US/images/reference/BPEL_Designer_01.png
trunk/bpel/docs/reference/en-US/images/reference/BPEL_Designer_02.png
trunk/bpel/docs/reference/en-US/images/reference/Details_tab_05.png
trunk/bpel/docs/reference/en-US/images/reference/Details_tab_06.png
trunk/bpel/docs/reference/en-US/images/reference/Details_tab_07-Opaque_Warning.png
trunk/bpel/docs/reference/en-US/images/reference/Details_tab_08.png
trunk/bpel/docs/reference/en-US/images/reference/Details_tab_08b.png
trunk/bpel/docs/reference/en-US/images/reference/Details_tab_08c-Initializer.png
trunk/bpel/docs/reference/en-US/images/reference/Details_tab_08d.png
trunk/bpel/docs/reference/en-US/images/reference/Details_tab_09.png
trunk/bpel/docs/reference/en-US/images/reference/Details_tab_10.png
trunk/bpel/docs/reference/en-US/images/reference/Details_tab_11.png
trunk/bpel/docs/reference/en-US/images/reference/Details_tab_12.png
trunk/bpel/docs/reference/en-US/images/reference/Details_tab_13.png
trunk/bpel/docs/reference/en-US/images/reference/Details_tab_14.png
trunk/bpel/docs/reference/en-US/images/reference/Details_tab_14b.png
trunk/bpel/docs/reference/en-US/images/reference/Details_tab_15.png
trunk/bpel/docs/reference/en-US/images/reference/Details_tab_15b.png
trunk/bpel/docs/reference/en-US/images/reference/Details_tab_15c.png
trunk/bpel/docs/reference/en-US/images/reference/Details_tab_16.png
trunk/bpel/docs/reference/en-US/images/reference/Details_tab_17.png
trunk/bpel/docs/reference/en-US/images/reference/Details_tab_18.png
trunk/bpel/docs/reference/en-US/images/reference/Details_tab_19.png
Modified:
trunk/bpel/docs/reference/en-US/reference.xml
Log:
updated with new reference section content
Added: trunk/bpel/docs/reference/en-US/images/reference/BPEL_Designer_01.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/BPEL_Designer_01.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/BPEL_Designer_02.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/BPEL_Designer_02.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_05.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_05.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_06.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_06.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_07-Opaque_Warning.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_07-Opaque_Warning.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_08.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_08.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_08b.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_08b.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_08c-Initializer.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_08c-Initializer.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_08d.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_08d.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_09.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_09.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_10.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_10.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_11.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_11.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_12.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_12.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_13.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_13.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_14.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_14.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_14b.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_14b.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_15.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_15.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_15b.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_15b.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_15c.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_15c.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_16.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_16.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_17.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_17.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_18.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_18.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_19.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/Details_tab_19.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/bpel/docs/reference/en-US/reference.xml
===================================================================
--- trunk/bpel/docs/reference/en-US/reference.xml 2011-06-03 00:33:59 UTC (rev 31793)
+++ trunk/bpel/docs/reference/en-US/reference.xml 2011-06-03 02:57:52 UTC (rev 31794)
@@ -287,7 +287,7 @@
</figure>
</section>
</section>
- <section>
+ <section id="Reference-Views">
<title>Views</title>
<section>
<title>Outline</title>
@@ -359,10 +359,10 @@
The process name appears at the top of the Dashboard. The main Dashboard area lists all of the <guilabel>Partner Links</guilabel>, <guilabel>Variables</guilabel>,<guilabel>Correlation Sets</guilabel> and <guilabel>Message Exchanges</guilabel> currently defined for the process. The green plus symbol and grey x symbol allow you to add and delete each of these elements. In-line editing of all element names works by selecting the name and then clicking again to enable the editor.
</para>
</section>
- <section>
- <title>Property Sheets</title>
+ <section id="Reference-Property_sections">
+ <title>Property sections</title>
<section>
- <title>Common Property sheet tabs</title>
+ <title>Common property section tabs</title>
<para>
This section describes the Property Sheet tabs that are common to many activities.
</para>
@@ -521,7 +521,7 @@
<section>
<title>Details tab</title>
<para>
- This section describes the <guilabel>Details</guilbel> tab and its attributes as they will appear for individual activities. Several activities share common detail elements, but all are presented here for your reference.
+ This section describes the <guilabel>Details</guilabel> tab and its attributes as they will appear for individual activities. Several activities share common detail elements, but all are presented here for your reference.
</para>
<section>
<title>Partner Links</title>
@@ -596,216 +596,490 @@
The checkbox labeled <guilabel>Use WSDL Message Parts Mapping</guilabel> provides an alternative to using variables for the request message.
</para>
</section>
+ <section>
+ <title>Receive</title>
+ <figure>
+ <title>Receive</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Details_tab_05.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ A <property>Receive</property> activity requires a <property>Partner Link</property> name and an Operation as defined in the WSDL for this service. You can use the <guilabel>Quick Pick</guilabel> tree control at the right to select the <property>Partner Link</property> and <property>Operation</property>. A previously defined variable can be used to hold the message data, or the <guilabel>Use WSDL Message Parts Mapping</guilabel> checkbox can be set to store the incoming message in an anonymous WSDL message variable.
+ </para>
+ <para>
+ The <guilabel>Create a new Process Instance</guilabel> checkbox, when enabled, will cause the BPEL engine to start a new process. This will start a new conversation with a client.
+ </para>
+ </section>
+ <section>
+ <title>Reply</title>
+ <figure>
+ <title>Reply</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Details_tab_06.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ A <property>Reply</property> activity requires a <property>Partner Link</property> name and an <property>Operation</property> as defined in the WSDL for this service. You can use the <guilabel>Quick Pick</guilabel> tree control at the right to select the <property>Partner Link</property> and <property>Operation</property>. A previously defined variable can be used to provide the response message data, or the <guilabel>Use WSDL Message Parts Mapping</guilabel> checkbox can be set to use the data from the anonymous WSDL message variable.
+ </para>
+ </section>
+ <section>
+ <title>Opaque</title>
+ <para>
+ <property>Opaque</property> activities are only used in abstract processes, and are meant as placeholders for other activities or complex business logic that has not yet been determined. When you drag and drop an <property>Opaque</property> activity onto the drawing canvas, the process will be converted to a non-executable, abstract process. The BPEL Designer will inform you about this by displaying a warning dialog.
+ </para>
+ <figure>
+ <title>Opaque</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Details_tab_07-Opaque_Warning.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </section>
+ <section>
+ <title>Assign</title>
+ <para>
+ The <property>Assign</property> section is probably one of the more complex pages in the BPEL Designer, due to the nature of the BPEL <property>Assign</property> activity. The figure below shows the detail tab of an empty <property>Assign</property> activity with callouts describing each component:
+ </para>
+ <figure>
+ <title>Assign</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Details_tab_08.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <orderedlist>
+ <listitem>
+ <para>
+ List (initially empty) of assignment operations currently defined.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <guilabel>From</guilabel> combo box for selecting the source element category.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <guilabel>To</guilabel> combo box for selecting the target element category.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Contents and order management buttons. The <guibutton>New</guibutton> button adds a new assignment operation to the list. When clicked, the <guilabel>From</guilabel> and <guilabel>To</guilabel> combo boxes become active and display <property>Variable</property>. These allow you to select the source and categories for target items.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <guilabel>Validate checkbox</guilabel>; when enabled will cause the BPEL engine to validate the data after the assignment. If an error is detected it will cause a fault, which can be caught by a fault handler in the BPEL process.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <guilabel>Ignore Missing Source Data checkbox</guilabel>; When enabled, missing source data is not considered an error (no fault will be generated).
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <guilabel>Keep Source Element Name checkbox</guilabel>; when enabled, the complex target variable element names will not be replaced by the source element names if they differ.
+ </para>
+ </listitem>
+ </orderedlist>
+ <para>
+ The following figure shows the detail tab of an <property>Assign</property> activity which has an XPath expression as the source (<guilabel>From</guilabel>) and a process variable element as the target (<guilabel>To</guilabel>):
+ </para>
+ <figure>
+ <title>Assign</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Details_tab_08b.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <!-- <para>
+ See XPath Expression Editor section for more information regarding the composition of XPath expressions.
+ </para> -->
+ <para>
+ A requirement of the BPEL language is that all complex variables must be initialized with valid XML before they are referenced either as a target of an assignment, or in another BPEL activity. The BPEL Designer understands this and, once you have selected the target of an assignment operation, it will ask if you would like to have an XML fragment generated for the target variable:
+ </para>
+ <figure>
+ <title>Assign</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Details_tab_08c-Initializer.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ Unless you are certain that the variable has been initialized during a previous assignment operation or other activity, you should click <guibutton>Yes</guibutton>. The figure below shows the <property>Assign</property> details tab after the initializer has been generated:
+ </para>
+ <figure>
+ <title>Assign</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Details_tab_08d.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <formalpara>
+ <title>Assignment Operation Categories</title>
+ <para>
+ Additional type selection or data entry widgets will appear below the <guilabel>From</guilabel> and <guilabel>To</guilabel> combo boxes, depending on the source and target item categories selected in the combo boxes. Initially these will be controls for the selection of process variables, since the default combo box selection is <property>Variable</property>. The possible source and target categories are described in the following table:
+ </para>
+ </formalpara>
+ <table>
+ <title>Possible source and target categories</title>
+ <tgroup cols='5' align='left' colsep='1' rowsep='1'>
+ <colspec colname='c1'/>
+ <colspec colname='c2'/>
+ <colspec colname='c3'/>
+ <colspec colname='c4'/>
+ <colspec colname='c5'/>
+ <thead>
+ <row>
+ <entry>Category</entry>
+ <entry>Control type</entry>
+ <entry>Can be source?</entry>
+ <entry>Can be target?</entry>
+ <entry>Further information</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>Variable</entry>
+ <entry>Tree</entry>
+ <entry>Yes</entry>
+ <entry>Yes</entry>
+ <entry>Select an in-scope variable or any portion if it is a complex variable. The target of the assignment must have the same type (for simple variables) or structure (for complex variables) as the source.</entry>
+ </row>
+ <row>
+ <entry>Expression</entry>
+ <entry>XPath</entry>
+ <entry>Yes</entry>
+ <entry>Yes</entry>
+ <entry>Enter a valid XPath expression with the XPath editor. For targets, the expression must resolve to an L-Value; that is, it must be a variable reference.</entry>
+ </row>
+ <row>
+ <entry>Fixed Value</entry>
+ <entry>Text</entry>
+ <entry>Yes</entry>
+ <entry>No</entry>
+ <entry>Enter a valid XML fragment that is compatible in structure and data type with the target.</entry>
+ </row>
+ <row>
+ <entry>Property of a Variable</entry>
+ <entry>List</entry>
+ <entry>Yes</entry>
+ <entry>Yes</entry>
+ <entry>N/A</entry>
+ </row>
+ <row>
+ <entry>Partner Link reference</entry>
+ <entry>List</entry>
+ <entry>Yes</entry>
+ <entry>Yes</entry>
+ <entry>N/A</entry>
+ </row>
+ <row>
+ <entry>Endpoint reference</entry>
+ <entry>List</entry>
+ <entry>Yes</entry>
+ <entry>No</entry>
+ <entry>N/A</entry>
+ </row>
+ <row>
+ <entry>Opaque</entry>
+ <entry>None</entry>
+ <entry>Yes</entry>
+ <entry>No</entry>
+ <entry>N/A</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </section>
+ <section>
+ <title>Validate</title>
+ <figure>
+ <title>Validate</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Details_tab_09.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ The <property>Validate</property> details tab contains a list of variables to be validated.
+ </para>
+ </section>
+ <section>
+ <title>While and RepeatUntil</title>
+ <figure>
+ <title>While and RepeatUntil</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Details_tab_10.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ These activities have the same details tab, which allows you to specify an XPath expression to be evaluated for the conditional activity. <!-- See the XPath Expression Editor for more information. -->
+ </para>
+ </section>
+ <section>
+ <title>Link</title>
+ <figure>
+ <title>Link</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Details_tab_11.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ The <property>Link</property> detail tab allows you to specify a condition that will cause <property>Flow</property> synchronization to be satisfied and allow the target activity to continue. This is similar to the details tab of the other conditional activities.
+ </para>
+ </section>
+ <section>
+ <title>Pick</title>
+ <figure>
+ <title>Pick</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Details_tab_12.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ The <property>Pick</property> details tab allows you to specify whether the event will create a new process instance. <!-- See also the discussion of the Pick Activity. -->
+ </para>
+ </section>
+ <section>
+ <title>OnMessage</title>
+ <figure>
+ <title>OnMessage</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Details_tab_13.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ The <property>OnMessage</property> activity is used in either a <property>Pick</property> or event handler.
+ </para>
+ <para>
+ The <guilabel>Details</guilabel> tab allows you to specify the <property>Partner Link</property>, <property>Operation</property> and <property>Message Type</property> expected by the activity, and the process variable that will contain the received message data.
+ </para>
+ </section>
+ <section>
+ <title>OnAlarm</title>
+ <figure>
+ <title>OnAlarm</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Details_tab_14.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ The <property>OnAlarm</property> activity is used in either a <property>Pick</property> or event handler to handle timeouts while waiting for messages to arrive. This activity can be configured to wait for a certain period of time or until a specific date and time.
+ </para>
+ <para>
+ The <guilabel>Details</guilabel> tab allows you to specify the <property>Partner Link</property>, <property>Operation</property> and <property>Message Type</property> expected by the activity, and the process variable that will contain the received message data.
+ </para>
+ <para>
+ <guilabel>Repeat</guilabel> conditions are only allowed for an <property>OnAlarm</property> in an event handler. This allows the activities enclosed in the activity to be executed repeatedly. <guilabel>Repeat</guilabel> duration is the amount of time the process will wait before each repetition. The <guilabel>Repeat</guilabel> screen follows:
+ </para>
+ <figure>
+ <title>OnAlarm</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Details_tab_14b.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </section>
+ <section>
+ <title>ForEach</title>
+ <figure>
+ <title>ForEach</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Details_tab_15.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ The details tab of the <property>ForEach</property> activity allows you to specify a counter variable to be used for keeping track of the loop iterations. The <guilabel>Parallel execution</guilabel> checkbox, when enabled, will execute all iterations in parallel. <!-- See the description of this activity for more information about its behavior. -->
+ </para>
+ <figure>
+ <title>ForEach</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Details_tab_15b.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ The <guilabel>Counter Values</guilabel> tab is where the required starting and ending counter values are specified.
+ </para>
+ <figure>
+ <title>ForEach</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Details_tab_15c.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ The optional <guilabel>Completion</guilabel> tab allows you to specify the early termination condition for the loop.
+ </para>
+ </section>
+ <section>
+ <title>Wait</title>
+ <figure>
+ <title>Wait</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Details_tab_16.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ The details tab of the <property>Wait</property> activity allows you set a delay (<property>Duration</property>) or specify a date and time (<property>Date</property>) for when to continue process execution.
+ </para>
+ </section>
+ <section>
+ <title>Scope</title>
+ <figure>
+ <title>Scope</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Details_tab_17.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ The details tab for the <property>Scope</property> activity allows you to define whether the Scope is <guilabel>isolated</guilabel>.<!-- See the discussion of Scope and Flow activities for more information regarding isolated Scopes. -->
+ </para>
+ </section>
+ <section>
+ <title>Throw</title>
+ <figure>
+ <title>Throw</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Details_tab_18.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ The <property>Throw</property> activity will invoke a fault handler in an enclosing <property>Scope</property> activity. <property>Throw</property> requires the name of either a standard BPEL fault, or the name of a user-defined fault message. A variable is used to hold the value of the fault data.
+ </para>
+ </section>
+ <section>
+ <title>CompensateScope</title>
+ <figure>
+ <title>CompensateScope</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Details_tab_19.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ The <property>CompensateScope</property> activity will invoke a compensation handler in the <property>Scope</property> or the <property>Invoke</property> activity given by the name of the <guilabel>Target Activity</guilabel>.
+ </para>
+ </section>
</section>
</section>
</section>
<section>
<title>Editors</title>
<section>
- <title>Business Process Editor</title>
- <para>
- The Business Process Editor is intended to facilitate the process of changing and adding new logic to a BPEL process file. You can open <filename>.bpel</filename> files in this editor by right click the file in the <guilabel>Project Explorer</guilabel> and selecting <menuchoice><guimenuitem>Open With...</guimenuitem><guimenuitem>Business Process Editor</guimenuitem></menuchoice>.
- </para>
- <figure>
- <title>Business Process Editor</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/reference/bpel_ref_5.png"/>
- </imageobject>
- </mediaobject>
- </figure>
- <para>The editor consists of two tabs: the <guilabel>Design</guilabel> tab and the <guilabel>Source</guilabel> tab.</para>
- <section>
- <title>Design tab</title>
- <para>The <guilabel>Design</guilabel> tab is the main part of the <guilabel>Business Process Editor</guilabel>. It consists of 3 parts:</para>
- <itemizedlist>
- <listitem><para>Visual Pane:</para>
- <figure>
- <title>Visual Pane of Business Process Editor</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/reference/bpel_ref_6.png"/>
- </imageobject>
- </mediaobject>
- </figure>
- <para>The Visual Pane provides a graphical representation of the order in which the activities are executed.</para>
- </listitem>
- <listitem><para>Palette:</para>
- <figure>
- <title>Palette of Business Process Editor</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/reference/bpel_ref_7.png"/>
- </imageobject>
- </mediaobject>
- </figure>
- <para>
- The <guilabel>Palette</guilabel> view represents the different BPEL activities elements organized into functional categories. Using it the developer can easily add new elements to the sequence activity. To do this, click the required element and then drag and drop it to the place on the Visual Pane.
- </para>
- </listitem>
- <listitem><para>Behavior Components View:</para>
- <figure>
- <title>Behavior Components View of Business Process Editor</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/reference/bpel_ref_8.png"/>
- </imageobject>
- </mediaobject>
- </figure>
- <para>
- Execution behavior components are grouped into the <guilabel>Behavior Components</guilabel> view. This view is also fully synchronized with <guilabel>Properties</guilabel> view where you can customize all the properties of the component.
- </para>
- <figure>
- <title>Process Structure View of Business Process Editor</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/reference/bpel_ref_9.png"/>
- </imageobject>
- </mediaobject>
- </figure>
- <para>To add an element to a component group click the plus (<inlinemediaobject>
- <imageobject>
- <imagedata fileref="images/reference/bpel_ref_10.png"/>
- </imageobject>
- </inlinemediaobject>) icon, and to delete it click the element and use select the <guilabel>Delete</guilabel> option in the popup menu.</para>
- </listitem>
-
- </itemizedlist>
-
-
- </section>
- <section>
- <title>Source tab</title>
- <para>The <guilabel>Source</guilabel> tab can be used for directly editing BPEL process files. It is also possible to validate the file structure.
- </para>
- <figure>
- <title>Validation error in Source tab</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/reference/bpel_ref_11.png"/>
- </imageobject>
- </mediaobject>
- </figure>
- <para>Validation can be enabled or disabled by selecting <menuchoice><guimenuitem>Window</guimenuitem><guimenuitem>Preferences</guimenuitem><guimenuitem>Validation</guimenuitem></menuchoice>.</para>
- <figure>
- <title>Validation configuration</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/reference/bpel_ref_12.png"/>
- </imageobject>
- </mediaobject>
- </figure>
- </section>
- </section>
- <section>
- <title>ODE Deployment Descriptor Editor</title>
- <para>To deploy your process in ODE you need to create a simple deployment descriptor with basic information, using the <property>ODE Deployment Descriptor Editor</property> to facilitate the process of descriptor configuration. You can see how the descriptor file looks when it is opened in the editor in the image below:
- </para>
- <figure>
- <title>ODE Deployment Descriptor Editor</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/reference/bpel_ref_13.png"/>
- </imageobject>
- </mediaobject>
- </figure>
- <para>The table below describes the configuration options of the ODE Deployment Descriptor Editor:</para>
- <table>
- <title>ODE Deployment Descriptor Editor.Options.</title>
- <tgroup cols="3">
- <colspec colnum="1" align="left" colwidth="1*"/>
- <colspec colnum="2" align="left" colwidth="3*"/>
- <colspec colnum="3" align="left" colwidth="1*"/>
-
- <thead>
- <row>
- <entry>Section</entry>
- <entry>Options</entry>
- <entry>Description</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry morerows='1' valign='middle'><para>
- General</para></entry>
-
- <entry>This process is</entry>
- <entry>Select one of the provided options:
- <itemizedlist>
- <listitem>
- <para><emphasis>activated</emphasis>
- </para>
- </listitem>
- <listitem>
- <para><emphasis>deactivated</emphasis></para>
- </listitem>
- <listitem>
- <para><emphasis>retired</emphasis>
- </para>
- </listitem>
- </itemizedlist></entry>
-
- </row>
- <row><entry>Run this process in memory</entry>
- <entry>for performance purposes, you can define the process as being executed only in-memory.</entry>
- </row>
-
- <row>
- <entry>Inbound Interfaces(Services)</entry>
- <entry>Associated Port</entry>
- <entry>Click Associated Port and the dropdown list with all available port names will appear. Select the one you need, and the other fields will be filled automatically. This action configure the services provided by the process and binds each service to an endpoint
- </entry>
-
- </row>
-
- <row>
- <entry>Outbound Interfaces(Invokes)</entry>
- <entry>Associated Port</entry>
- <entry>Click Associated Port and the dropdown list with all available port names will appear. Select the one you need, and the other fields will be filled automatically. This action configure the services invoked by the process</entry>
- </row>
- <row>
- <entry>Process-level Monitoring Events</entry>
- <entry> <itemizedlist>
- <listitem><para>
- <emphasis>None</emphasis>
- </para></listitem>
- <listitem>
- <para>
- <emphasis>All</emphasis>
- </para>
- </listitem>
- <listitem>
- <para>
- <emphasis>Selected</emphasis>:
- </para>
- <itemizedlist>
- <listitem><para>Instance life cycle</para></listitem>
- <listitem><para>Activity life cycle</para></listitem>
- <listitem><para>Data handling</para></listitem>
- <listitem><para>Scope handling</para></listitem>
- <listitem><para>Correlation</para></listitem>
-
- </itemizedlist>
-
- </listitem>
- </itemizedlist>
- </entry>
- <entry>Using ODE's deployment descriptor, it's also possible to make events generation to filter which ones get created.
- All the options simply revert to the default behavior when nothing is specified in the deployment.</entry>
- </row>
- <row>
- <entry>Scope-level Monitoring Events</entry>
- <entry>Scope</entry>
- <entry>This section makes it possible to define filtering for each scope of your process.
- </entry>
- </row>
- </tbody>
- </tgroup>
- </table>
+ <title>BPEL Designer</title>
+ <para>
+ This section discusses the features of the BPEL Designer. See <xref linkend="Reference-Views" /> for a detailed discussion of each of these features.
+ </para>
+ <figure>
+ <title>BPEL Designer</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/BPEL_Designer_01.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <orderedlist>
+ <listitem>
+ <para>
+ <emphasis>Drawing Canvas</emphasis>: This contains the graphical representation of the BPEL process and is displayed when the <guilabel>Design</guilabel> tab at the bottom of the editor window is selected. The primary mouse click action (default is left mouse button) on any of the activity names activates an in-line editor, allowing you to edit the process name. To finish editing, simply press the <keycap>ENTER</keycap> key or change focus by clicking on a different window control.
+ </para>
+ <para>
+ The <guilabel>Source</guilabel> tab displays the XML (text) representation of the process. Any changes made in one view are immediately reflected in the other. The default layout of activities is top-to-bottom, but can be changed to horizontal layout from the context menu.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>Palette</emphasis>: The primary editing, creation and viewing tools of the BPEL Designer are accessed from the tool <guilabel>Palette</guilabel>.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>Dashboard</emphasis>: Provides an overview of the BPEL process.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>Property Sheet</emphasis>: When an activity is selected in the drawing canvas, its properties are displayed in the tabbed <guilabel>Properties</guilabel> sheet.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>Outline</emphasis>: This panel provides a structural view of the BPEL process.
+ </para>
+ </listitem>
+ </orderedlist>
+ <para>
+ The BPEL Designer will validate your business process every time it is saved. If an activity is found to be incomplete or incorrectly configured, it will be decorated with an error icon (red circle with an X) as for example the <property>Assign</property> activity below:
+ </para>
+ <figure>
+ <title>Assign error</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/BPEL_Designer_02.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ Hovering your mouse over this icon will display an error message in a tooltip:
+ </para>
+ <figure>
+ <title>Assign error with tooltip</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/BPEL_Designer_03.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ The remainder of this section discusses some basic BPEL concepts and how they relate to the BPEL Designer.
+ </para>
+ <section>
+ <title>Basic activities</title>
+ <para>
+ Basic activities are represented on the drawing canvas as rounded rectangles containing an icon and the user-defined name of the activity. The <guilabel>Actions</guilabel> section of the <guilabel>Palette</guilabel> contains all of the basic activities. For example: <property>Assign</property>, <property>Invoke</property> and <property>Receive</property>.
+ </para>
+ <para>
+ Most basic activities will require some additional configuration. See <xref linkend="Reference-Property_sections" /> for more information.
+ </para>
+ </section>
</section>
-
</section>
-
-
</chapter>
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r31793 - in trunk/cdi: tests/org.jboss.tools.cdi.text.ext.test/META-INF and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-06-02 20:33:59 -0400 (Thu, 02 Jun 2011)
New Revision: 31793
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ITestableCDIHyperlink.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventListHyperlink.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodHyperlink.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodListHyperlink.java
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/HyperlinkDetectorTest.java
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java
Log:
https://issues.jboss.org/browse/JBIDE-9058
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java 2011-06-03 00:19:44 UTC (rev 31792)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java 2011-06-03 00:33:59 UTC (rev 31793)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.tools.cdi.text.ext.hyperlink;
+import java.util.Set;
+
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.ui.JavaUI;
@@ -17,6 +19,7 @@
import org.eclipse.jface.text.IRegion;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PartInitException;
+import org.jboss.tools.cdi.core.ICDIElement;
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IInjectionPointField;
import org.jboss.tools.cdi.core.IInjectionPointMethod;
@@ -25,7 +28,7 @@
import org.jboss.tools.cdi.text.ext.CDIExtensionsPlugin;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
-public class EventHyperlink extends AbstractHyperlink{
+public class EventHyperlink extends AbstractHyperlink implements ITestableCDIHyperlink{
IInjectionPoint event;
IRegion region;
@@ -79,4 +82,13 @@
return text;
}
+
+ public ICDIElement getCDIElement() {
+ return event;
+ }
+
+ public Set<? extends ICDIElement> getCDIElements() {
+ return null;
+ }
+
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventListHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventListHyperlink.java 2011-06-03 00:19:44 UTC (rev 31792)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventListHyperlink.java 2011-06-03 00:33:59 UTC (rev 31793)
@@ -16,11 +16,12 @@
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.ITextViewer;
import org.eclipse.jface.text.hyperlink.IHyperlink;
+import org.jboss.tools.cdi.core.ICDIElement;
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.text.ext.CDIExtensionsMessages;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
-public class EventListHyperlink extends AbstractHyperlink{
+public class EventListHyperlink extends AbstractHyperlink implements ITestableCDIHyperlink{
private ITextViewer viewer;
private Set<IInjectionPoint> events;
private IRegion region;
@@ -62,4 +63,12 @@
return CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_EVENTS;
}
+ public ICDIElement getCDIElement() {
+ return null;
+ }
+
+ public Set<? extends ICDIElement> getCDIElements() {
+ return events;
+ }
+
}
Added: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ITestableCDIHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ITestableCDIHyperlink.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ITestableCDIHyperlink.java 2011-06-03 00:33:59 UTC (rev 31793)
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * 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.tools.cdi.text.ext.hyperlink;
+
+import java.util.Set;
+
+import org.jboss.tools.cdi.core.ICDIElement;
+
+public interface ITestableCDIHyperlink {
+ public ICDIElement getCDIElement();
+ public Set<? extends ICDIElement> getCDIElements();
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ITestableCDIHyperlink.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java 2011-06-03 00:19:44 UTC (rev 31792)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java 2011-06-03 00:33:59 UTC (rev 31793)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.tools.cdi.text.ext.hyperlink;
+import java.util.Set;
+
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.ui.JavaUI;
@@ -18,15 +20,17 @@
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PartInitException;
import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.ICDIElement;
import org.jboss.tools.cdi.core.IDecorator;
import org.jboss.tools.cdi.core.IInterceptor;
import org.jboss.tools.cdi.core.IProducerField;
import org.jboss.tools.cdi.core.IProducerMethod;
+import org.jboss.tools.cdi.internal.core.impl.CDIElement;
import org.jboss.tools.cdi.text.ext.CDIExtensionsMessages;
import org.jboss.tools.cdi.text.ext.CDIExtensionsPlugin;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
-public class InjectedPointHyperlink extends AbstractHyperlink{
+public class InjectedPointHyperlink extends AbstractHyperlink implements ITestableCDIHyperlink{
protected IBean bean;
IRegion region;
boolean first = false;
@@ -115,4 +119,12 @@
}
}
+ public ICDIElement getCDIElement() {
+ return bean;
+ }
+
+ public Set<? extends ICDIElement> getCDIElements() {
+ return null;
+ }
+
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodHyperlink.java 2011-06-03 00:19:44 UTC (rev 31792)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodHyperlink.java 2011-06-03 00:33:59 UTC (rev 31793)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.tools.cdi.text.ext.hyperlink;
+import java.util.Set;
+
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.ui.JavaUI;
@@ -17,12 +19,13 @@
import org.eclipse.jface.text.IRegion;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PartInitException;
+import org.jboss.tools.cdi.core.ICDIElement;
import org.jboss.tools.cdi.core.IObserverMethod;
import org.jboss.tools.cdi.text.ext.CDIExtensionsMessages;
import org.jboss.tools.cdi.text.ext.CDIExtensionsPlugin;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
-public class ObserverMethodHyperlink extends AbstractHyperlink{
+public class ObserverMethodHyperlink extends AbstractHyperlink implements ITestableCDIHyperlink{
IObserverMethod observerMethod;
IRegion region;
@@ -64,4 +67,13 @@
return CDIExtensionsMessages.CDI_EVENT_HYPERLINK_OPEN_OBSERVER_METHOD+" "+observerMethod.getMethod().getElementName();
}
+
+ public ICDIElement getCDIElement() {
+ return observerMethod;
+ }
+
+ public Set<? extends ICDIElement> getCDIElements() {
+ return null;
+ }
+
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodListHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodListHyperlink.java 2011-06-03 00:19:44 UTC (rev 31792)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodListHyperlink.java 2011-06-03 00:33:59 UTC (rev 31793)
@@ -16,11 +16,12 @@
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.ITextViewer;
import org.eclipse.jface.text.hyperlink.IHyperlink;
+import org.jboss.tools.cdi.core.ICDIElement;
import org.jboss.tools.cdi.core.IObserverMethod;
import org.jboss.tools.cdi.text.ext.CDIExtensionsMessages;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
-public class ObserverMethodListHyperlink extends AbstractHyperlink{
+public class ObserverMethodListHyperlink extends AbstractHyperlink implements ITestableCDIHyperlink{
private ITextViewer viewer;
private Set<IObserverMethod> observerMethods;
private IRegion region;
@@ -62,4 +63,12 @@
return CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS;
}
+ public ICDIElement getCDIElement() {
+ return null;
+ }
+
+ public Set<? extends ICDIElement> getCDIElements() {
+ return observerMethods;
+ }
+
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF 2011-06-03 00:19:44 UTC (rev 31792)
+++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF 2011-06-03 00:33:59 UTC (rev 31793)
@@ -16,7 +16,9 @@
org.jboss.tools.cdi.core.test;bundle-version="1.0.0",
org.eclipse.jdt.core;bundle-version="3.5.0",
org.eclipse.wst.xml.ui,
- org.eclipse.jface;bundle-version="3.6.0"
+ org.eclipse.jface;bundle-version="3.6.0",
+ org.jboss.tools.cdi.core;bundle-version="1.2.0",
+ org.jboss.tools.common.el.core;bundle-version="3.3.0"
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor.0
Export-Package: org.jboss.tools.cdi.text.ext.test
Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/HyperlinkDetectorTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/HyperlinkDetectorTest.java 2011-06-03 00:19:44 UTC (rev 31792)
+++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/HyperlinkDetectorTest.java 2011-06-03 00:33:59 UTC (rev 31793)
@@ -28,7 +28,9 @@
import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
import org.eclipse.wst.sse.ui.StructuredTextEditor;
import org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorPart;
+import org.jboss.tools.cdi.core.ICDIElement;
import org.jboss.tools.cdi.core.test.tck.TCKTest;
+import org.jboss.tools.cdi.text.ext.hyperlink.ITestableCDIHyperlink;
import org.jboss.tools.common.editor.ObjectMultiPageEditor;
import org.jboss.tools.common.model.ui.editor.EditorPartWrapper;
import org.jboss.tools.common.text.ext.hyperlink.HyperlinkDetector;
@@ -319,6 +321,7 @@
public class TestHyperlink{
Class<? extends IHyperlink> hyperlink;
+ ICDIElement element = null;
String name;
public TestHyperlink(Class<? extends IHyperlink> hyperlink, String name){
@@ -326,7 +329,15 @@
this.name = name;
}
+ public TestHyperlink(Class<? extends IHyperlink> hyperlink, String name, ICDIElement element){
+ this(hyperlink, name);
+ this.element = element;
+ }
+
public boolean validateHyperlink(IHyperlink hyperlink){
+ if(hyperlink instanceof ITestableCDIHyperlink && element != null){
+ assertEquals(element, ((ITestableCDIHyperlink)hyperlink).getCDIElement());
+ }
return true;
}
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java 2011-06-03 00:19:44 UTC (rev 31792)
+++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java 2011-06-03 00:33:59 UTC (rev 31793)
@@ -1,8 +1,10 @@
package org.jboss.tools.cdi.text.ext.test;
import java.util.ArrayList;
+import java.util.Set;
import org.eclipse.core.resources.IFile;
+import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.text.ext.CDIExtensionsMessages;
import org.jboss.tools.cdi.text.ext.hyperlink.AlternativeInjectedPointListHyperlink;
import org.jboss.tools.cdi.text.ext.hyperlink.InjectedPointHyperlink;
@@ -14,25 +16,30 @@
public class InjectedPointHyperlinkDetectorTest extends HyperlinkDetectorTest {
public void testInjectedPointHyperlinkDetector() throws Exception {
+ Set<IBean> beans = cdiProject.getBeans("/tck/JavaSource/org/jboss/jsr299/tck/tests/lookup/injectionpoint/BasicLogger.java", true);
+ IBean bean=null;
+ for(IBean b : beans){
+ bean = b;
+ }
ArrayList<TestRegion> regionList = new ArrayList<TestRegion>();
regionList.add(new TestRegion(115, 6, new TestHyperlink[]{
- new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger"),
+ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean),
new TestHyperlink(AlternativeInjectedPointListHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ALTERNATIVES)
})); // Inject
regionList.add(new TestRegion(133, 6, new TestHyperlink[]{
- new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger"),
+ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean),
new TestHyperlink(AlternativeInjectedPointListHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ALTERNATIVES)
})); // Logger
regionList.add(new TestRegion(140, 6, new TestHyperlink[]{
- new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger"),
+ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean),
new TestHyperlink(AlternativeInjectedPointListHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ALTERNATIVES)
})); // logger
regionList.add(new TestRegion(196, 6, new TestHyperlink[]{
- new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger"),
+ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean),
new TestHyperlink(AlternativeInjectedPointListHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ALTERNATIVES)
})); // logger
regionList.add(new TestRegion(250, 6, new TestHyperlink[]{
- new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger"),
+ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean),
new TestHyperlink(AlternativeInjectedPointListHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ALTERNATIVES)
})); // logger
@@ -40,6 +47,11 @@
}
public void testInjectedProducerMethodParametersHyperlinkDetector() throws Exception {
+ Set<IBean> beans = cdiProject.getBeans("/tck/JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/CustomProducerImpl.java", true);
+ IBean bean=null;
+ for(IBean b : beans){
+ bean = b;
+ }
IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/CustomProducerImpl.java");
String text = FileUtil.readStream(file);
@@ -47,32 +59,42 @@
ArrayList<TestRegion> regionList = new ArrayList<TestRegion>();
regionList.add(new TestRegion(orderPosition, 15, new TestHyperlink[]{
- new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " CustomProducerImpl.produce()")
+ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " CustomProducerImpl.produce()", bean)
})); // order
checkRegions("JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/CustomProducerImpl.java", regionList, new InjectedPointHyperlinkDetector());
}
public void testInjectedConstructorParametersHyperlinkDetector() throws Exception {
+ Set<IBean> beans = cdiProject.getBeans("/tck/JavaSource/org/jboss/jsr299/tck/tests/context/dependent/Fox.java", true);
+ IBean bean=null;
+ for(IBean b : beans){
+ bean = b;
+ }
ArrayList<TestRegion> regionList = new ArrayList<TestRegion>();
- regionList.add(new TestRegion(880, 6, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox")}));
- regionList.add(new TestRegion(894, 3, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox")})); // Fox
- regionList.add(new TestRegion(898, 3, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox")}));
- regionList.add(new TestRegion(975, 3, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox")}));
- regionList.add(new TestRegion(979, 3, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox")}));
- regionList.add(new TestRegion(1017, 3, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox")}));
+ regionList.add(new TestRegion(880, 6, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)}));
+ regionList.add(new TestRegion(894, 3, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)})); // Fox
+ regionList.add(new TestRegion(898, 3, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)}));
+ regionList.add(new TestRegion(975, 3, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)}));
+ regionList.add(new TestRegion(979, 3, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)}));
+ regionList.add(new TestRegion(1017, 3, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)}));
checkRegions("JavaSource/org/jboss/jsr299/tck/tests/context/dependent/FoxFarm.java", regionList, new InjectedPointHyperlinkDetector());
}
public void testInjectedInitializerParametersHyperlinkDetector() throws Exception {
+ Set<IBean> beans = cdiProject.getBeans("/tck/JavaSource/org/jboss/jsr299/tck/tests/context/dependent/Fox.java", true);
+ IBean bean=null;
+ for(IBean b : beans){
+ bean = b;
+ }
ArrayList<TestRegion> regionList = new ArrayList<TestRegion>();
- regionList.add(new TestRegion(880, 6, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox")}));
- regionList.add(new TestRegion(894, 3, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox")})); // Fox
- regionList.add(new TestRegion(898, 3, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox")}));
- regionList.add(new TestRegion(972, 3, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox")}));
- regionList.add(new TestRegion(976, 3, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox")}));
- regionList.add(new TestRegion(1014, 3, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox")}));
+ regionList.add(new TestRegion(880, 6, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)}));
+ regionList.add(new TestRegion(894, 3, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)})); // Fox
+ regionList.add(new TestRegion(898, 3, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)}));
+ regionList.add(new TestRegion(972, 3, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)}));
+ regionList.add(new TestRegion(976, 3, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)}));
+ regionList.add(new TestRegion(1014, 3, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)}));
checkRegions("JavaSource/org/jboss/jsr299/tck/tests/context/dependent/FoxHole.java", regionList, new InjectedPointHyperlinkDetector());
}
13 years, 3 months
- 1
- 0