JBoss Tools SVN: r10996 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-10-20 10:27:12 -0400 (Mon, 20 Oct 2008)
New Revision: 10996
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2936, creating uri was updated.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java 2008-10-20 14:26:19 UTC (rev 10995)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java 2008-10-20 14:27:12 UTC (rev 10996)
@@ -26,6 +26,7 @@
import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.util.ElService;
+import org.jboss.tools.vpe.editor.util.HTML;
import org.mozilla.interfaces.nsIDOMElement;
import org.mozilla.interfaces.nsIDOMNode;
import org.mozilla.interfaces.nsIDOMNodeList;
@@ -171,7 +172,7 @@
IPath pluginFile = new Path(pluginPath);
File cssFile = pluginFile.append(cssHref).toFile();
if (cssFile.exists()) {
- String cssPath = "file:///" + cssFile.getPath(); //$NON-NLS-1$
+ String cssPath = "file:///" + cssFile.getPath().replace('\\', '/'); //$NON-NLS-1$
pageContext.getVisualBuilder().replaceLinkNodeToHead(cssPath, ext, true);
}
}
@@ -202,8 +203,8 @@
* @param fileImageName the file image name
*/
public static void setImg(nsIDOMElement img, String fileImageName) {
- img.setAttribute("src", "file://" //$NON-NLS-1$//$NON-NLS-2$
- + getAbsoluteResourcePath(fileImageName));
+ img.setAttribute(HTML.ATTR_SRC, "file://" //$NON-NLS-1$//$NON-NLS-2$
+ + getAbsoluteResourcePath(fileImageName).replace('\\', '/'));
}
/**
@@ -456,9 +457,9 @@
}
/**
- * Adds image as attribute to IMG tag from users worcpace.
+ * Adds image as attribute to IMG tag from users workspace.
*
- * @param img img element to which set picture
+ * @param img image element to set picture to
* @param pageContext Page Context
* @param undefinedImgName default image when image is undefined
* @param fileImageName image name
@@ -469,10 +470,10 @@
String path = ElService.getInstance().replaceEl(pageContext.getVisualBuilder().getCurrentIncludeInfo().getFile(), fileImageName);
File file = new File(inputPath.toOSString() + File.separator + path);
if (file.exists()) {
- img.setAttribute(HtmlComponentUtil.HTML_ATR_SRC, HtmlComponentUtil.FILE_PROTOCOL + inputPath.toOSString() + File.separator
- + path);
+ img.setAttribute(HtmlComponentUtil.HTML_ATR_SRC, HtmlComponentUtil.FILE_PROTOCOL + inputPath.toString() + "/" //$NON-NLS-1$
+ + path.replace('\\', '/'));
} else {
- img.setAttribute(HtmlComponentUtil.HTML_ATR_SRC, undefinedImgName);
+ img.setAttribute(HtmlComponentUtil.HTML_ATR_SRC, undefinedImgName.replace('\\', '/'));
}
}
@@ -615,7 +616,7 @@
Integer rst = null;
if ((value == null) || (value.trim().length() == 0)) {
- throw new NumberFormatException("Passed value is empty ");
+ throw new NumberFormatException("Passed value is empty "); //$NON-NLS-1$
}
if (value.endsWith(PX_SUFFIX)) {
16 years, 2 months
JBoss Tools SVN: r10995 - branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.core/schemas.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-10-20 10:26:19 -0400 (Mon, 20 Oct 2008)
New Revision: 10995
Modified:
branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.core/schemas/jbossesb-1.0.1.xsd
Log:
JBIDE-2360
Modified: branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.core/schemas/jbossesb-1.0.1.xsd
===================================================================
--- branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.core/schemas/jbossesb-1.0.1.xsd 2008-10-20 14:25:01 UTC (rev 10994)
+++ branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.core/schemas/jbossesb-1.0.1.xsd 2008-10-20 14:26:19 UTC (rev 10995)
@@ -198,7 +198,7 @@
<xsd:documentation xml:lang="en">Schedule frequency time units.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
- <xsd:attribute default="-1" name="execCount" type="xsd:int" use="optional">
+ <xsd:attribute default="-1" name="execCount" type="jesb:int" use="optional">
<xsd:annotation>
<xsd:documentation xml:lang="en">
Schedule execution count. -1 to execute indefinitely.
@@ -431,7 +431,7 @@
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
- <xsd:attribute default="1" name="maxThreads" type="xsd:int"
+ <xsd:attribute default="1" name="maxThreads" type="jesb:int"
use="optional">
<xsd:annotation>
<xsd:documentation xml:lang="en">
@@ -463,7 +463,7 @@
<xsd:complexContent>
<xsd:extension base="jesb:listener">
<xsd:attribute default="-1"
- name="poll-frequency-seconds" type="xsd:int" use="optional">
+ name="poll-frequency-seconds" type="jesb:int" use="optional">
<!-- Purposely defaults to -1 -->
<xsd:annotation>
<xsd:documentation xml:lang="en">
@@ -475,7 +475,7 @@
</xsd:annotation>
</xsd:attribute>
<xsd:attribute default="-1" name="schedule-frequency"
- type="xsd:int" use="optional">
+ type="jesb:int" use="optional">
<!-- Purposely defaults to -1 -->
<xsd:annotation>
<xsd:documentation xml:lang="en">
@@ -1532,7 +1532,7 @@
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="jesb:bus">
- <xsd:attribute name="port" type="xsd:int"
+ <xsd:attribute name="port" type="jesb:int"
use="required">
<xsd:annotation>
<xsd:documentation xml:lang="en">
@@ -1624,4 +1624,25 @@
</xsd:complexType>
</xsd:element>
+ <xsd:simpleType name="elType1">
+ <xsd:restriction base="xsd:string">
+ <xsd:pattern value="\#\{.+\}"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:simpleType name="elType2">
+ <xsd:restriction base="xsd:string">
+ <xsd:pattern value="\$\{.+\}"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:simpleType name="expressionType">
+ <xsd:union memberTypes="jesb:elType1 jesb:elType2"/>
+ </xsd:simpleType>
+
+ <xsd:simpleType name="int">
+ <xsd:union memberTypes="xsd:int jesb:expressionType"/>
+ </xsd:simpleType>
+
+
</xsd:schema>
16 years, 2 months
JBoss Tools SVN: r10994 - trunk/esb/plugins/org.jboss.tools.esb.core/schemas.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-10-20 10:25:01 -0400 (Mon, 20 Oct 2008)
New Revision: 10994
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/schemas/jbossesb-1.0.1.xsd
Log:
JBIDE-2360
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/schemas/jbossesb-1.0.1.xsd
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/schemas/jbossesb-1.0.1.xsd 2008-10-20 14:02:02 UTC (rev 10993)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/schemas/jbossesb-1.0.1.xsd 2008-10-20 14:25:01 UTC (rev 10994)
@@ -198,7 +198,7 @@
<xsd:documentation xml:lang="en">Schedule frequency time units.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
- <xsd:attribute default="-1" name="execCount" type="xsd:int" use="optional">
+ <xsd:attribute default="-1" name="execCount" type="jesb:int" use="optional">
<xsd:annotation>
<xsd:documentation xml:lang="en">
Schedule execution count. -1 to execute indefinitely.
@@ -431,7 +431,7 @@
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
- <xsd:attribute default="1" name="maxThreads" type="xsd:int"
+ <xsd:attribute default="1" name="maxThreads" type="jesb:int"
use="optional">
<xsd:annotation>
<xsd:documentation xml:lang="en">
@@ -463,7 +463,7 @@
<xsd:complexContent>
<xsd:extension base="jesb:listener">
<xsd:attribute default="-1"
- name="poll-frequency-seconds" type="xsd:int" use="optional">
+ name="poll-frequency-seconds" type="jesb:int" use="optional">
<!-- Purposely defaults to -1 -->
<xsd:annotation>
<xsd:documentation xml:lang="en">
@@ -475,7 +475,7 @@
</xsd:annotation>
</xsd:attribute>
<xsd:attribute default="-1" name="schedule-frequency"
- type="xsd:int" use="optional">
+ type="jesb:int" use="optional">
<!-- Purposely defaults to -1 -->
<xsd:annotation>
<xsd:documentation xml:lang="en">
@@ -1532,7 +1532,7 @@
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="jesb:bus">
- <xsd:attribute name="port" type="xsd:int"
+ <xsd:attribute name="port" type="jesb:int"
use="required">
<xsd:annotation>
<xsd:documentation xml:lang="en">
@@ -1624,4 +1624,25 @@
</xsd:complexType>
</xsd:element>
+ <xsd:simpleType name="elType1">
+ <xsd:restriction base="xsd:string">
+ <xsd:pattern value="\#\{.+\}"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:simpleType name="elType2">
+ <xsd:restriction base="xsd:string">
+ <xsd:pattern value="\$\{.+\}"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:simpleType name="expressionType">
+ <xsd:union memberTypes="jesb:elType1 jesb:elType2"/>
+ </xsd:simpleType>
+
+ <xsd:simpleType name="int">
+ <xsd:union memberTypes="xsd:int jesb:expressionType"/>
+ </xsd:simpleType>
+
+
</xsd:schema>
16 years, 2 months
JBoss Tools SVN: r10992 - trunk/jsf/docs/userguide/en/images/visual_page.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-10-20 10:01:37 -0400 (Mon, 20 Oct 2008)
New Revision: 10992
Added:
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_17.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_18.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_19.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_20.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_21.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_22.png
Log:
https://jira.jboss.org/jira/browse/JBDS-375 - adding new screenshots;
Added: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_17.png
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_17.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_18.png
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_18.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_19.png
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_19.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_20.png
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_20.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_21.png
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_21.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_22.png
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_22.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 2 months
JBoss Tools SVN: r10991 - trunk/jsf/docs/userguide/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-10-20 10:00:43 -0400 (Mon, 20 Oct 2008)
New Revision: 10991
Modified:
trunk/jsf/docs/userguide/en/modules/editors.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-375 - creating new section "Pages Styling", adding info about css classes;
Modified: trunk/jsf/docs/userguide/en/modules/editors.xml
===================================================================
--- trunk/jsf/docs/userguide/en/modules/editors.xml 2008-10-20 13:47:26 UTC (rev 10990)
+++ trunk/jsf/docs/userguide/en/modules/editors.xml 2008-10-20 14:00:43 UTC (rev 10991)
@@ -839,13 +839,22 @@
<para>When working in JBoss Tools JSP editor you are constantly provided with
feedback and contextual error checking as you type.</para>
</section>
+ </section>
+ <section id="pages_styling">
+ <title>Pages Styling</title>
+
+ <para>Most web pages use the cascading style sheets (CSS) to control the way they look.
+ With <property>Visual Page Editor</property> you can easily stylise your pages. In
+ this section we are going to introduce you to a powerful mechanism that <property>VPE</property> provides for
+ a complete control over pages styling. </para>
+
<section id="inline_styling">
<title>Inline Style Editing</title>
- <para>In the Visual part of the VPE there is a graphical toolbar, use it to add
- inline styling to JSF and Struts tags on your page. The toolbar can be hidden by
- clicking on arrow sign in the upper left corner.</para>
+ <para>In the Visual part of the <property>VPE</property> there is a graphical
+ toolbar, use it to add inline styling to JSF and Struts tags on your page. The
+ toolbar can be hidden by clicking on arrow sign in the upper left corner.</para>
<figure>
<title>Text Formatting</title>
@@ -856,8 +865,8 @@
</mediaobject>
</figure>
- <para>For editing inline styles for DOM elements VPE also provides <property>CSS
- Dialog</property>. It can be called from <emphasis>
+ <para>For editing inline styles for DOM elements <property>VPE</property> also
+ provides <property>CSS Dialog</property>. It can be called from <emphasis>
<property>style</property>
</emphasis> line in the <property>Properties view</property> for a currently
selected element.</para>
@@ -873,7 +882,7 @@
<para id="css_dialog"><property>CSS Dialog</property> has four tabs where css
properties for text, background, borders and others can be specified. A simple
- preview which is generated at the bottom of the <property>CSS Dialog</property>
+ preview which is generated at the top of the <property>CSS Dialog</property>
allows you to see the changes before you apply them.</para>
<figure>
@@ -886,68 +895,167 @@
</figure>
</section>
- <section id="vpe_templating">
- <title>Templating</title>
+ <section id="external_stylesheets">
+ <title>External Stylesheets</title>
+ <para>The pages you are working with in <property>VPE</property> can use external
+ stylesheets. <property>VPE</property> allows you to create new style classes in
+ existing stylesheets and/or edit them as well. For these purposes <property>CSS
+ Style Class Dialog</property> is provided.</para>
+ <para>Select the element for which you need to create or edit style class and press
+ button next to <emphasis>
+ <property>styleClass</property>
+ </emphasis> field in <property>Properties view</property>.</para>
- <para>The VPE also makes it possible to create templates for unknown tags.</para>
+ <figure>
+ <title>Calling the CSS Style Class Dialog</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/visual_page_17.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
- <para>To call the <property>Template dialog</property> for a tag, right-click on it
- in Visual mode and select <emphasis>
- <property>Template</property>
- </emphasis> option.</para>
-
+ <para>It'll pick up the <property>CSS Style Class Dialog</property> which
+ looks like on the figure below.</para>
<figure>
- <title>Calling Template Dialog</title>
+ <title>CSS Style Class Dialog</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/visual_page/visual_page_7a.png"/>
+ <imagedata fileref="images/visual_page/visual_page_18.png"/>
</imageobject>
</mediaobject>
</figure>
+ <para>First, you should specify the CSS file where you are going to put your style
+ class. Do this by pressing button next to the <emphasis>
+ <property>CSS file</property>
+ </emphasis> field.</para>
+ <figure>
+ <title>CSS File Selection</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/visual_page_19.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
- <para id="template_dialog">Here is what the <property>Template dialog</property> looks like.</para>
-
+ <para>To create new CSS class write its name in the <emphasis>
+ <property>Style class</property>
+ </emphasis> field and then configure style settings switching between the tabs: <emphasis>
+ <property>Text/Font</property>, </emphasis>
+ <emphasis>
+ <property>Background</property>, </emphasis>
+ <emphasis>
+ <property>Boxes</property>, </emphasis>
+ <emphasis>
+ <property>Property Sheet</property>. </emphasis>To add existing styling to
+ the chosen element expand the list of the existed style classes and point to the
+ necessary one.</para>
+
<figure>
- <title>Template Dialog</title>
+ <title>Style Class Selection</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/visual_page/visual_page_7b.png"/>
+ <imagedata fileref="images/visual_page/visual_page_20.png"/>
</imageobject>
</mediaobject>
</figure>
-
+
<para><emphasis>
- <property>Tag for Display</property>
- </emphasis> field in the <property>Template dialog</property> requires
- specifying a type of tag. It can be SPAN, DIV, TABLE or any other html element.
- Here it's also possible to mark weather the tag is children or not (by checking <emphasis>
- <property>Children</property></emphasis>), whether it contains an IMG tag (by checking <emphasis>
- <property>Icon</property></emphasis>) and
- specify a value for it.</para>
+ <property>Quick Edit</property>
+ </emphasis> gives a preview of the properties which are set for the existing
+ style class. You can easily modify them with the help of this wizard.</para>
- <para>What comes to the <emphasis>
- <property>Style</property></emphasis> field, you can fill it out manually or make use of the button
- next to the field to bring the <link linkend="css_dialog">CSS Dialog</link> for
- editing styles.</para>
+ <figure>
+ <title>Quick Edit</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/visual_page_21.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
- <para>You can observe all defined templates in the <link linkend="VisualPageEditor2"
- >VPE Preferences</link> on the Templates tab which you can quickly access by
- pressing <link linkend="AdvancedSettings954">Preferences button</link>.</para>
+ <para>Preview at the top of the <property>CSS Style Class Dialog</property>
+ visualizes the result.</para>
+
+ <para>The dialog for creating a new CSS class, which is called from <emphasis>
+ <property>New > Other... > JBoss Tools Web > CSS Class</property>,
+ </emphasis> looks the same.</para>
<figure>
- <title>Templates Tab of the VPE Preferences Page</title>
+ <title>New CSS Class Dialog</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/visual_page/visual_page_7c.png"/>
+ <imagedata fileref="images/visual_page/visual_page_22.png"/>
</imageobject>
</mediaobject>
</figure>
-
- <para>Here it's possible to edit or remove any listed in the table template.</para>
-
</section>
</section>
+ <section id="vpe_templating">
+ <title>Templating</title>
+
+ <para>The VPE also makes it possible to create templates for unknown tags.</para>
+
+ <para>To call the <property>Template dialog</property> for a tag, right-click on it in
+ Visual mode and select <emphasis>
+ <property>Template</property>
+ </emphasis> option.</para>
+
+ <figure>
+ <title>Calling Template Dialog</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/visual_page_7a.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para id="template_dialog">Here is what the <property>Template dialog</property> looks
+ like.</para>
+
+ <figure>
+ <title>Template Dialog</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/visual_page_7b.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para><emphasis>
+ <property>Tag for Display</property>
+ </emphasis> field in the <property>Template dialog</property> requires specifying a
+ type of tag. It can be SPAN, DIV, TABLE or any other html element. Here
+ it's also possible to mark weather the tag is children or not (by checking <emphasis>
+ <property>Children</property>
+ </emphasis>), whether it contains an IMG tag (by checking <emphasis>
+ <property>Icon</property>
+ </emphasis>) and specify a value for it.</para>
+
+ <para>What comes to the <emphasis>
+ <property>Style</property>
+ </emphasis> field, you can fill it out manually or make use of the button next to
+ the field to bring the <link linkend="css_dialog">CSS Dialog</link> for editing
+ styles.</para>
+
+ <para>You can observe all defined templates in the <link linkend="VisualPageEditor2">VPE
+ Preferences</link> on the Templates tab which you can quickly access by pressing
+ <link linkend="AdvancedSettings954">Preferences button</link>.</para>
+
+ <figure>
+ <title>Templates Tab of the VPE Preferences Page</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/visual_page_7c.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para>Here it's possible to edit or remove any listed in the table template.</para>
+
+ </section>
+
<section id="AdvancedSettings954">
<title>Advanced Settings</title>
16 years, 2 months
JBoss Tools SVN: r10990 - branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/constraint.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-10-20 09:47:26 -0400 (Mon, 20 Oct 2008)
New Revision: 10990
Modified:
branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/constraint/ELConstraint.java
Log:
Added '${' EL start
Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/constraint/ELConstraint.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/constraint/ELConstraint.java 2008-10-20 13:44:30 UTC (rev 10989)
+++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/constraint/ELConstraint.java 2008-10-20 13:47:26 UTC (rev 10990)
@@ -12,7 +12,7 @@
public boolean accepts(String value) {
if(value != null) {
- if(value.startsWith("#{") && value.endsWith("}")) {
+ if((value.startsWith("#{") || value.startsWith("${")) && value.endsWith("}")) {
return true;
}
if(value.length() >= 2 && value.startsWith("@") && value.endsWith("@")) {
@@ -27,7 +27,7 @@
*/
public String getError(String value) {
if(accepts(value)) return null;
- if(value.startsWith("#{")) {
+ if(value.startsWith("#{") || value.startsWith("${")) {
return "value is not a correct EL.";
}
if(value.startsWith("@")) {
16 years, 2 months
JBoss Tools SVN: r10989 - branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.core/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-10-20 09:44:30 -0400 (Mon, 20 Oct 2008)
New Revision: 10989
Modified:
branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta
Log:
JBIDE-2360
Modified: branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta
===================================================================
--- branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2008-10-20 13:42:10 UTC (rev 10988)
+++ branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2008-10-20 13:44:30 UTC (rev 10989)
@@ -408,6 +408,14 @@
</Constraint>
<Editor name="ListString"/>
</XModelAttribute>
+ <XModelAttribute PROPERTIES="category=advanced" name="post rename" xmlname="post-rename">
+ <Constraint loader="ListString">
+ <value/>
+ <value name="true"/>
+ <value name="false"/>
+ </Constraint>
+ <Editor name="ListString"/>
+ </XModelAttribute>
<XModelAttribute PROPERTIES="category=advanced" name="post directory" xmlname="post-directory"/>
<XModelAttribute PROPERTIES="category=advanced" name="post suffix" xmlname="post-suffix"/>
<XModelAttribute PROPERTIES="category=advanced" name="error delete" xmlname="error-delete">
@@ -599,6 +607,10 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=advanced"
name="certificate url" xmlname="certificate-url"/>
+ <XModelAttribute PROPERTIES="category=advanced"
+ name="certificate name" xmlname="certificate-name"/>
+ <XModelAttribute PROPERTIES="category=advanced"
+ name="certificate passphrase" xmlname="certificate-passphrase"/>
<XModelAttribute PROPERTIES="category=advanced" name="read only" xmlname="read-only">
<Constraint loader="ListString">
<value/>
@@ -897,6 +909,7 @@
name="id" xmlname="busid"/>
<XModelAttribute PROPERTIES="category=general;save=always"
name="port" xmlname="port">
+ <Constraint loader="%IntEL%"/>
</XModelAttribute>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
@@ -971,7 +984,9 @@
default="http" name="protocol" xmlname="protocol">
<Constraint loader="List">
<value name="http"/>
+ <value name="https"/>
<value name="socket"/>
+ <value name="sslsocket"/>
</Constraint>
<Editor name="List"/>
</XModelAttribute>
@@ -1055,6 +1070,7 @@
<XChildEntity name="ESBProperty"/>
<XChildEntity name="ESBBus"/>
<XChildEntity name="ESBJMSBus101"/>
+ <XChildEntity maxCount="1" name="ESBActivationConfig101" required="yes"/>
</XChildrenEntities>
<XEntityRenderer>
<ICONS>
@@ -1079,7 +1095,16 @@
<Editor name="AccessibleJava"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=advanced;id=true"
- name="transacted" xmlname="transacted"/>
+ name="transacted" xmlname="transacted">
+ <Constraint loader="List">
+ <value/>
+ <value name="true"/>
+ <value name="false"/>
+ </Constraint>
+ <Editor name="Lit"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=advanced"
+ name="provider adapter JNDI" xmlname="providerAdapterJNDI"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -1214,6 +1239,15 @@
name="jms security principal" xmlname="jms-security-principal"/>
<XModelAttribute PROPERTIES="category=advanced"
name="jms security credential" xmlname="jms-security-credential"/>
+ <XModelAttribute PROPERTIES="category=advanced;id=true"
+ name="transacted" xmlname="transacted">
+ <Constraint loader="List">
+ <value/>
+ <value name="true"/>
+ <value name="false"/>
+ </Constraint>
+ <Editor name="Lit"/>
+ </XModelAttribute>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -1305,7 +1339,9 @@
<Constraint loader="ListString"/>
<Editor name="ESBBusList"/>
</XModelAttribute>
- <XModelAttribute PROPERTIES="category=general" name="max threads" xmlname="maxThreads"/>
+ <XModelAttribute PROPERTIES="category=general" name="max threads" xmlname="maxThreads">
+ <Constraint loader="%IntEL%"/>
+ </XModelAttribute>
<XModelAttribute PROPERTIES="category=general" name="is gateway" xmlname="is-gateway">
<Constraint loader="ListString">
<value/>
@@ -1915,9 +1951,13 @@
attributes="name,channel id ref,max threads,is gateway"
entity="ESBListener101" name="listener"/>
<XModelAttribute PROPERTIES="category=advanced"
- name="poll frequency seconds" xmlname="poll-frequency-seconds"/>
+ name="poll frequency seconds" xmlname="poll-frequency-seconds">
+ <Constraint loader="%IntEL%"/>
+ </XModelAttribute>
<XModelAttribute PROPERTIES="category=advanced"
- name="schedule frequency" xmlname="schedule-frequency"/>
+ name="schedule frequency" xmlname="schedule-frequency">
+ <Constraint loader="%IntEL%"/>
+ </XModelAttribute>
<XModelAttribute PROPERTIES="category=advanced"
name="schedule id ref" xmlname="scheduleidref"/>
<XModelAttribute PROPERTIES="category=general;save=always"
@@ -1947,9 +1987,10 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%ESBOrdered%"
XMLSUBPATH="service" name="ESBService101">
<XChildrenEntities>
+ <XChildEntity name="ESBProperty"/>
<XChildEntity maxCount="1" name="ESBListeners101" required="yes"/>
<XChildEntity maxCount="1" name="ESBActions101" required="yes"/>
</XChildrenEntities>
@@ -1967,6 +2008,14 @@
name="category" xmlname="category"/>
<XModelAttribute PROPERTIES="category=general;save=always"
name="description" xmlname="description"/>
+ <XModelAttribute PROPERTIES="category=advanced" name="invm scope" xmlname="invmScope">
+ <Constraint loader="ListString">
+ <value/>
+ <value name="NONE"/>
+ <value name="GLOBAL"/>
+ </Constraint>
+ <Editor name="ListString"/>
+ </XModelAttribute>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -2057,7 +2106,17 @@
<XModelAttribute PROPERTIES="category=general" name="start date" xmlname="startDate"/>
<XModelAttribute PROPERTIES="category=general" name="end date" xmlname="endDate"/>
<XModelAttribute PROPERTIES="category=general" name="frequency" xmlname="frequency"/>
- <XModelAttribute name="exec count" xmlname="execCount"/>
+ <XModelAttribute PROPERTIES="category=general" name="frequency units" xmlname="frequencyUnits">
+ <Constraint loader="List">
+ <value/>
+ <value name="seconds"/>
+ <value name="milliseconds"/>
+ </Constraint>
+ <Editor name="List"/>
+ </XModelAttribute>
+ <XModelAttribute name="exec count" xmlname="execCount">
+ <Constraint loader="%IntEL%"/>
+ </XModelAttribute>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
16 years, 2 months
JBoss Tools SVN: r10988 - branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.core/schemas.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-10-20 09:42:10 -0400 (Mon, 20 Oct 2008)
New Revision: 10988
Modified:
branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.core/schemas/jbossesb-1.0.1.xsd
Log:
JBIDE-2360
Modified: branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.core/schemas/jbossesb-1.0.1.xsd
===================================================================
--- branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.core/schemas/jbossesb-1.0.1.xsd 2008-10-20 13:38:43 UTC (rev 10987)
+++ branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.core/schemas/jbossesb-1.0.1.xsd 2008-10-20 13:42:10 UTC (rev 10988)
@@ -188,29 +188,36 @@
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="jesb:schedule">
- <xsd:attribute default="10" name="frequency"
- type="xsd:long" use="optional">
+ <xsd:attribute name="frequency" use="optional" type="xsd:long" default="10">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">Schedule frequency.</xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="frequencyUnits" use="optional" type="jesb:frequency-unit" default="seconds">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">Schedule frequency time units.</xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute default="-1" name="execCount" type="xsd:int" use="optional">
<xsd:annotation>
<xsd:documentation xml:lang="en">
- Schedule frequency, in seconds.
+ Schedule execution count. -1 to execute indefinitely.
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
- <xsd:attribute default="-1" name="execCount"
- type="xsd:int" use="optional">
- <xsd:annotation>
- <xsd:documentation xml:lang="en">
- Schedule execution count. -1 to execute
- indefinitely.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
- <xsd:element name="cron-schedule"
+ <xsd:simpleType name="frequency-unit">
+ <xsd:restriction base="xsd:NMTOKEN">
+ <xsd:enumeration value="seconds"/>
+ <xsd:enumeration value="milliseconds"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:element name="cron-schedule"
substitutionGroup="jesb:schedule">
<xsd:complexType>
<xsd:complexContent>
@@ -254,7 +261,9 @@
</xsd:annotation>
<xsd:complexType>
<xsd:sequence>
- <xsd:element maxOccurs="1" minOccurs="1"
+ <xsd:element maxOccurs="unbounded" minOccurs="0"
+ ref="jesb:property" />
+ <xsd:element maxOccurs="1" minOccurs="0"
ref="jesb:listeners" />
<xsd:element maxOccurs="1" minOccurs="0"
ref="jesb:actions" />
@@ -287,10 +296,33 @@
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
+ <xsd:attribute name="invmScope" type="jesb:invmScope" use="optional">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">
+ All services are locally invokable over an "in VM" transport. Invokability
+ can be scoped using this attribute. An "invmScope" value of "NONE" means that
+ the Service should not be locally invokable over the "in VM" transport.
+ More fine grained scoping will be added in the future.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
</xsd:complexType>
</xsd:element>
- <xsd:simpleType name="mepType">
+ <xsd:simpleType name="invmScope">
+ <xsd:restriction base="xsd:NMTOKEN">
+ <!-- Not invokable over InVM -->
+ <xsd:enumeration value="NONE" />
+
+ <!-- Invokable over InVM only from within the same/local deployment. -->
+ <!-- xsd:enumeration value="LOCAL" / -->
+
+ <!-- (DEFAULT) Invokable over InVM from within the same classloader scope. -->
+ <xsd:enumeration value="GLOBAL" />
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:simpleType name="mepType">
<xsd:restriction base="xsd:string">
<xsd:enumeration value="RequestResponse" />
<xsd:enumeration value="OneWay" />
@@ -626,6 +658,15 @@
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
+ <xsd:attribute default="false" name="transacted"
+ type="xsd:boolean" use="optional">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">
+ If true, JMS sessions will be transaction aware.
+ Default is false.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
</xsd:complexType>
</xsd:element>
<xsd:element name="jms-bus" substitutionGroup="jesb:bus">
@@ -705,6 +746,10 @@
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="jesb:jms-provider-type">
+ <xsd:sequence>
+ <xsd:element maxOccurs="1" minOccurs="0"
+ ref="jesb:activation-config" />
+ </xsd:sequence>
<xsd:attribute name="adapter" type="xsd:string">
<xsd:annotation>
<xsd:documentation xml:lang="en">
@@ -745,6 +790,13 @@
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
+ <xsd:attribute name="providerAdapterJNDI" type="xsd:string">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">
+ The JNDI location of an alternate provider adapter
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
@@ -788,7 +840,7 @@
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="input-suffix" type="xsd:string"
- use="required">
+ use="optional">
<xsd:annotation>
<xsd:documentation xml:lang="en">
The file suffix used to filter files targeted
@@ -817,6 +869,16 @@
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
+ <xsd:attribute default="true" name="post-rename"
+ type="xsd:boolean" use="optional">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">
+ If true, the file will be renamed after it is
+ processed. Note that in that case post-directory
+ and post-suffix have no effect.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
<xsd:attribute default="processed" name="post-directory"
type="xsd:string" use="optional">
<xsd:annotation>
@@ -941,8 +1003,7 @@
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
- <xsd:attribute name="password" type="xsd:string"
- use="required">
+ <xsd:attribute name="password" type="xsd:string">
<xsd:annotation>
<xsd:documentation xml:lang="en">
The password used to access the ftp server.
@@ -1056,11 +1117,29 @@
use="optional">
<xsd:annotation>
<xsd:documentation xml:lang="en">
- The url to a certificate, which can be needed
- for secure protocols (sftp and ftps).
+ The url to a public server certificate for ftps, or to a
+ private certificate for sftp client verification. sftp certificate
+ can be located via a resource.
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
+ <xsd:attribute name="certificate-name" type="xsd:string"
+ use="optional">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">
+ The common name of a certificate, which may be needed
+ for ftps.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="certificate-passphrase" type="xsd:string"
+ use="optional">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">
+ The passphrase of the private key, if necessary, for sftp client verification.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
<xsd:attribute default="false" name="read-only"
type="xsd:boolean" use="optional">
<xsd:annotation>
@@ -1156,24 +1235,24 @@
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
- <xsd:attribute default="message_id" name="message-id-column"
- type="xsd:string" use="optional">
+ <xsd:attribute name="message-id-column"
+ type="xsd:string" use="required">
<xsd:annotation>
<xsd:documentation xml:lang="en">
A unique key (PK) in the table.
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
- <xsd:attribute default="message" name="message-column"
- type="xsd:string" use="optional">
+ <xsd:attribute name="message-column"
+ type="xsd:string" use="required">
<xsd:annotation>
<xsd:documentation xml:lang="en">
The field that holds the serialized message.
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
- <xsd:attribute default="status" name="status-column"
- type="xsd:string" use="optional">
+ <xsd:attribute name="status-column"
+ type="xsd:string" use="required">
<xsd:annotation>
<xsd:documentation xml:lang="en">
This column contents ('P', 'W', 'E' or 'D')
@@ -1203,7 +1282,7 @@
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="insert-timestamp-column" use="optional"
- type="xsd:string" default="insert_timestamp">
+ type="xsd:string">
<xsd:annotation>
<xsd:documentation xml:lang="en">
Holds the timestamp when the record was
@@ -1484,7 +1563,9 @@
<xsd:simpleType>
<xsd:restriction base="xsd:NMTOKEN">
<xsd:enumeration value="http" />
+ <xsd:enumeration value="https" />
<xsd:enumeration value="socket" />
+ <xsd:enumeration value="sslsocket" />
</xsd:restriction>
</xsd:simpleType>
</xsd:attribute>
16 years, 2 months
JBoss Tools SVN: r10987 - in trunk/esb/plugins/org.jboss.tools.esb.core: schemas and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-10-20 09:38:43 -0400 (Mon, 20 Oct 2008)
New Revision: 10987
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta
trunk/esb/plugins/org.jboss.tools.esb.core/schemas/jbossesb-1.0.1.xsd
Log:
JBIDE-2360
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2008-10-20 13:37:37 UTC (rev 10986)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2008-10-20 13:38:43 UTC (rev 10987)
@@ -408,6 +408,14 @@
</Constraint>
<Editor name="ListString"/>
</XModelAttribute>
+ <XModelAttribute PROPERTIES="category=advanced" name="post rename" xmlname="post-rename">
+ <Constraint loader="ListString">
+ <value/>
+ <value name="true"/>
+ <value name="false"/>
+ </Constraint>
+ <Editor name="ListString"/>
+ </XModelAttribute>
<XModelAttribute PROPERTIES="category=advanced" name="post directory" xmlname="post-directory"/>
<XModelAttribute PROPERTIES="category=advanced" name="post suffix" xmlname="post-suffix"/>
<XModelAttribute PROPERTIES="category=advanced" name="error delete" xmlname="error-delete">
@@ -599,6 +607,10 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=advanced"
name="certificate url" xmlname="certificate-url"/>
+ <XModelAttribute PROPERTIES="category=advanced"
+ name="certificate name" xmlname="certificate-name"/>
+ <XModelAttribute PROPERTIES="category=advanced"
+ name="certificate passphrase" xmlname="certificate-passphrase"/>
<XModelAttribute PROPERTIES="category=advanced" name="read only" xmlname="read-only">
<Constraint loader="ListString">
<value/>
@@ -897,6 +909,7 @@
name="id" xmlname="busid"/>
<XModelAttribute PROPERTIES="category=general;save=always"
name="port" xmlname="port">
+ <Constraint loader="%IntEL%"/>
</XModelAttribute>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
@@ -971,7 +984,9 @@
default="http" name="protocol" xmlname="protocol">
<Constraint loader="List">
<value name="http"/>
+ <value name="https"/>
<value name="socket"/>
+ <value name="sslsocket"/>
</Constraint>
<Editor name="List"/>
</XModelAttribute>
@@ -1055,6 +1070,7 @@
<XChildEntity name="ESBProperty"/>
<XChildEntity name="ESBBus"/>
<XChildEntity name="ESBJMSBus101"/>
+ <XChildEntity maxCount="1" name="ESBActivationConfig101" required="yes"/>
</XChildrenEntities>
<XEntityRenderer>
<ICONS>
@@ -1079,7 +1095,16 @@
<Editor name="AccessibleJava"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=advanced;id=true"
- name="transacted" xmlname="transacted"/>
+ name="transacted" xmlname="transacted">
+ <Constraint loader="List">
+ <value/>
+ <value name="true"/>
+ <value name="false"/>
+ </Constraint>
+ <Editor name="Lit"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=advanced"
+ name="provider adapter JNDI" xmlname="providerAdapterJNDI"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -1214,6 +1239,15 @@
name="jms security principal" xmlname="jms-security-principal"/>
<XModelAttribute PROPERTIES="category=advanced"
name="jms security credential" xmlname="jms-security-credential"/>
+ <XModelAttribute PROPERTIES="category=advanced;id=true"
+ name="transacted" xmlname="transacted">
+ <Constraint loader="List">
+ <value/>
+ <value name="true"/>
+ <value name="false"/>
+ </Constraint>
+ <Editor name="Lit"/>
+ </XModelAttribute>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -1305,7 +1339,9 @@
<Constraint loader="ListString"/>
<Editor name="ESBBusList"/>
</XModelAttribute>
- <XModelAttribute PROPERTIES="category=general" name="max threads" xmlname="maxThreads"/>
+ <XModelAttribute PROPERTIES="category=general" name="max threads" xmlname="maxThreads">
+ <Constraint loader="%IntEL%"/>
+ </XModelAttribute>
<XModelAttribute PROPERTIES="category=general" name="is gateway" xmlname="is-gateway">
<Constraint loader="ListString">
<value/>
@@ -1915,9 +1951,13 @@
attributes="name,channel id ref,max threads,is gateway"
entity="ESBListener101" name="listener"/>
<XModelAttribute PROPERTIES="category=advanced"
- name="poll frequency seconds" xmlname="poll-frequency-seconds"/>
+ name="poll frequency seconds" xmlname="poll-frequency-seconds">
+ <Constraint loader="%IntEL%"/>
+ </XModelAttribute>
<XModelAttribute PROPERTIES="category=advanced"
- name="schedule frequency" xmlname="schedule-frequency"/>
+ name="schedule frequency" xmlname="schedule-frequency">
+ <Constraint loader="%IntEL%"/>
+ </XModelAttribute>
<XModelAttribute PROPERTIES="category=advanced"
name="schedule id ref" xmlname="scheduleidref"/>
<XModelAttribute PROPERTIES="category=general;save=always"
@@ -1947,9 +1987,10 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%ESBOrdered%"
XMLSUBPATH="service" name="ESBService101">
<XChildrenEntities>
+ <XChildEntity name="ESBProperty"/>
<XChildEntity maxCount="1" name="ESBListeners101" required="yes"/>
<XChildEntity maxCount="1" name="ESBActions101" required="yes"/>
</XChildrenEntities>
@@ -1967,6 +2008,14 @@
name="category" xmlname="category"/>
<XModelAttribute PROPERTIES="category=general;save=always"
name="description" xmlname="description"/>
+ <XModelAttribute PROPERTIES="category=advanced" name="invm scope" xmlname="invmScope">
+ <Constraint loader="ListString">
+ <value/>
+ <value name="NONE"/>
+ <value name="GLOBAL"/>
+ </Constraint>
+ <Editor name="ListString"/>
+ </XModelAttribute>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -2057,7 +2106,17 @@
<XModelAttribute PROPERTIES="category=general" name="start date" xmlname="startDate"/>
<XModelAttribute PROPERTIES="category=general" name="end date" xmlname="endDate"/>
<XModelAttribute PROPERTIES="category=general" name="frequency" xmlname="frequency"/>
- <XModelAttribute name="exec count" xmlname="execCount"/>
+ <XModelAttribute PROPERTIES="category=general" name="frequency units" xmlname="frequencyUnits">
+ <Constraint loader="List">
+ <value/>
+ <value name="seconds"/>
+ <value name="milliseconds"/>
+ </Constraint>
+ <Editor name="List"/>
+ </XModelAttribute>
+ <XModelAttribute name="exec count" xmlname="execCount">
+ <Constraint loader="%IntEL%"/>
+ </XModelAttribute>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/schemas/jbossesb-1.0.1.xsd
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/schemas/jbossesb-1.0.1.xsd 2008-10-20 13:37:37 UTC (rev 10986)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/schemas/jbossesb-1.0.1.xsd 2008-10-20 13:38:43 UTC (rev 10987)
@@ -188,29 +188,36 @@
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="jesb:schedule">
- <xsd:attribute default="10" name="frequency"
- type="xsd:long" use="optional">
+ <xsd:attribute name="frequency" use="optional" type="xsd:long" default="10">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">Schedule frequency.</xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="frequencyUnits" use="optional" type="jesb:frequency-unit" default="seconds">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">Schedule frequency time units.</xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute default="-1" name="execCount" type="xsd:int" use="optional">
<xsd:annotation>
<xsd:documentation xml:lang="en">
- Schedule frequency, in seconds.
+ Schedule execution count. -1 to execute indefinitely.
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
- <xsd:attribute default="-1" name="execCount"
- type="xsd:int" use="optional">
- <xsd:annotation>
- <xsd:documentation xml:lang="en">
- Schedule execution count. -1 to execute
- indefinitely.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
- <xsd:element name="cron-schedule"
+ <xsd:simpleType name="frequency-unit">
+ <xsd:restriction base="xsd:NMTOKEN">
+ <xsd:enumeration value="seconds"/>
+ <xsd:enumeration value="milliseconds"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:element name="cron-schedule"
substitutionGroup="jesb:schedule">
<xsd:complexType>
<xsd:complexContent>
@@ -254,7 +261,9 @@
</xsd:annotation>
<xsd:complexType>
<xsd:sequence>
- <xsd:element maxOccurs="1" minOccurs="1"
+ <xsd:element maxOccurs="unbounded" minOccurs="0"
+ ref="jesb:property" />
+ <xsd:element maxOccurs="1" minOccurs="0"
ref="jesb:listeners" />
<xsd:element maxOccurs="1" minOccurs="0"
ref="jesb:actions" />
@@ -287,10 +296,33 @@
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
+ <xsd:attribute name="invmScope" type="jesb:invmScope" use="optional">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">
+ All services are locally invokable over an "in VM" transport. Invokability
+ can be scoped using this attribute. An "invmScope" value of "NONE" means that
+ the Service should not be locally invokable over the "in VM" transport.
+ More fine grained scoping will be added in the future.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
</xsd:complexType>
</xsd:element>
- <xsd:simpleType name="mepType">
+ <xsd:simpleType name="invmScope">
+ <xsd:restriction base="xsd:NMTOKEN">
+ <!-- Not invokable over InVM -->
+ <xsd:enumeration value="NONE" />
+
+ <!-- Invokable over InVM only from within the same/local deployment. -->
+ <!-- xsd:enumeration value="LOCAL" / -->
+
+ <!-- (DEFAULT) Invokable over InVM from within the same classloader scope. -->
+ <xsd:enumeration value="GLOBAL" />
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:simpleType name="mepType">
<xsd:restriction base="xsd:string">
<xsd:enumeration value="RequestResponse" />
<xsd:enumeration value="OneWay" />
@@ -626,6 +658,15 @@
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
+ <xsd:attribute default="false" name="transacted"
+ type="xsd:boolean" use="optional">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">
+ If true, JMS sessions will be transaction aware.
+ Default is false.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
</xsd:complexType>
</xsd:element>
<xsd:element name="jms-bus" substitutionGroup="jesb:bus">
@@ -705,6 +746,10 @@
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="jesb:jms-provider-type">
+ <xsd:sequence>
+ <xsd:element maxOccurs="1" minOccurs="0"
+ ref="jesb:activation-config" />
+ </xsd:sequence>
<xsd:attribute name="adapter" type="xsd:string">
<xsd:annotation>
<xsd:documentation xml:lang="en">
@@ -745,6 +790,13 @@
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
+ <xsd:attribute name="providerAdapterJNDI" type="xsd:string">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">
+ The JNDI location of an alternate provider adapter
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
@@ -788,7 +840,7 @@
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="input-suffix" type="xsd:string"
- use="required">
+ use="optional">
<xsd:annotation>
<xsd:documentation xml:lang="en">
The file suffix used to filter files targeted
@@ -817,6 +869,16 @@
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
+ <xsd:attribute default="true" name="post-rename"
+ type="xsd:boolean" use="optional">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">
+ If true, the file will be renamed after it is
+ processed. Note that in that case post-directory
+ and post-suffix have no effect.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
<xsd:attribute default="processed" name="post-directory"
type="xsd:string" use="optional">
<xsd:annotation>
@@ -941,8 +1003,7 @@
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
- <xsd:attribute name="password" type="xsd:string"
- use="required">
+ <xsd:attribute name="password" type="xsd:string">
<xsd:annotation>
<xsd:documentation xml:lang="en">
The password used to access the ftp server.
@@ -1056,11 +1117,29 @@
use="optional">
<xsd:annotation>
<xsd:documentation xml:lang="en">
- The url to a certificate, which can be needed
- for secure protocols (sftp and ftps).
+ The url to a public server certificate for ftps, or to a
+ private certificate for sftp client verification. sftp certificate
+ can be located via a resource.
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
+ <xsd:attribute name="certificate-name" type="xsd:string"
+ use="optional">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">
+ The common name of a certificate, which may be needed
+ for ftps.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="certificate-passphrase" type="xsd:string"
+ use="optional">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">
+ The passphrase of the private key, if necessary, for sftp client verification.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
<xsd:attribute default="false" name="read-only"
type="xsd:boolean" use="optional">
<xsd:annotation>
@@ -1156,24 +1235,24 @@
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
- <xsd:attribute default="message_id" name="message-id-column"
- type="xsd:string" use="optional">
+ <xsd:attribute name="message-id-column"
+ type="xsd:string" use="required">
<xsd:annotation>
<xsd:documentation xml:lang="en">
A unique key (PK) in the table.
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
- <xsd:attribute default="message" name="message-column"
- type="xsd:string" use="optional">
+ <xsd:attribute name="message-column"
+ type="xsd:string" use="required">
<xsd:annotation>
<xsd:documentation xml:lang="en">
The field that holds the serialized message.
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
- <xsd:attribute default="status" name="status-column"
- type="xsd:string" use="optional">
+ <xsd:attribute name="status-column"
+ type="xsd:string" use="required">
<xsd:annotation>
<xsd:documentation xml:lang="en">
This column contents ('P', 'W', 'E' or 'D')
@@ -1203,7 +1282,7 @@
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="insert-timestamp-column" use="optional"
- type="xsd:string" default="insert_timestamp">
+ type="xsd:string">
<xsd:annotation>
<xsd:documentation xml:lang="en">
Holds the timestamp when the record was
@@ -1484,7 +1563,9 @@
<xsd:simpleType>
<xsd:restriction base="xsd:NMTOKEN">
<xsd:enumeration value="http" />
+ <xsd:enumeration value="https" />
<xsd:enumeration value="socket" />
+ <xsd:enumeration value="sslsocket" />
</xsd:restriction>
</xsd:simpleType>
</xsd:attribute>
16 years, 2 months