Author: scabanovich Date: 2007-11-30 09:26:41 -0500 (Fri, 30 Nov 2007) New Revision: 5164 Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-core.meta trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/core-2.0.xsd Log: JBIDE-1397 Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-core.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-core.meta 2007-11-30 13:55:10 UTC (rev 5163) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-core.meta 2007-11-30 14:26:41 UTC (rev 5164) @@ -1316,6 +1316,55 @@ </XModelEntity> <XModelEntity ImplementingClass="%Custom%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.core.SeamComponentsCoreFormLayoutData" + XMLSUBPATH="core:resource-loader" name="SeamCoreResourceLoader20"> + <XChildrenEntities> + <XChildEntity maxCount="1" name="SeamCoreBundleNames" required="yes"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam.core.bundle" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="resource loader" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;category=general" + default="org.jboss.seam.core.resourceBundle" name="name" xmlname="name"/> + <XModelAttributeReference + attributes="class,scope,precedence,installed,auto-create" + entity="SeamComponent" name="component"/> + <XModelAttribute PROPERTIES="category=general" name="bundle-names" xmlname="bundle-names"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"/> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + </XActionItem> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" + ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> + </XActionItem> + <XActionItem ICON="action.empty" kind="list" name="Properties"> + <XActionItem HandlerClassName="%Properties%" ICON="action.empty" + displayName="Properties..." kind="action" name="Properties"/> + </XActionItem> + <XActionItem displayName="move" kind="list" name="MoveActions"> + <XActionItem HIDE="always" HandlerClassName="%Move%" + ICON="action.move" displayName="Move" kind="action" name="Move"/> + </XActionItem> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.core.SeamComponentsCoreFormLayoutData" XMLSUBPATH="core:time-zone-selector" name="SeamCoreTimeZoneSelector"> <XChildrenEntities/> <XEntityRenderer> @@ -1709,7 +1758,7 @@ <XChildEntity name="SeamCoreInit"/> <XChildEntity name="SeamCoreManager"/> <XChildEntity name="SeamCorePojoCache"/> - <XChildEntity name="SeamCoreResourceBundle"/> + <XChildEntity name="SeamCoreResourceLoader20"/> <XChildEntity name="SeamBPMActor20"/> <XChildEntity name="SeamBPMJBPM20"/> </XChildrenEntities> @@ -1745,8 +1794,8 @@ </XActionItem> <XActionItem HandlerClassName="%Create%" ICON="action.empty" PROPERTIES="validator.add=true" WizardClassName="%Default%" - displayName="Resource Bundle..." kind="action" name="AddResourceBundle"> - <EntityData EntityName="SeamCoreResourceBundle"> + displayName="Resource Loader..." kind="action" name="AddResourceLoader"> + <EntityData EntityName="SeamCoreResourceLoader20"> <AttributeData AttributeName="name"/> <AttributeData AttributeName="bundle-names" Mandatory="no"/> </EntityData> @@ -1807,8 +1856,8 @@ </XActionItem> <XActionItem HandlerClassName="%Create%" ICON="action.empty" PROPERTIES="validator.add=true" WizardClassName="%Default%" - displayName="Resource Bundle..." kind="action" name="AddResourceBundle"> - <EntityData EntityName="SeamCoreResourceBundle"> + displayName="Resource Loader..." kind="action" name="AddResourceLoader"> + <EntityData EntityName="SeamCoreResourceLoader20"> <AttributeData AttributeName="name"/> <AttributeData AttributeName="bundle-names" Mandatory="no"/> </EntityData> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/core-2.0.xsd =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/core-2.0.xsd 2007-11-30 13:55:10 UTC (rev 5163) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/core-2.0.xsd 2007-11-30 14:26:41 UTC (rev 5164) @@ -1,71 +1,71 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/core" xmlns:core="http://jboss.com/products/seam/core" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.0.xsd"/> - - <xs:element name="init"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="core:attlist.init"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.init"> - <xs:attribute name="debug"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="jndi-pattern"/> - <xs:attribute name="transaction-management-enabled"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="user-transaction-name"/> - </xs:attributeGroup> - - <xs:element name="manager"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="core:attlist.manager"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.manager"> - <xs:attribute name="concurrent-request-timeout" type="xs:integer"/> - <xs:attribute name="conversation-timeout" type="xs:integer"/> - <xs:attribute name="conversation-id-parameter"/> - <xs:attribute name="parent-conversation-id-parameter"/> - </xs:attributeGroup> - - <xs:element name="resource-bundle"> - <xs:complexType mixed="true"> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="core:bundle-names"/> - </xs:choice> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="core:attlist.resourceBundle"/> - </xs:complexType> - </xs:element> - <xs:element name="bundle-names" type="components:multiValuedProperty"/> - <xs:attributeGroup name="attlist.resourceBundle"> - <xs:attribute name="bundle-names"> </xs:attribute> - </xs:attributeGroup> - - <xs:element name="pojo-cache"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="core:attlist.pojoCache"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.pojoCache"> - <xs:attribute name="cfg-resource-name"/> - </xs:attributeGroup> - -</xs:schema> +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" + targetNamespace="http://jboss.com/products/seam/core" xmlns:core="http://jboss.com/products/seam/core" + xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> + <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.0.xsd"/> + + <xs:element name="init"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="core:attlist.init"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.init"> + <xs:attribute name="debug"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="true"/> + <xs:enumeration value="false"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="jndi-pattern"/> + <xs:attribute name="transaction-management-enabled"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="true"/> + <xs:enumeration value="false"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="user-transaction-name"/> + </xs:attributeGroup> + + <xs:element name="manager"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="core:attlist.manager"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.manager"> + <xs:attribute name="concurrent-request-timeout" type="xs:integer"/> + <xs:attribute name="conversation-timeout" type="xs:integer"/> + <xs:attribute name="conversation-id-parameter"/> + <xs:attribute name="parent-conversation-id-parameter"/> + </xs:attributeGroup> + + <xs:element name="resource-loader"> + <xs:complexType mixed="true"> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="core:bundle-names"/> + </xs:choice> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="core:attlist.resourceLoader"/> + </xs:complexType> + </xs:element> + <xs:element name="bundle-names" type="components:multiValuedProperty"/> + <xs:attributeGroup name="attlist.resourceLoader"> + <xs:attribute name="bundle-names"> </xs:attribute> + </xs:attributeGroup> + + <xs:element name="pojo-cache"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="core:attlist.pojoCache"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.pojoCache"> + <xs:attribute name="cfg-resource-name"/> + </xs:attributeGroup> + +</xs:schema>