JBoss Tools SVN: r31862 - trunk/bpel/docs/reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-06-07 00:01:16 -0400 (Tue, 07 Jun 2011)
New Revision: 31862
Modified:
trunk/bpel/docs/reference/en-US/troubleshooting.xml
Log:
corrected column widths
Modified: trunk/bpel/docs/reference/en-US/troubleshooting.xml
===================================================================
--- trunk/bpel/docs/reference/en-US/troubleshooting.xml 2011-06-07 03:49:19 UTC (rev 31861)
+++ trunk/bpel/docs/reference/en-US/troubleshooting.xml 2011-06-07 04:01:16 UTC (rev 31862)
@@ -15,7 +15,7 @@
<table>
<title>Error messages</title>
<tgroup cols='2'>
- <colspec colname='c1'/>
+ <colspec colname='c1' colwidth='4*'/>
<colspec colname='c2'/>
<thead>
<row>
@@ -58,8 +58,8 @@
<title>Warning messages</title>
<table>
<title>Error messages</title>
- <tgroup cols='2' align='left' colsep='1' rowsep='1'>
- <colspec colname='c1'/>
+ <tgroup cols='2'>
+ <colspec colname='c1' colwidth='4*'/>
<colspec colname='c2'/>
<thead>
<row>
@@ -82,8 +82,8 @@
<title>Information messages</title>
<table>
<title>Error messages</title>
- <tgroup cols='2' align='left' colsep='1' rowsep='1'>
- <colspec colname='c1'/>
+ <tgroup cols='2'>
+ <colspec colname='c1' colwidth='4*'/>
<colspec colname='c2'/>
<thead>
<row>
14 years, 10 months
JBoss Tools SVN: r31860 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-06-06 23:20:51 -0400 (Mon, 06 Jun 2011)
New Revision: 31860
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/DeployOnlyRSEPrefComposite.java
Log:
JBIDE-9073
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/DeployOnlyRSEPrefComposite.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/DeployOnlyRSEPrefComposite.java 2011-06-07 03:16:09 UTC (rev 31859)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/DeployOnlyRSEPrefComposite.java 2011-06-07 03:20:51 UTC (rev 31860)
@@ -129,7 +129,6 @@
public void execute() {
callback.getServer().setAttribute(
IDeployableServer.DEPLOY_DIRECTORY, newDir);
- updateDeployOnlyWidgets();
}
public void undo() {
@@ -162,6 +161,7 @@
public void undo() {
callback.getServer().setAttribute(
IDeployableServer.TEMP_DEPLOY_DIRECTORY, oldDir);
+ updateDeployOnlyWidgets();
}
}
}
14 years, 10 months
JBoss Tools SVN: r31859 - trunk/bpel/docs/reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-06-06 23:16:09 -0400 (Mon, 06 Jun 2011)
New Revision: 31859
Modified:
trunk/bpel/docs/reference/en-US/troubleshooting.xml
Log:
updated
Modified: trunk/bpel/docs/reference/en-US/troubleshooting.xml
===================================================================
--- trunk/bpel/docs/reference/en-US/troubleshooting.xml 2011-06-07 03:06:57 UTC (rev 31858)
+++ trunk/bpel/docs/reference/en-US/troubleshooting.xml 2011-06-07 03:16:09 UTC (rev 31859)
@@ -7,4 +7,77 @@
<para>
Refer to the OASIS documentation linked in the SA column for a detailed explanation of the BPEL requirement, and for possible resolutions for the error.
</para>
+ <para>
+ The substitution parameters (for example: {0} and {1}) are placeholders for the BPEL element, attribute or value identified by the Validator.
+ </para>
+ <section>
+ <title>Error messages</title>
+ <table>
+ <title>Error messages</title>
+ <tgroup cols='2' align='left' colsep='1' rowsep='1'>
+ <colspec colname='c1'/>
+ <colspec colname='c2'/>
+ <thead>
+ <row>
+ <entry>Message text</entry>
+ <entry>SA</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry></entry>
+ <entry></entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </section>
+ <section>
+ <title>Warning messages</title>
+ <table>
+ <title>Error messages</title>
+ <tgroup cols='2' align='left' colsep='1' rowsep='1'>
+ <colspec colname='c1'/>
+ <colspec colname='c2'/>
+ <thead>
+ <row>
+ <entry>Message text</entry>
+ <entry>SA</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ </entry>
+ <entry>
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </section>
+ <section>
+ <title>Information messages</title>
+ <table>
+ <title>Error messages</title>
+ <tgroup cols='2' align='left' colsep='1' rowsep='1'>
+ <colspec colname='c1'/>
+ <colspec colname='c2'/>
+ <thead>
+ <row>
+ <entry>Message text</entry>
+ <entry>SA</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ </entry>
+ <entry>
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </section>
</chapter>
14 years, 10 months
JBoss Tools SVN: r31858 - trunk/bpel/docs/reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-06-06 23:06:57 -0400 (Mon, 06 Jun 2011)
New Revision: 31858
Added:
trunk/bpel/docs/reference/en-US/troubleshooting.xml
Modified:
trunk/bpel/docs/reference/en-US/JBoss_BPEL_User_Guide.xml
trunk/bpel/docs/reference/en-US/master.xml
trunk/bpel/docs/reference/en-US/reference.xml
trunk/bpel/docs/reference/en-US/tasks.xml
Log:
adding in troubleshooting chapter
Modified: trunk/bpel/docs/reference/en-US/JBoss_BPEL_User_Guide.xml
===================================================================
--- trunk/bpel/docs/reference/en-US/JBoss_BPEL_User_Guide.xml 2011-06-07 02:51:23 UTC (rev 31857)
+++ trunk/bpel/docs/reference/en-US/JBoss_BPEL_User_Guide.xml 2011-06-07 03:06:57 UTC (rev 31858)
@@ -11,6 +11,7 @@
<!--<xi:include href="detail.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> -->
<!--<xi:include href=deploy.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> -->
<xi:include href="reference.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+ <xi:include href="troubleshooting.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
<xi:include href="summary.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
<xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
</book>
Modified: trunk/bpel/docs/reference/en-US/master.xml
===================================================================
--- trunk/bpel/docs/reference/en-US/master.xml 2011-06-07 02:51:23 UTC (rev 31857)
+++ trunk/bpel/docs/reference/en-US/master.xml 2011-06-07 03:06:57 UTC (rev 31858)
@@ -8,6 +8,7 @@
<!ENTITY summary SYSTEM "summary.xml">
<!ENTITY tasks SYSTEM "tasks.xml">
<!ENTITY install SYSTEM "install.xml">
+ <!ENTITY troubleshooting SYSTEM "troubleshooting.xml">
]>
<book>
<bookinfo>
@@ -51,5 +52,5 @@
</abstract> -->
</bookinfo>
<toc/>
- &overview;&install;&tasks;&reference;&summary;
+ &overview;&install;&tasks;&reference;&troubleshooting;&summary;
<!--&overview;&install;&tasks;&detail;&deploy;&reference;&summary;--></book>
Modified: trunk/bpel/docs/reference/en-US/reference.xml
===================================================================
--- trunk/bpel/docs/reference/en-US/reference.xml 2011-06-07 02:51:23 UTC (rev 31857)
+++ trunk/bpel/docs/reference/en-US/reference.xml 2011-06-07 03:06:57 UTC (rev 31858)
@@ -1563,57 +1563,6 @@
</para>
</section>
</section>
- <section>
- <title>Correlation Sets</title>
- <para>
- Correlation sets are used to identify ongoing conversations between a client and the BPEL process. Typically, a correlation is an element in a message that uniquely identifies the conversation between client and service; for example, an Order ID or Social Security Number. This also identifies a specific process instance being managed by the BPEL engine.
- </para>
- <para>
- In many cases a single element of a message is not enough to make it unique, so correlations can be defined as composites of several fields. Since a conversation can involve many different types of messages. Different correlations will need to be defined for each message type.
- </para>
- <para>
- To create a correlation for a messaging activity (for example: <property>Invoke</property>, <property>Receive</property>, <property>Reply</property>), select the activity and then click <guibutton>Add</guibutton> on the <guilabel>Correlation Detail</guilabel> property tab. This will display the <guilabel>Select a Property</guilabel> dialog.
- </para>
- <figure>
- <title>Select a Property</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/reference/Handlers_07.png"/>
- </imageobject>
- </mediaobject>
- </figure>
- <para>
- You canselect an existing property defined in the WSDL or click <guibutton>New</guibutton> to create a new WSDL property, which will display the <guilabel>Create Message Property</guilabel> dialog.
- </para>
- <figure>
- <title>Create Message Property</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/reference/Handlers_08.png"/>
- </imageobject>
- </mediaobject>
- </figure>
- <para>
- Enter a name for the new WSDL property and its type. Either an XSD simple type or an XML Schema element.
- </para>
- <para>
- Next, click the <guibutton>Browse”</guibutton> button to select a type. This will display the <guilabel>Type Selection</guilabel> dialog.
- </para>
- <para>
- Click <guilabel>New</guilabel> in the <guilabel>Aliases</guilabel> section to create a new WSDL property alias.
- </para>
- <figure>
- <title>Create Property Alias</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/reference/Handlers_09.png"/>
- </imageobject>
- </mediaobject>
- </figure>
- <para>
- Select either the <guilabel>Message Type</guilabel>, XSD <guilabel>Simple Type</guilabel> or XML scheme <guilabel>Element</guilabel> radio button and click <guibutton>Browse</guibutton> to select its type. Then click <guibutton>OK</guibutton>.
- </para>
- </section>
</section>
<section>
<title>BPEL Deployment Descriptor editor</title>
Modified: trunk/bpel/docs/reference/en-US/tasks.xml
===================================================================
--- trunk/bpel/docs/reference/en-US/tasks.xml 2011-06-07 02:51:23 UTC (rev 31857)
+++ trunk/bpel/docs/reference/en-US/tasks.xml 2011-06-07 03:06:57 UTC (rev 31858)
@@ -531,4 +531,55 @@
</para>
</section>
</section>
+ <section>
+ <title>Creating correlation sets</title>
+ <para>
+ Correlation sets are used to identify ongoing conversations between a client and the BPEL process. Typically, a correlation is an element in a message that uniquely identifies the conversation between client and service; for example, an Order ID or Social Security Number. This also identifies a specific process instance being managed by the BPEL engine.
+ </para>
+ <para>
+ In many cases a single element of a message is not enough to make it unique, so correlations can be defined as composites of several fields. Since a conversation can involve many different types of messages. Different correlations will need to be defined for each message type.
+ </para>
+ <para>
+ To create a correlation for a messaging activity (for example: <property>Invoke</property>, <property>Receive</property>, <property>Reply</property>), select the activity and then click <guibutton>Add</guibutton> on the <guilabel>Correlation Detail</guilabel> property tab. This will display the <guilabel>Select a Property</guilabel> dialog.
+ </para>
+ <figure>
+ <title>Select a Property</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Handlers_07.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ You canselect an existing property defined in the WSDL or click <guibutton>New</guibutton> to create a new WSDL property, which will display the <guilabel>Create Message Property</guilabel> dialog.
+ </para>
+ <figure>
+ <title>Create Message Property</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Handlers_08.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ Enter a name for the new WSDL property and its type. Either an XSD simple type or an XML Schema element.
+ </para>
+ <para>
+ Next, click the <guibutton>Browse”</guibutton> button to select a type. This will display the <guilabel>Type Selection</guilabel> dialog.
+ </para>
+ <para>
+ Click <guilabel>New</guilabel> in the <guilabel>Aliases</guilabel> section to create a new WSDL property alias.
+ </para>
+ <figure>
+ <title>Create Property Alias</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Handlers_09.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ Select either the <guilabel>Message Type</guilabel>, XSD <guilabel>Simple Type</guilabel> or XML scheme <guilabel>Element</guilabel> radio button and click <guibutton>Browse</guibutton> to select its type. Then click <guibutton>OK</guibutton>.
+ </para>
+ </section>
</chapter>
Added: trunk/bpel/docs/reference/en-US/troubleshooting.xml
===================================================================
--- trunk/bpel/docs/reference/en-US/troubleshooting.xml (rev 0)
+++ trunk/bpel/docs/reference/en-US/troubleshooting.xml 2011-06-07 03:06:57 UTC (rev 31858)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<chapter id="troubleshooting">
+ <title>Troubleshooting</title>
+ <para>
+ This section lists all of the messages generated by the BPEL Validator. The SA (Static Analysis) column contains hyperlinks to the OASIS WS-BPEL 2.0 specification entry for each validation rule to which the message applies. It is possible that one message is applicable to more than one BPEL element or attribute, therefore all of the SA rules that are relevant are listed for each message.
+ </para>
+ <para>
+ Refer to the OASIS documentation linked in the SA column for a detailed explanation of the BPEL requirement, and for possible resolutions for the error.
+ </para>
+</chapter>
Property changes on: trunk/bpel/docs/reference/en-US/troubleshooting.xml
___________________________________________________________________
Added: svn:executable
+ *
14 years, 10 months
JBoss Tools SVN: r31857 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal: v7 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-06-06 22:51:23 -0400 (Mon, 06 Jun 2011)
New Revision: 31857
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java
Log:
JBIDE-9074 - to trunk for checking initial startup state and not starting a second time if server is already up.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-06-07 02:43:07 UTC (rev 31856)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-06-07 02:51:23 UTC (rev 31857)
@@ -38,6 +38,7 @@
import org.eclipse.wst.server.core.ServerCore;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.Messages;
+import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.AbstractLocalJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
@@ -304,6 +305,13 @@
JBossServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration);
if (!jbsBehavior.canStart(mode).isOK())
throw new CoreException(jbsBehavior.canStart(mode));
+ boolean started = WebPortPoller.onePing(jbsBehavior.getServer());
+ if( started ) {
+ jbsBehavior.setServerStarting();
+ jbsBehavior.setServerStarted();
+ return false;
+ }
+
return true;
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java 2011-06-07 02:43:07 UTC (rev 31856)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java 2011-06-07 02:51:23 UTC (rev 31857)
@@ -16,6 +16,7 @@
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.model.ILaunchConfigurationDelegate;
import org.eclipse.debug.core.model.IProcess;
+import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration;
import org.jboss.ide.eclipse.as.core.util.JBossServerBehaviorUtils;
@@ -32,6 +33,13 @@
public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor)
throws CoreException {
+ JBossServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration);
+ boolean started = WebPortPoller.onePing(jbsBehavior.getServer());
+ if( started ) {
+ jbsBehavior.setServerStarting();
+ jbsBehavior.setServerStarted();
+ return false;
+ }
return true;
}
14 years, 10 months
JBoss Tools SVN: r31856 - 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-06 22:43:07 -0400 (Mon, 06 Jun 2011)
New Revision: 31856
Added:
trunk/bpel/docs/reference/en-US/images/reference/Context_menu_01.png
trunk/bpel/docs/reference/en-US/images/reference/Context_menu_02.png
trunk/bpel/docs/reference/en-US/images/reference/Deployment_descriptor_editor_01.png
trunk/bpel/docs/reference/en-US/images/reference/Dialog_cheet_sheet_01.png
trunk/bpel/docs/reference/en-US/images/reference/Dialog_cheet_sheet_02.png
trunk/bpel/docs/reference/en-US/images/reference/Dialog_quick_pick_01.png
trunk/bpel/docs/reference/en-US/images/reference/Dialog_type_selection_01.png
trunk/bpel/docs/reference/en-US/images/reference/Dialog_wsdl_creation_01.png
trunk/bpel/docs/reference/en-US/images/reference/Dialog_wsdl_creation_02.png
trunk/bpel/docs/reference/en-US/images/reference/Dialog_wsdl_selection_01.png
trunk/bpel/docs/reference/en-US/images/reference/Editor_preferences_01.png
trunk/bpel/docs/reference/en-US/images/reference/Editor_preferences_02.png
trunk/bpel/docs/reference/en-US/images/reference/WSIL_browser_preferences_01.png
trunk/bpel/docs/reference/en-US/images/reference/XPath_expression_editor_01.png
trunk/bpel/docs/reference/en-US/images/reference/XPath_expression_editor_02.png
Modified:
trunk/bpel/docs/reference/en-US/reference.xml
Log:
updated with final content for reference section
Added: trunk/bpel/docs/reference/en-US/images/reference/Context_menu_01.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/Context_menu_01.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/Context_menu_02.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/Context_menu_02.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/Deployment_descriptor_editor_01.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/Deployment_descriptor_editor_01.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/Dialog_cheet_sheet_01.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/Dialog_cheet_sheet_01.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/Dialog_cheet_sheet_02.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/Dialog_cheet_sheet_02.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/Dialog_quick_pick_01.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/Dialog_quick_pick_01.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/Dialog_type_selection_01.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/Dialog_type_selection_01.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/Dialog_wsdl_creation_01.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/Dialog_wsdl_creation_01.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/Dialog_wsdl_creation_02.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/Dialog_wsdl_creation_02.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/Dialog_wsdl_selection_01.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/Dialog_wsdl_selection_01.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/Editor_preferences_01.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/Editor_preferences_01.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/Editor_preferences_02.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/Editor_preferences_02.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/WSIL_browser_preferences_01.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/WSIL_browser_preferences_01.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/XPath_expression_editor_01.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/XPath_expression_editor_01.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/XPath_expression_editor_02.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/XPath_expression_editor_02.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-07 01:07:04 UTC (rev 31855)
+++ trunk/bpel/docs/reference/en-US/reference.xml 2011-06-07 02:43:07 UTC (rev 31856)
@@ -219,7 +219,7 @@
</listitem>
</itemizedlist>
</section>
- <section>
+ <section id="Reference-Wizard-Deployment_Descriptor">
<title>New BPEL Deployment Descriptor</title>
<para>
Use this wizard to create a <filename>Deployment Descriptor</filename> file. This file is a manifest for the web service and is required if the BPEL process is to be deployed to a runtime engine.
@@ -1615,6 +1615,359 @@
</para>
</section>
</section>
+ <section>
+ <title>BPEL Deployment Descriptor editor</title>
+ <para>
+ Before a BPEL project can be deployed to the runtime engine, you must create what is called a <emphasis>deployment descriptor</emphasis>. This is simply a manifest file, serialized as XML, that describes all of the BPEL processes and their interfaces to the BPEL engine. The <emphasis>deployment descriptor</emphasis> file must be created in the root folder of your project. See <xref linkend="Reference-Wizard-Deployment_Descriptor" /> more information.
+ </para>
+ <para>
+ The <emphasis>deployment descriptor</emphasis> editor traverses the folder hierarchy in your project and searches for all BPEL files. Each process is then represented in a separate tab in the editor. The figure below shows two processes (HelloWorld and GoodbyeWorld). Each process must be configured before the project can be deployed.
+ </para>
+ <figure>
+ <title>Deployment descriptor editor example</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Deployment_descriptor_editor_01.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <orderedlist>
+ <listitem>
+ <para>
+ Process selection tabs: Click on these tabs to display the configuration page for each process.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Initial process state: The process can be deployed in either an <emphasis>active</emphasis>, <emphasis>inactive</emphasis> or <emphasis>retired</emphasis> state.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Inbound interfaces selection: Select the WSDL port type that clients will use to invoke this service.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Output interfaces selection: Each invoked service (if any) will require you to select its port type.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Process-level monitoring events: Allow you to select which events are generated by the BPEL engine. This is currently unused but will be used in future for debugging the process.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Scope-level monitoring events: The BPEL engine can be configured to generate monitoring events for each Scope defined in the process.
+ </para>
+ </listitem>
+ </orderedlist>
+ <para>
+ The only action required to configure a processes is to select the interfaces for inbound and outbound services used by the process; all other settings are optional.
+ </para>
+ </section>
</section>
+ <section>
+ <title>Preference pages</title>
+ <para>
+ Certain aspects of the BPEL Designers behavior can be customized to suit your personal preference.
+ </para>
+ <section>
+ <title>Editor</title>
+ <figure>
+ <title>Editor preferences</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Editor_preferences_01.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ The editor behavior can be customized on this page.
+ </para>
+ </section>
+ <section>
+ <title>Expression editors</title>
+ <figure>
+ <title>Expression editor preferences</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Editor_preferences_02.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ This preference page is used to configure the XPath expression editor templates and is similar to other Eclipse editor template preference pages.
+ </para>
+ </section>
+ <section>
+ <title>WSIL browser</title>
+ <figure>
+ <title>WSIL browser preferences</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/WSIL_browser_preferences_01.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ This preference page is used to configure a Web Services Inspection Language (WSIL) file. The file can contain references to WSDL files for external services as well as references to other WSIL files, either locally or on the web. This file is used to search for WSDLs when defining partner links in a process. <!-- See the Type Selection Dialog for more information. Also see the Eclipse Help documentation for generating a WSIL file. -->
+ </para>
+ </section>
+ </section>
+ <section>
+ <title>Dialogs</title>
+ <section>
+ <title>XPath expression editor (embedded control)</title>
+ <para>
+ The XPath expression editor provides context-sensitive assistance in the form of pop-up proposals. The light bulb icon <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/XPath_expression_editor_01.png"/>
+ </imageobject>
+ </inlinemediaobject> indicates that content assist is available by pressing the <keycap>CTRL</keycap> and <keycap>SPACE</keycap> keys simultaneously. The editor will display appropriate help information based on what it knows about variables currently in-scope for the selected activity. An example is seen in the figure below:
+ </para>
+ <figure>
+ <title>Expression editor assistance example</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/XPath_expression_editor_02.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <note>
+ <para>
+ The BPEL 2.0 specification provides for the definition of an XPath language version at the process level, as well as the activity level (for those activities that make use of XPath). However, only XPath 1.0 is supported by the BPEL Designer and the JBoss Riftsaw runtime engine at this time.
+ </para>
+ </note>
+ </section>
+ <section>
+ <title>Quick pick (embedded control)</title>
+ <figure>
+ <title>Quick pick</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Dialog_quick_pick_01.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ Tree control is used in many proeprty pages for selecting message parts, partner links and operations.
+ </para>
+ </section>
+ <section>
+ <title>Type selection</title>
+ <para>
+ This dialog is displayed whenever the BPEL Designer requires you to select a message, message part, XML Schema type or XML element. Refer to the figure below for an explanation of each of the components of this dialog:
+ </para>
+ <figure>
+ <title>Type selection</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Dialog_type_selection_01.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <orderedlist>
+ <listitem>
+ <para>
+ <guilabel>Type Name</guilabel>: Used to limit the items displayed in the <guilabel>Matches</guilabel> (4) list. Only items that begin with the text in this filter will be displayed.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <guilabel>Show XSD Types</guilabel>: Can be used to limit where the editor will search for XSD files.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <guilabel>Filter</guilabel>: Further reduces the number of matches according to types.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <guilabel>Matches</guilabel>: Displays the items matching the selected filters. Selecting an item in this list will update the <guilabel>Type Structure</guilabel> (5) tree view.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <guilabel>Type Structure</guilabel>: Displays the structure of the item selected in the <guilabel>Matches</guilabel> (4) list. Depending on the type of item requested, you may need to select an item from this tree control as well; the <guibutton>OK</guibutton> button being enabled is an indicated of a selection being required here.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <guibutton>Add Schema</guibutton>: If the required XML Schema has not been resolved, you can add it to the process’ imports by clicking this button.
+ </para>
+ </listitem>
+ </orderedlist>
+ </section>
+ <section id="Reference-Dialog-WSDL_Selection">
+ <title>Select WSDL property</title>
+ <para>
+ This dialog allows you to select an existing WSDL property or create a new one.
+ </para>
+ <figure>
+ <title>Select a WSDL property</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Dialog_wsdl_selection_01.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <orderedlist>
+ <listitem>
+ <para>
+ <guilabel>Property Name</guilabel>: Used to limit the items displayed in the <guilabel>Matches</guilabel> (3) list. Only those items that begin with the text in this filter will be displayed.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <guibutton>New</guibutton>: Click this button to create a new WSDL property.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <guilabel>Matches</guilabel>: Displays the items that match the <guilabel> Property Name</guilabel> (1), or all items if the filter is blank.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <guilabel>Property Type</guilabel>: Displays the type of an item selected in the <guilabel>Matches</guilabel> (3) list.
+ </para>
+ </listitem>
+ </orderedlist>
+ </section>
+ <section>
+ <title>Create WSDL property</title>
+ <para>
+ This dialog is used to create a new WSDL property and is displayed when you click the <guibutton>New</guibutton> button in <xref linkend="Reference-Dialog-WSDL_Selection" /> dialog.
+ </para>
+ <figure>
+ <title>Create a WSDL property</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Dialog_wsdl_creation_01.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <orderedlist>
+ <listitem>
+ <para>
+ <guilabel>Name</guilabel>: Enter the name for the new property.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <guibutton>Defined As</guibutton>: Select how the property type will be defined.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <guilabel>Browse</guilabel>: Click this button to select the property type.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <guilabel>New</guilabel>: Click this button to create a new property alias.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <guilabel>Aliases</guilabel>: This list displays all property aliases defined for the property.
+ </para>
+ </listitem>
+ </orderedlist>
+ </section>
+ <section>
+ <title>Create WSDL property alias</title>
+ <para>
+ This dialog allows you to create a WSDL property alias for a selected property.
+ </para>
+ <figure>
+ <title>Create a WSDL property alias</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Dialog_wsdl_creation_02.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <orderedlist>
+ <listitem>
+ <para>
+ <guilabel>Defined As</guilabel>: Select how the property alias type will be defined.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <guibutton>Browse</guibutton>: Click this button to select the property alias type.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <guilabel>Query</guilabel>: This editor allows you to use the XPath Expression Editor to define a query for the property alias.
+ </para>
+ </listitem>
+ </orderedlist>
+ </section>
+ <section>
+ <title>Cheat sheets</title>
+ <para>
+ Cheat sheets are part of the Eclipse <guilabel>Help</guilabel> framework, which provide interactive, step-by-step tutorials for plug-in tools. The BPEL Designer cheat sheet can be accessed by following <menuchoice><guimenuitem>Help</guimenuitem><guimenuitem>Cheat Sheets</guimenuitem></menuchoice>. You will then see the following screen:
+ </para>
+ <figure>
+ <title>Cheat sheet menu selection</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Dialog_cheet_sheet_01.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ The cheat sheet will open in a separate view as show below. Click on the <guibutton>Click to begin</guibutton> link to begin.
+ </para>
+ <figure>
+ <title>Cheat sheet menu</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Dialog_cheet_sheet_02.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </section>
+ </section>
+ <section>
+ <title>Icons, buttons and menus</title>
+ <para>
+ The BPEL Designer does not contribute any toolbar buttons, or main menu actions.
+ </para>
+ <section>
+ <title>Context menu</title>
+ <para>
+ The context menu is activated when the right mouse button is clicked while the mouse is over an activity figure on the drawing canvas.
+ </para>
+ <figure>
+ <title>Cheat sheet menu</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Context_menu_01.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ The <guibutton>Add</guibutton> and <guibutton>Insert Before</guibutton> sub-menus contain the same actions. The sub-menu is displayed in the figure below:
+ </para>
+ <figure>
+ <title>Cheat sheet menu</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/Context_menu_02.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ The items within the <guibutton>Add</guibutton> sub-menu appends the activity after the currently selected one, while those within the <guibutton>Insert Before</guibutton> sub-menu insert the new activity before the current one.
+ </para>
+ </section>
+ </section>
</chapter>
14 years, 10 months
JBoss Tools SVN: r31855 - trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-06 21:07:04 -0400 (Mon, 06 Jun 2011)
New Revision: 31855
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java
Log:
JBIDE-9066
https://issues.jboss.org/browse/JBIDE-9066
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java 2011-06-07 00:09:15 UTC (rev 31854)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java 2011-06-07 01:07:04 UTC (rev 31855)
@@ -10,163 +10,16 @@
******************************************************************************/
package org.jboss.tools.vpe.ui.test;
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
+import org.jboss.tools.test.util.JobUtils;
-import junit.framework.Assert;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils;
-import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
-import org.jboss.tools.vpe.editor.VpeController;
-import org.jboss.tools.vpe.editor.VpeEditorPart;
-import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor;
-import org.mozilla.interfaces.nsIDOMDocument;
-import org.mozilla.interfaces.nsIDOMElement;
-import org.mozilla.interfaces.nsIDOMNode;
-import org.mozilla.interfaces.nsIDOMNodeList;
-import org.mozilla.xpcom.XPCOMException;
-import org.w3c.dom.Node;
-
/**
* Class for importing project from jar file.
*
* @author sdzmitrovich
*/
-public class TestUtil {
+public class TestUtil extends org.jboss.tools.vpe.base.test.TestUtil {
- /** The Constant COMPONENTS_PATH. */
- public static final String COMPONENTS_PATH = "WebContent/pages/"; //$NON-NLS-1$
-
- /** The Constant WEBCONTENT_PATH. */
- private static final String WEBCONTENT_PATH = "WebContent"; //$NON-NLS-1$
-
- /** Editor in which we open visual page. */
- protected final static String EDITOR_ID = "org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"; //$NON-NLS-1$
-
- /** The Constant MAX_IDLE. */
- public static final long MAX_IDLE = 15*1000L;
-
/**
- * Gets the component path.
- *
- * @param componentPage the component page
- * @param projectName the project name
- *
- * @return the component path
- *
- * @throws CoreException the core exception
- * @throws IOException
- */
- public static IResource getComponentPath(String componentPage,
- String projectName) throws CoreException, IOException {
- IProject project = ProjectsLoader.getInstance().getProject(projectName);
- if (project != null) {
- return project.getFolder(COMPONENTS_PATH).findMember(componentPage);
- }
- return null;
- }
-
- /**
- * Gets the component path.
- *
- * @param componentPage the component page
- * @param projectName the project name
- *
- * @return the component path
- *
- * @throws CoreException the core exception
- * @throws IOException
- */
- public static IResource getComponentFileByFullPath(String componentPage,
- String projectName) throws CoreException, IOException {
- IProject project = ProjectsLoader.getInstance().getProject(projectName);
- if (project != null) {
- return project.findMember(componentPage);
- }
- return null;
- }
-
-
-
- public static IResource getResource(String path,
- String projectName) throws CoreException, IOException {
- IProject project = ProjectsLoader.getInstance().getProject(projectName);
- if (project != null) {
- return project.findMember(path);
- }
-
- return null;
- }
-
- /**
- * Gets the web content path.
- *
- * @param componentPage the component page
- * @param projectName the project name
- *
- * @return the web content path
- *
- * @throws CoreException the core exception
- * @throws IOException
- */
- public static IResource getWebContentPath(String componentPage,
- String projectName) throws CoreException, IOException {
- IProject project = ProjectsLoader.getInstance().getProject(projectName);
- if (project != null) {
- return project.getFolder(WEBCONTENT_PATH).findMember(componentPage);
- }
-
- return null;
- }
-
-
- /**
- * @param xmlScheme
- * @param xmlSchemesRoot
- * @return
- */
- public static File getXmlTestFile(String xmlTestPath, String xmlTestsRoot) {
- return new File(xmlTestsRoot + File.separator + xmlTestPath);
- }
-
- /**
- * Process UI input but do not return for the specified time interval.
- *
- * @param waitTimeMillis the number of milliseconds
- */
- public static void delay(long waitTimeMillis) {
- Display display = Display.getCurrent();
- if (display != null) {
- long endTimeMillis = System.currentTimeMillis() + waitTimeMillis;
- while (System.currentTimeMillis() < endTimeMillis) {
- if (!display.readAndDispatch())
- display.sleep();
- }
- display.update();
- }
- // Otherwise, perform a simple sleep.
- else {
- try {
- Thread.sleep(waitTimeMillis);
- } catch (InterruptedException e) {
- // Ignored.
- }
- }
- }
-
- /**
* Wait until all background tasks are complete.
*/
public static void waitForJobs() {
@@ -183,216 +36,11 @@
* Wait for idle.
*/
public static void waitForIdle(long maxIdle) {
- long start = System.currentTimeMillis();
- while (!Job.getJobManager().isIdle()) {
- delay(500);
- if ( (System.currentTimeMillis()-start) > maxIdle ) {
- Job[] jobs = Job.getJobManager().find(null);
- StringBuffer jobsList = new StringBuffer("A long running task detected\n");
-
- for (Job job : jobs) {
- jobsList.append(job.getName()).append("\n");
- }
- throw new RuntimeException(jobsList.toString()); //$NON-NLS-1$
- }
- }
+ JobUtils.waitForIdle(500, maxIdle);
}
public static void waitForIdle() {
waitForIdle(MAX_IDLE);
}
- /**
- * find elements by name.
- *
- * @param node -
- * current node
- * @param name -
- * name element
- * @param elements -
- * list of found elements
- */
- static public void findElementsByName(nsIDOMNode node,
- List<nsIDOMNode> elements, String name) {
- /*
- * Get children
- */
- nsIDOMNodeList children = node.getChildNodes();
- for (int i = 0; i < children.getLength(); i++) {
- nsIDOMNode child = children.item(i);
- /*
- * if current child is required then add it to list
- */
- if (name.equalsIgnoreCase((child.getNodeName()))) {
- elements.add(child);
- } else {
- findElementsByName(child, elements, name);
- }
- }
-
- }
-
- /**
- * find all elements by name.
- *
- * @param node -
- * current node
- * @param name -
- * name element
- * @param elements -
- * list of found elements
- */
- static public void findAllElementsByName(nsIDOMNode node,
- List<nsIDOMNode> elements, String name) {
- try {
- nsIDOMNodeList list = node.getChildNodes();
- if (node.getNodeName().equalsIgnoreCase(name)) {
- elements.add(node);
- }
- for (int i = 0; i < list.getLength(); i++) {
- findAllElementsByName(list.item(i), elements, name);
- }
- } catch (XPCOMException e) {
- // Ignore
- return;
- }
- }
-
- /**
- * Utility function which returns node mapping by source position(line and position in line).
- *
- * @param linePosition the line position
- * @param lineIndex the line index
- * @param itextViewer the itext viewer
- *
- * @return node for specified src position
- */
- @SuppressWarnings("restriction")
- public static Node getNodeMappingBySourcePosition(ITextViewer itextViewer, int lineIndex, int linePosition) {
- int offset = getLinePositionOffcet(itextViewer, lineIndex, linePosition);
- IndexedRegion treeNode = ContentAssistUtils.getNodeAt(itextViewer, offset);
- return (Node) treeNode;
- }
-
- /**
- * Utility function which is used to calculate offcet in document by line number and character position.
- *
- * @param linePosition the line position
- * @param textViewer the text viewer
- * @param lineIndex the line index
- *
- * @return offcet in document
- *
- * @throws IllegalArgumentException */
- public static final int getLinePositionOffcet(ITextViewer textViewer, int lineIndex, int linePosition) {
-
- int resultOffcet = 0;
-
- if(textViewer==null) {
-
- throw new IllegalArgumentException("Text viewer shouldn't be a null"); //$NON-NLS-1$
- }
- //lineIndex-1 becose calculating of line begibns in eclipse from one, but should be form zero
- resultOffcet=textViewer.getTextWidget().getOffsetAtLine(lineIndex-1);
- //here we get's tabs length
- //for more example you can see code org.eclipse.ui.texteditor.AbstractTextEditor@getCursorPosition() and class $PositionLabelValue
- int tabWidth = textViewer.getTextWidget().getTabs();
- int characterOffset=0;
- String currentString = textViewer.getTextWidget().getLine(lineIndex-1);
- int pos=1;
- for (int i= 0; (i < currentString.length())&&(pos<linePosition); i++) {
- if ('\t' == currentString.charAt(i)) {
-
- characterOffset += (tabWidth == 0 ? 0 : 1);
- pos+=tabWidth;
- }else{
- pos++;
- characterOffset++;
- }
- }
- resultOffcet+=characterOffset;
- if(textViewer.getTextWidget().getLineAtOffset(resultOffcet)!=(lineIndex-1)) {
-
- throw new IllegalArgumentException("Incorrect character position in line"); //$NON-NLS-1$
- }
- return resultOffcet;
- }
-
- /**
- * Gets visual page editor controller.
- *
- * @param part the part
- *
- * @return {@link VpeController}
- */
- public static VpeController getVpeController(JSPMultiPageEditor part) {
-
- VpeEditorPart visualEditor = (VpeEditorPart) part.getVisualEditor();
- while(visualEditor.getController()==null) {
- if (!Display.getCurrent().readAndDispatch()) {
- Display.getCurrent().sleep();
- }
- }
- return visualEditor.getController();
- }
-
- /**
- * get xulrunner source page.
- *
- * @param part - JSPMultiPageEditor
- *
- * @return nsIDOMDocument
- */
- public static nsIDOMDocument getVpeVisualDocument(JSPMultiPageEditor part) {
-
-
- VpeController vpeController = TestUtil.getVpeController(part);
-
- // get xulRunner editor
- XulRunnerEditor xulRunnerEditor = vpeController.getXulRunnerEditor();
-
- // get dom document
- nsIDOMDocument document = xulRunnerEditor.getDOMDocument();
-
- return document;
- }
-
- /**
- * Perform test for rich faces component.
- *
- * @param componentPage the component page
- *
- * @return the ns IDOM element
- *
- * @throws Throwable the throwable
- */
- public static nsIDOMElement performTestForRichFacesComponent(IFile componentPage) throws Throwable {
- nsIDOMElement rst = null;
- TestUtil.waitForJobs();
-
- // IFile file = (IFile)
- // TestUtil.getComponentPath(componentPage,getImportProjectName());
- IEditorInput input = new FileEditorInput(componentPage);
-
- TestUtil.waitForJobs();
- //
- JSPMultiPageEditor editor = (JSPMultiPageEditor) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().openEditor(
- input, EDITOR_ID, true);
-
- // get dom document
- nsIDOMDocument document = getVpeVisualDocument(editor);
- rst = document.getDocumentElement();
- // check that element is not null
- Assert.assertNotNull(rst);
- return rst;
- }
-
- /**
- * Fail.
- *
- * @param t the t
- */
- public static void fail(Throwable t){
- Assert.fail("Test case was fail "+t.getMessage()+":"+t);
- }
}
14 years, 10 months
JBoss Tools SVN: r31854 - in trunk/seam: tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbModule/org/domain/Test1/session and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-06-06 20:09:15 -0400 (Mon, 06 Jun 2011)
New Revision: 31854
Added:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbModule/org/domain/Test1/session/TestDuplicateNameOk.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/Seam2ValidatorTest.java
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java
Log:
https://issues.jboss.org/browse/JBIDE-9079
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2011-06-06 23:29:05 UTC (rev 31853)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2011-06-07 00:09:15 UTC (rev 31854)
@@ -46,7 +46,6 @@
import org.jboss.tools.jst.web.kb.internal.validation.SimpleValidatingProjectTree;
import org.jboss.tools.jst.web.kb.internal.validation.ValidatingProjectSet;
import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager;
-import org.jboss.tools.jst.web.kb.preferences.ELSeverityPreferences;
import org.jboss.tools.jst.web.kb.validation.IProjectValidationContext;
import org.jboss.tools.jst.web.kb.validation.IValidatingProjectSet;
import org.jboss.tools.jst.web.kb.validation.IValidatingProjectTree;
@@ -631,6 +630,12 @@
validateXmlComponentDeclarations(component);
}
+ private static final String BUILT_IN_COMPONENT_NAME_PREFIX = "org.jboss.seam.";
+
+ private boolean isBuiltInComponentName(String componentName) {
+ return componentName.startsWith(BUILT_IN_COMPONENT_NAME_PREFIX);
+ }
+
private void validateXmlComponentDeclarations(ISeamComponent component) {
String componentName = component.getName();
if(componentName!=null) {
@@ -691,7 +696,7 @@
if(declaration.getClassName()!=null && javaDec.getName()!=null && javaDec.getName().equals(declaration.getName())) {
// Check precedences
String javaPrecedence = "" + javaDec.getPrecedence();
- if(javaPrecedence.equals(precedence)) {
+ if(javaPrecedence.equals(precedence) && !isBuiltInComponentName(componentName)) {
if(!markedJavaDeclarations.contains(javaDec)) {
markedJavaDeclarations.add(javaDec);
ITextSourceReference location = ((SeamComponentDeclaration)javaDec).getLocationFor(SeamComponentDeclaration.PATH_OF_NAME);
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbModule/org/domain/Test1/session/TestDuplicateNameOk.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbModule/org/domain/Test1/session/TestDuplicateNameOk.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbModule/org/domain/Test1/session/TestDuplicateNameOk.java 2011-06-07 00:09:15 UTC (rev 31854)
@@ -0,0 +1,8 @@
+package org.domain.Test1.session;
+
+import org.jboss.seam.annotations.Name;
+
+@Name("org.jboss.seam.security.identity")
+public class TestDuplicateNameOk {
+
+}
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbModule/org/domain/Test1/session/TestDuplicateNameOk.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/Seam2ValidatorTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/Seam2ValidatorTest.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/Seam2ValidatorTest.java 2011-06-07 00:09:15 UTC (rev 31854)
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * 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.seam.core.test;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.wst.validation.internal.core.ValidationException;
+import org.jboss.tools.seam.core.test.validation.SeamCoreValidatorWrapper;
+import org.jboss.tools.seam.internal.core.validation.SeamValidationMessages;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
+import org.jboss.tools.test.util.ResourcesUtils;
+import org.jboss.tools.tests.AbstractResourceMarkerTest;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class Seam2ValidatorTest extends AbstractResourceMarkerTest {
+ IProject projectEAR = null;
+ IProject projectWAR = null;
+ IProject projectEJB = null;
+
+ ProjectImportTestSetup setup;
+
+ @Override
+ protected void setUp() throws Exception {
+ setup = new ProjectImportTestSetup(this, "org.jboss.tools.seam.core.test", new String[]{"projects/Test1-ejb", "projects/Test1-ear", "projects/Test1"}, new String[]{"Test1-ejb", "Test1-ear", "Test1"});
+ IProject[] projects = setup.importProjects();
+ projectEJB = projects[0];
+ projectEAR = projects[1];
+ projectWAR = projects[2];
+ projectEJB.build(IncrementalProjectBuilder.FULL_BUILD, null);
+ projectWAR.build(IncrementalProjectBuilder.FULL_BUILD, null);
+ JobUtils.waitForIdle();
+ setProject(projectEJB);
+ }
+
+ public void testDuplicateName() throws CoreException, ValidationException {
+ IFile componentFile = projectEJB.getFile("ejbModule/org/domain/Test1/session/TestDuplicateNameOk.java");
+ IFile componentsXml = projectWAR.getFile("WebContent/WEB-INF/components.xml");
+
+ SeamCoreValidatorWrapper seamValidator = new SeamCoreValidatorWrapper(projectWAR);
+ seamValidator.validate(componentFile);
+ seamValidator.validate(componentsXml);
+
+ assertFalse("Validation problem was found", seamValidator.isMessageCreated(
+ SeamValidationMessages.NONUNIQUE_COMPONENT_NAME_MESSAGE, new Object[]{"org.jboss.seam.security.identity"}));
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ setup.deleteProjects();
+ }
+}
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/Seam2ValidatorTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2011-06-06 23:29:05 UTC (rev 31853)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2011-06-07 00:09:15 UTC (rev 31854)
@@ -43,6 +43,7 @@
suite.addTestSuite(SeamRuntimeManagerTest.class);
suite.addTestSuite(CyclicDependingProjectsTest.class);
suite.addTestSuite(ComponentsFromLibTest.class);
+ suite.addTestSuite(Seam2ValidatorTest.class);
return suite;
}
}
\ No newline at end of file
14 years, 10 months
JBoss Tools SVN: r31853 - in trunk/cdi/tests: org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-06-06 19:29:05 -0400 (Mon, 06 Jun 2011)
New Revision: 31853
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SecondBean.qfxresult
Removed:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SecondBean.qfxresult
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SecondBean.java
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java
Log:
https://issues.jboss.org/browse/JBIDE-9078
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SecondBean.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SecondBean.java 2011-06-06 22:26:03 UTC (rev 31852)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SecondBean.java 2011-06-06 23:29:05 UTC (rev 31853)
@@ -4,5 +4,5 @@
@SessionScoped
public class SecondBean extends FirstBean {
-private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
}
Deleted: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SecondBean.qfxresult
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SecondBean.qfxresult 2011-06-06 22:26:03 UTC (rev 31852)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SecondBean.qfxresult 2011-06-06 23:29:05 UTC (rev 31853)
@@ -1,9 +0,0 @@
-package org.jboss.jsr299.tck.tests.jbt.quickfixes;
-
-import javax.enterprise.context.SessionScoped;
-import java.io.Serializable;
-
-@SessionScoped
-public class SecondBean extends FirstBean implements Serializable {
-private static final long serialVersionUID = 1L;
-}
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SecondBean.qfxresult
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SecondBean.qfxresult (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SecondBean.qfxresult 2011-06-06 23:29:05 UTC (rev 31853)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import javax.enterprise.context.SessionScoped;
+import java.io.Serializable;
+
+@SessionScoped
+public class SecondBean extends FirstBean implements Serializable {
+ private static final long serialVersionUID = 1L;
+}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java 2011-06-06 22:26:03 UTC (rev 31852)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java 2011-06-06 23:29:05 UTC (rev 31853)
@@ -180,8 +180,8 @@
String fileContent = FileUtil.readStream(file);
String resultContent = FileUtil.readStream(resultFile);
-
- assertEquals("Wrong result of resolution", resultContent.trim(), fileContent.trim());
+
+ assertEquals("Wrong result of resolution", resultContent, fileContent);
}
}
@@ -380,9 +380,9 @@
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/SecondBean.java"
},
-// new String[]{
-// "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/SecondBean.qfxresult"
-// },
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/SecondBean.qfxresult"
+ },
MARKER_TYPE,
CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
CDIValidationErrorManager.NOT_PASSIVATION_CAPABLE_BEAN_ID,
14 years, 10 months