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>