Author: scabanovich Date: 2007-08-17 06:29:03 -0400 (Fri, 17 Aug 2007) New Revision: 3206 Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-components.meta trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-core.meta trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-drools.meta trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-framework.meta trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-jms.meta trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-mail.meta trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-pdf.meta trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-remoting.meta trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-security.meta trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-spring.meta trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-theme.meta trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-web.meta trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamComponentConstants.java trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamComponentsEntityRecognizer.java trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamComponentsFileLoader.java trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamNamespaces.java Log: JBIDE-789 Recognizing components.xml 2.0 restored, now xmodel handles only components-2.0.xsd and coew-2.0.xsd. Adding unknown elements makes tree tab non-editable and showing problem. Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-components.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-components.meta 2007-08-17 10:19:42 UTC (rev 3205) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-components.meta 2007-08-17 10:29:03 UTC (rev 3206) @@ -7,6 +7,7 @@ <MAPPING name="FileVersions"> <PAIR name="SeamComponents1.1" value="FileSeamComponents11"/> <PAIR name="SeamComponents1.2" value="FileSeamComponents12"/> + <PAIR name="SeamComponents2.0" value="FileSeamComponents20"/> </MAPPING> <MAPPING name="FilteredTreeConstraints"/> <MAPPING name="FilteredTrees"/> @@ -72,31 +73,21 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute default="components" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttribute PROPERTIES="category=general" name="name" xmlname="NAME"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="name" xmlname="NAME"/> <XModelAttribute PROPERTIES="id=true;category=general" - name="component-name" xmlname="name"> - <Constraint/> - <Editor/> - </XModelAttribute> + name="component-name" xmlname="name"/> <XModelAttributeReference attributes="class,scope,precedence,installed,auto-create,jndi-name" entity="SeamComponent" name="component"/> <XModelAttribute default="xml" name="extension" xmlname="EXTENSION"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> <XModelAttribute loader="ElementType" name="_lateload" visibility="false"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute default="no" name="isIncorrect" visibility="false"> @@ -106,30 +97,208 @@ </Constraint> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttribute name="incorrectBody" visibility="false"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute name="incorrectBody" visibility="false"/> <XModelAttribute PROPERTIES="save=always" - default="http://jboss.com/products/seam/components" name="xmlns" xmlname="xmlns"> - <Constraint/> - <Editor/> - </XModelAttribute> + default="http://jboss.com/products/seam/components" name="xmlns" xmlname="xmlns"/> <XModelAttribute PROPERTIES="save=always" - default="http://www.w3.org/2001/XMLSchema-instance" name="xmlns:xsi" xmlname="xmlns:xsi"> - <Constraint/> - <Editor/> - </XModelAttribute> + default="http://www.w3.org/2001/XMLSchema-instance" name="xmlns:xsi" xmlname="xmlns:xsi"/> <XModelAttribute PROPERTIES="save=always" default="http://jboss.com/products/seam/components http://jboss.com/products/seam/components-1.2.xsd" - name="xsi:schemaLocation" xmlname="xsi:schemaLocation"> - <Constraint/> - <Editor/> + name="xsi:schemaLocation" xmlname="xsi:schemaLocation"/> + <XModelAttribute name="namespaceMapping"/> + <XModelAttribute name="encoding"> + <Constraint loader="ListString"> + <value name="ISO-8859-1"/> + <value name="UTF-8"/> + </Constraint> + <Editor name="ListString"/> </XModelAttribute> - <XModelAttribute name="namespaceMapping"> - <Constraint/> - <Editor/> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem BaseActionName="Open" HandlerClassName="%Open%" + ICON="action.empty" displayName="Open" kind="action" name="Open"/> + <XActionItem displayName="Open With" group="1" kind="list" name="OpenWith"> + <XActionItem HIDE="always" + HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.OpenWithExternalHandler" + ICON="action.empty" PROPERTIES="extension=struts-config" + displayName="Open with External Program" kind="action" name="OpenWithSelected"/> + <XActionItem HIDE="always" + HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.OpenWithChoiceHandler" + ICON="action.empty" PROPERTIES="extension=struts-config" + displayName="Choose Program..." kind="action" name="OpenWithChoice"> + <EntityData EntityName="OpenWithHelper"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="default"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem kind="list" name="EditActions"> + <XActionItem HIDE="always" + HandlerClassName="org.jboss.tools.jsf.model.handlers.RenameFacesConfigHandler" + ICON="action.empty" PROPERTIES="validator.edit=true" + WizardClassName="%Default%" displayName="Rename..." kind="action" name="Rename"> + <EntityData EntityName="FacesConfig"> + <AttributeData AttributeName="name"/> + </EntityData> + </XActionItem> + <XActionItem + HandlerClassName="org.jboss.tools.common.model.filesystems.impl.handlers.RenameEclipseFileHandler" + ICON="action.empty" displayName="Rename..." kind="action" name="RenameEclipse"/> + </XActionItem> + <XActionItem kind="list" name="SaveActions"> + <XActionItem HIDE="always" HandlerClassName="%SaveFile%" + ICON="action.save" displayName="Save" kind="action" name="Save"/> + </XActionItem> + <XActionItem ICON="action.empty" displayName="New" group="1" + kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + WizardClassName="%Default%" displayName="Add Simple Property..." + kind="action" name="AddProperty"> + <EntityData EntityName="SeamProperty"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="value" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + WizardClassName="%Default%" displayName="Add List Property..." + kind="action" name="AddListProperty"> + <EntityData EntityName="SeamPropertyList"> + <AttributeData AttributeName="name"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + WizardClassName="%Default%" displayName="Add Map Property..." + kind="action" name="AddMapProperty"> + <EntityData EntityName="SeamPropertyMap"> + <AttributeData AttributeName="name"/> + </EntityData> + </XActionItem> + <XActionItem HIDE="always" + HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.ShowMenuHandler" + PROPERTIES="actionList=CreateActions" displayName="Property..." + kind="action" name="AddAnyProperty"/> + </XActionItem> + <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 BaseActionName="Paste" HandlerClassName="%Paste%" + ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> + </XActionItem> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" + HandlerClassName="org.jboss.tools.jsf.model.handlers.DeleteFacesConfigHandler" + 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 kind="list" name="DiscardActions"> + <XActionItem HIDE="always" + HandlerClassName="org.jboss.tools.jsf.model.handlers.DiscardConfigHandler" + ICON="action.delete" + PROPERTIES="significanceMessageClass=org.jboss.tools.common.model.filesystems.impl.DiscardFileSignificanceMessage" + displayName="Discard Changes" kind="action" name="Discard"/> + </XActionItem> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity name="FileSeamComponent12_EditorActionList"> + <XChildrenEntities/> + <XEntityRenderer/> + <XModelAttributes/> + <XActionItem kind="list"> + <XActionItem displayName="New" group="1" kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + WizardClassName="%Default%" displayName="Add Simple Property..." + kind="action" name="AddProperty"> + <EntityData EntityName="SeamProperty"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="value" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + WizardClassName="%Default%" displayName="Add List Property..." + kind="action" name="AddListProperty"> + <EntityData EntityName="SeamPropertyList"> + <AttributeData AttributeName="name"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + WizardClassName="%Default%" displayName="Add Map Property..." + kind="action" name="AddMapProperty"> + <EntityData EntityName="SeamPropertyMap"> + <AttributeData AttributeName="name"/> + </EntityData> + </XActionItem> + <XActionItem HIDE="always" + HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.ShowMenuHandler" + PROPERTIES="actionList=CreateActions" displayName="Property..." + kind="action" name="AddAnyProperty"/> + </XActionItem> + <XActionItem ICON="action.empty" kind="list" name="Properties"> + <XActionItem HandlerClassName="%Properties%" ICON="action.empty" + displayName="Properties..." kind="action" name="Properties"/> + </XActionItem> + <XActionItem kind="list" name="VerifyActions"> + <XActionItem kind="list" name="StaticActions"/> + </XActionItem> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity + ImplementationLoadingClass="org.jboss.tools.seam.xml.components.model.SeamComponentsFileLoader" + ImplementingClass="org.jboss.tools.seam.xml.components.model.FileSeamComponentsImpl" + ObjectEditorClass="%XML%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData" + XMLSUBPATH="component" name="FileSeamComponent20"> + <XChildrenEntities> + <XChildEntity name="SeamProperty"/> + <XChildEntity name="SeamPropertyList"/> + <XChildEntity name="SeamPropertyMap"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam.file" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="components" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="name" xmlname="NAME"/> + <XModelAttribute PROPERTIES="id=true;category=general" + name="component-name" xmlname="name"/> + <XModelAttributeReference + attributes="class,scope,precedence,installed,auto-create,jndi-name" + entity="SeamComponent" name="component"/> + <XModelAttribute default="xml" name="extension" xmlname="EXTENSION"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + <XModelAttribute loader="ElementType" name="_lateload" visibility="false"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute default="no" name="isIncorrect" visibility="false"> + <Constraint loader="List"> + <value name="yes"/> + <value name="no"/> + </Constraint> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute name="incorrectBody" visibility="false"/> + <XModelAttribute PROPERTIES="save=always" + default="http://jboss.com/products/seam/components" name="xmlns" xmlname="xmlns"/> + <XModelAttribute PROPERTIES="save=always" + default="http://www.w3.org/2001/XMLSchema-instance" name="xmlns:xsi" xmlname="xmlns:xsi"/> + <XModelAttribute PROPERTIES="save=always" + default="http://jboss.com/products/seam/components http://jboss.com/products/seam/components-1.2.xsd" + name="xsi:schemaLocation" xmlname="xsi:schemaLocation"/> + <XModelAttribute name="namespaceMapping"/> <XModelAttribute name="encoding"> <Constraint loader="ListString"> <value name="ISO-8859-1"/> @@ -229,7 +398,7 @@ </XActionItem> <XDependencies/> </XModelEntity> - <XModelEntity name="FileSeamComponent12_EditorActionList"> + <XModelEntity name="FileSeamComponent20_EditorActionList"> <XChildrenEntities/> <XEntityRenderer/> <XModelAttributes/> @@ -290,37 +459,24 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute default="components" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttribute PROPERTIES="category=general" name="name" xmlname="NAME"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="name" xmlname="NAME"/> <XModelAttribute default="xml" name="extension" xmlname="EXTENSION"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> <XModelAttribute loader="ElementType" name="_lateload" visibility="false"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute default="-//JBoss/Seam Component Configuration DTD 1.1//EN" - name="publicId" visibility="false"> - <Constraint/> - <Editor/> - </XModelAttribute> + name="publicId" visibility="false"/> <XModelAttribute default="http://jboss.com/products/seam/components-1.1.dtd" - name="systemId" visibility="false"> - <Constraint/> - <Editor/> - </XModelAttribute> + name="systemId" visibility="false"/> <XModelAttribute default="no" name="isIncorrect" visibility="false"> <Constraint loader="List"> <value name="yes"/> @@ -328,10 +484,7 @@ </Constraint> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttribute name="incorrectBody" visibility="false"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute name="incorrectBody" visibility="false"/> <XModelAttribute name="encoding"> <Constraint loader="ListString"> <value name="ISO-8859-1"/> @@ -488,23 +641,16 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute default="components" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttribute PROPERTIES="category=general" name="name" xmlname="NAME"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="name" xmlname="NAME"/> <XModelAttribute default="xml" name="extension" xmlname="EXTENSION"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> <XModelAttribute loader="ElementType" name="_lateload" visibility="false"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute default="no" name="isIncorrect" visibility="false"> @@ -514,30 +660,199 @@ </Constraint> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttribute name="incorrectBody" visibility="false"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute name="incorrectBody" visibility="false"/> <XModelAttribute PROPERTIES="save=always" - default="http://jboss.com/products/seam/components" name="xmlns" xmlname="xmlns"> - <Constraint/> - <Editor/> - </XModelAttribute> + default="http://jboss.com/products/seam/components" name="xmlns" xmlname="xmlns"/> <XModelAttribute PROPERTIES="save=always" - default="http://www.w3.org/2001/XMLSchema-instance" name="xmlns:xsi" xmlname="xmlns:xsi"> - <Constraint/> - <Editor/> - </XModelAttribute> + default="http://www.w3.org/2001/XMLSchema-instance" name="xmlns:xsi" xmlname="xmlns:xsi"/> <XModelAttribute PROPERTIES="save=always" default="http://jboss.com/products/seam/components http://jboss.com/products/seam/components-1.2.xsd" - name="xsi:schemaLocation" xmlname="xsi:schemaLocation"> - <Constraint/> - <Editor/> + name="xsi:schemaLocation" xmlname="xsi:schemaLocation"/> + <XModelAttribute name="namespaceMapping"/> + <XModelAttribute name="encoding"> + <Constraint loader="ListString"> + <value name="ISO-8859-1"/> + <value name="UTF-8"/> + </Constraint> + <Editor name="ListString"/> </XModelAttribute> - <XModelAttribute name="namespaceMapping"> - <Constraint/> - <Editor/> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem BaseActionName="Open" HandlerClassName="%Open%" + ICON="action.empty" displayName="Open" kind="action" name="Open"/> + <XActionItem displayName="Open With" group="1" kind="list" name="OpenWith"> + <XActionItem HIDE="always" + HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.OpenWithExternalHandler" + ICON="action.empty" PROPERTIES="extension=struts-config" + displayName="Open with External Program" kind="action" name="OpenWithSelected"/> + <XActionItem HIDE="always" + HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.OpenWithChoiceHandler" + ICON="action.empty" PROPERTIES="extension=struts-config" + displayName="Choose Program..." kind="action" name="OpenWithChoice"> + <EntityData EntityName="OpenWithHelper"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="default"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem kind="list" name="EditActions"> + <XActionItem HIDE="always" + HandlerClassName="org.jboss.tools.jsf.model.handlers.RenameFacesConfigHandler" + ICON="action.empty" PROPERTIES="validator.edit=true" + WizardClassName="%Default%" displayName="Rename..." kind="action" name="Rename"> + <EntityData EntityName="FacesConfig"> + <AttributeData AttributeName="name"/> + </EntityData> + </XActionItem> + <XActionItem + HandlerClassName="org.jboss.tools.common.model.filesystems.impl.handlers.RenameEclipseFileHandler" + ICON="action.empty" displayName="Rename..." kind="action" name="RenameEclipse"/> + </XActionItem> + <XActionItem kind="list" name="SaveActions"> + <XActionItem HIDE="always" HandlerClassName="%SaveFile%" + ICON="action.save" displayName="Save" kind="action" name="Save"/> + </XActionItem> + <XActionItem ICON="action.empty" displayName="New" group="1" + kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%Create%" + ICON="action.new.struts.webapp.res_ref" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Component..." kind="action" name="AddComponent"> + <EntityData EntityName="SeamComponent"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="class" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" + ICON="action.new.struts.webapp.res_ref" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Factory..." kind="action" name="AddFactory"> + <EntityData EntityName="SeamFactory"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="value" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + WizardClassName="%Default%" displayName="Event..." kind="action" name="AddEvent"> + <EntityData EntityName="SeamEvent"> + <AttributeData AttributeName="type"/> + </EntityData> + </XActionItem> + </XActionItem> + <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 BaseActionName="Paste" HandlerClassName="%Paste%" + ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> + </XActionItem> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" + HandlerClassName="org.jboss.tools.jsf.model.handlers.DeleteFacesConfigHandler" + 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 kind="list" name="DiscardActions"> + <XActionItem HIDE="always" + HandlerClassName="org.jboss.tools.jsf.model.handlers.DiscardConfigHandler" + ICON="action.delete" + PROPERTIES="significanceMessageClass=org.jboss.tools.common.model.filesystems.impl.DiscardFileSignificanceMessage" + displayName="Discard Changes" kind="action" name="Discard"/> + </XActionItem> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity name="FileSeamComponents12_EditorActionList"> + <XChildrenEntities/> + <XEntityRenderer/> + <XModelAttributes/> + <XActionItem kind="list"> + <XActionItem displayName="New" group="1" kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%Create%" + ICON="action.new.struts.webapp.res_ref" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Component..." kind="action" name="AddComponent"> + <EntityData EntityName="SeamComponent"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="class" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" + ICON="action.new.struts.webapp.res_ref" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Factory..." kind="action" name="AddFactory"> + <EntityData EntityName="SeamFactory"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="value" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + WizardClassName="%Default%" displayName="Event..." kind="action" name="AddEvent"> + <EntityData EntityName="SeamEvent"> + <AttributeData AttributeName="type"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem ICON="action.empty" kind="list" name="Properties"> + <XActionItem HandlerClassName="%Properties%" ICON="action.empty" + displayName="Properties..." kind="action" name="Properties"/> + </XActionItem> + <XActionItem kind="list" name="VerifyActions"> + <XActionItem kind="list" name="StaticActions"/> + </XActionItem> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity + ImplementationLoadingClass="org.jboss.tools.seam.xml.components.model.SeamComponentsFileLoader" + ImplementingClass="org.jboss.tools.seam.xml.components.model.FileSeamComponentsImpl" + ObjectEditorClass="%XML%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData" + XMLSUBPATH="components" name="FileSeamComponents20"> + <XChildrenEntities> + <XChildEntity name="SeamComponent"/> + <XChildEntity name="SeamFactory"/> + <XChildEntity name="SeamEvent"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam.file" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="components" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="name" xmlname="NAME"/> + <XModelAttribute default="xml" name="extension" xmlname="EXTENSION"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + <XModelAttribute loader="ElementType" name="_lateload" visibility="false"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute default="no" name="isIncorrect" visibility="false"> + <Constraint loader="List"> + <value name="yes"/> + <value name="no"/> + </Constraint> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute name="incorrectBody" visibility="false"/> + <XModelAttribute PROPERTIES="save=always" + default="http://jboss.com/products/seam/components" name="xmlns" xmlname="xmlns"/> + <XModelAttribute PROPERTIES="save=always" + default="http://www.w3.org/2001/XMLSchema-instance" name="xmlns:xsi" xmlname="xmlns:xsi"/> + <XModelAttribute PROPERTIES="save=always" + default="http://jboss.com/products/seam/components http://jboss.com/products/seam/components-1.2.xsd" + name="xsi:schemaLocation" xmlname="xsi:schemaLocation"/> + <XModelAttribute name="namespaceMapping"/> <XModelAttribute name="encoding"> <Constraint loader="ListString"> <value name="ISO-8859-1"/> @@ -635,7 +950,7 @@ </XActionItem> <XDependencies/> </XModelEntity> - <XModelEntity name="FileSeamComponents12_EditorActionList"> + <XModelEntity name="FileSeamComponents20_EditorActionList"> <XChildrenEntities/> <XEntityRenderer/> <XModelAttributes/> @@ -687,16 +1002,11 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute default="action" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="id=true;save=always;category=general" - name="expression" xmlname="expression"> - <Constraint/> - <Editor/> - </XModelAttribute> + name="expression" xmlname="expression"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> </XModelAttributes> @@ -739,13 +1049,9 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute default="component" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttribute PROPERTIES="id=true;category=general" name="name" xmlname="name"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;category=general" name="name" xmlname="name"/> <XModelAttribute PROPERTIES="category=general" name="class" xmlname="class"> <Constraint loader="QClassName"/> <Editor name="AccessibleJava"/> @@ -770,10 +1076,7 @@ </Constraint> <Editor name="List"/> </XModelAttribute> - <XModelAttribute PROPERTIES="category=advanced" name="precedence" xmlname="precedence"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced" name="precedence" xmlname="precedence"/> <XModelAttribute PROPERTIES="category=advanced" default="true" name="installed" xmlname="installed"> <Constraint loader="ListString"> @@ -790,12 +1093,8 @@ </Constraint> <Editor name="ListString"/> </XModelAttribute> - <XModelAttribute PROPERTIES="category=advanced" name="jndi-name" xmlname="jndi-name"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced" name="jndi-name" xmlname="jndi-name"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> </XModelAttributes> @@ -865,16 +1164,11 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute default="event" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="id=true;save=always;category=general" - name="type" xmlname="type"> - <Constraint/> - <Editor/> - </XModelAttribute> + name="type" xmlname="type"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> </XModelAttributes> @@ -922,18 +1216,11 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute default="factory" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="id=true;save=always;category=general" - name="name" xmlname="name"> - <Constraint/> - <Editor/> - </XModelAttribute> - <XModelAttribute PROPERTIES="category=general" name="value" xmlname="value"> - <Constraint/> - <Editor/> - </XModelAttribute> + name="name" xmlname="name"/> + <XModelAttribute PROPERTIES="category=general" name="value" xmlname="value"/> <XModelAttribute PROPERTIES="category=general" name="scope" xmlname="scope"> <Constraint loader="List"> <value/> @@ -954,10 +1241,7 @@ </Constraint> <Editor name="List"/> </XModelAttribute> - <XModelAttribute PROPERTIES="category=advanced" name="method" xmlname="method"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced" name="method" xmlname="method"/> <XModelAttribute PROPERTIES="category=advanced" default="false" name="auto-create" xmlname="auto-create"> <Constraint loader="ListString"> @@ -967,7 +1251,6 @@ <Editor name="ListString"/> </XModelAttribute> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> </XModelAttributes> @@ -1004,15 +1287,10 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute default="value" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttribute PROPERTIES="id=true" name="value" xmlname="#text"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute PROPERTIES="id=true" name="value" xmlname="#text"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> </XModelAttributes> @@ -1048,19 +1326,11 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute default="map entry" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttribute PROPERTIES="id=true;save=always" name="key" xmlname="key.#text"> - <Constraint/> - <Editor/> - </XModelAttribute> - <XModelAttribute PROPERTIES="save=always" name="value" xmlname="value.#text"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;save=always" name="key" xmlname="key.#text"/> + <XModelAttribute PROPERTIES="save=always" name="value" xmlname="value.#text"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> </XModelAttributes> @@ -1097,19 +1367,11 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute default="property" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttribute PROPERTIES="id=true;category=general" name="name" xmlname="name"> - <Constraint/> - <Editor/> - </XModelAttribute> - <XModelAttribute PROPERTIES="category=general" name="value" xmlname="#text"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;category=general" name="name" xmlname="name"/> + <XModelAttribute PROPERTIES="category=general" name="value" xmlname="#text"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> </XModelAttributes> @@ -1149,15 +1411,10 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute default="property" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttribute PROPERTIES="id=true;category=general" name="name" xmlname="name"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;category=general" name="name" xmlname="name"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> </XModelAttributes> @@ -1208,15 +1465,10 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute default="property" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttribute PROPERTIES="id=true;category=general" name="name" xmlname="name"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;category=general" name="name" xmlname="name"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> </XModelAttributes> @@ -1260,6 +1512,8 @@ <XChildEntity name="FileSeamComponents11"/> <XChildEntity name="FileSeamComponents12"/> <XChildEntity name="FileSeamComponent12"/> + <XChildEntity name="FileSeamComponents20"/> + <XChildEntity name="FileSeamComponent20"/> </XChildrenEntities> <XActionItem kind="list"> <XActionItem ICON="action.empty" displayName="New" group="1" @@ -1288,6 +1542,8 @@ <XChildEntity name="FileSeamComponents11"/> <XChildEntity name="FileSeamComponents12"/> <XChildEntity name="FileSeamComponent12"/> + <XChildEntity name="FileSeamComponents20"/> + <XChildEntity name="FileSeamComponent20"/> </XChildrenEntities> <XActionItem kind="list"> <XActionItem ICON="action.empty" displayName="New" group="1" @@ -1316,6 +1572,8 @@ <XChildEntity name="FileSeamComponents12"/> <XChildEntity name="FileSeamComponents11"/> <XChildEntity name="FileSeamComponent12"/> + <XChildEntity name="FileSeamComponents20"/> + <XChildEntity name="FileSeamComponent20"/> </XChildrenEntities> <XActionItem kind="list"/> </XEntityExtension> @@ -1324,6 +1582,8 @@ <XChildEntity name="FileSeamComponents11"/> <XChildEntity name="FileSeamComponents12"/> <XChildEntity name="FileSeamComponent12"/> + <XChildEntity name="FileSeamComponents20"/> + <XChildEntity name="FileSeamComponent20"/> </XChildrenEntities> <XActionItem kind="list"/> </XEntityExtension> 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-08-17 10:19:42 UTC (rev 3205) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-core.meta 2007-08-17 10:29:03 UTC (rev 3206) @@ -10,6 +10,7 @@ </MAPPING> <MAPPING name="SeamSchemas"> <PAIR name="core" value="http://jboss.com/products/seam/core-1.2.xsd"/> + <PAIR name="core$20" value="http://jboss.com/products/seam/core-2.0.xsd"/> </MAPPING> </MAPPINGS> <ICONS> @@ -48,23 +49,15 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute default="actor" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="id=true;category=general" - default="org.jboss.seam.core.actor" name="name" xmlname="name"> - <Constraint/> - <Editor/> - </XModelAttribute> + default="org.jboss.seam.core.actor" name="name" xmlname="name"/> <XModelAttributeReference attributes="class,scope,precedence,installed,auto-create" entity="SeamComponent" name="component"/> - <XModelAttribute PROPERTIES="category=general" name="group-actor-ids" xmlname="group-actor-ids"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="group-actor-ids" xmlname="group-actor-ids"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> </XModelAttributes> @@ -105,16 +98,13 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute default="bundle-names" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="id=true;category=general" default="bundle-names" name="name"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> </XModelAttributes> @@ -163,19 +153,14 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute default="dispatcher" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="id=true;category=general" - default="org.jboss.seam.core.dispatcher" name="name" xmlname="name"> - <Constraint/> - <Editor/> - </XModelAttribute> + default="org.jboss.seam.core.dispatcher" name="name" xmlname="name"/> <XModelAttributeReference attributes="class,scope,precedence,installed,auto-create,jndi-name" entity="SeamComponent" name="component"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> </XModelAttributes> @@ -214,19 +199,14 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute default="EJB" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="id=true;category=general" - default="org.jboss.seam.core.ejb" name="name" xmlname="name"> - <Constraint/> - <Editor/> - </XModelAttribute> + default="org.jboss.seam.core.ejb" name="name" xmlname="name"/> <XModelAttributeReference attributes="class,scope,precedence,installed,auto-create" entity="SeamComponent" name="component"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> </XModelAttributes> @@ -268,23 +248,15 @@ <XModelAttributes> <XModelAttribute default="entity manager factory" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttribute PROPERTIES="id=true;category=general" name="name" xmlname="name"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;category=general" name="name" xmlname="name"/> <XModelAttributeReference attributes="class,scope,precedence,installed,auto-create" entity="SeamComponent" name="component"/> <XModelAttribute PROPERTIES="category=general" - name="persistence-unit-name" xmlname="persistence-unit-name"> - <Constraint/> - <Editor/> - </XModelAttribute> + name="persistence-unit-name" xmlname="persistence-unit-name"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> </XModelAttributes> @@ -326,22 +298,14 @@ <XModelAttributes> <XModelAttribute default="entity manager factory" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttributeReference attributes="name,class,scope,precedence,installed,auto-create" entity="SeamComponent" name="component"/> - <XModelAttribute PROPERTIES="category=general" name="filter name" xmlname="core:name.#text"> - <Constraint/> - <Editor/> - </XModelAttribute> - <XModelAttribute PROPERTIES="category=advanced" name="enabled" xmlname="enabled"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="filter name" xmlname="core:name.#text"/> + <XModelAttribute PROPERTIES="category=advanced" name="enabled" xmlname="enabled"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> </XModelAttributes> @@ -382,16 +346,13 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute default="filters" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="id=true;category=general" default="filters" name="name"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> </XModelAttributes> @@ -440,14 +401,10 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute default="init" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="id=true;category=general" - default="org.jboss.seam.core.init" name="name" xmlname="name"> - <Constraint/> - <Editor/> - </XModelAttribute> + default="org.jboss.seam.core.init" name="name" xmlname="name"/> <XModelAttributeReference attributes="class,scope,precedence,installed,auto-create" entity="SeamComponent" name="component"/> @@ -459,10 +416,7 @@ </Constraint> <Editor name="List"/> </XModelAttribute> - <XModelAttribute PROPERTIES="category=general" name="jndi-pattern" xmlname="jndi-pattern"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="jndi-pattern" xmlname="jndi-pattern"/> <XModelAttribute PROPERTIES="category=advanced" name="client-side-conversations" xmlname="client-side-conversations"> <Constraint loader="List"> @@ -482,12 +436,8 @@ <Editor name="List"/> </XModelAttribute> <XModelAttribute PROPERTIES="category=advanced" - name="user-transaction-name" xmlname="user-transaction-name"> - <Constraint/> - <Editor/> - </XModelAttribute> + name="user-transaction-name" xmlname="user-transaction-name"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> </XModelAttributes> @@ -529,19 +479,14 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute default="JBPM" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="id=true;category=general" - default="org.jboss.seam.core.jbpm" name="name" xmlname="name"> - <Constraint/> - <Editor/> - </XModelAttribute> + default="org.jboss.seam.core.jbpm" name="name" xmlname="name"/> <XModelAttributeReference attributes="class,scope,precedence,installed,auto-create" entity="SeamComponent" name="component"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> </XModelAttributes> @@ -580,21 +525,14 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute default="locale-selector" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="id=true;category=general" - default="org.jboss.seam.core.localeSelector" name="name" xmlname="name"> - <Constraint/> - <Editor/> - </XModelAttribute> + default="org.jboss.seam.core.localeSelector" name="name" xmlname="name"/> <XModelAttributeReference attributes="class,scope,precedence,installed,auto-create" entity="SeamComponent" name="component"/> - <XModelAttribute PROPERTIES="category=general" name="locale-string" xmlname="locale-string"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="locale-string" xmlname="locale-string"/> <XModelAttribute PROPERTIES="category=advanced" name="cookie-enabled" xmlname="cookie-enabled"> <Constraint loader="List"> <value/> @@ -604,7 +542,6 @@ <Editor name="List"/> </XModelAttribute> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> </XModelAttributes> @@ -646,28 +583,17 @@ <XModelAttributes> <XModelAttribute default="managed persistence context" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttribute PROPERTIES="id=true;category=general" name="name" xmlname="name"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;category=general" name="name" xmlname="name"/> <XModelAttributeReference attributes="class,scope,precedence,installed,auto-create" entity="SeamComponent" name="component"/> <XModelAttribute PROPERTIES="category=general" - name="entity-manager-factory" xmlname="entity-manager-factory"> - <Constraint/> - <Editor/> - </XModelAttribute> + name="entity-manager-factory" xmlname="entity-manager-factory"/> <XModelAttribute PROPERTIES="category=general" - name="persistence-unit-jndi-name" xmlname="persistence-unit-jndi-name"> - <Constraint/> - <Editor/> - </XModelAttribute> + name="persistence-unit-jndi-name" xmlname="persistence-unit-jndi-name"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> </XModelAttributes> @@ -706,44 +632,24 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute default="manager" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="id=true;category=general" - default="org.jboss.seam.core.manager" name="name" xmlname="name"> - <Constraint/> - <Editor/> - </XModelAttribute> + default="org.jboss.seam.core.manager" name="name" xmlname="name"/> <XModelAttributeReference attributes="class,scope,precedence,installed,auto-create" entity="SeamComponent" name="component"/> <XModelAttribute PROPERTIES="category=general" - name="conversation-timeout" xmlname="conversation-timeout"> - <Constraint/> - <Editor/> - </XModelAttribute> + name="conversation-timeout" xmlname="conversation-timeout"/> <XModelAttribute PROPERTIES="category=advanced" - name="concurrent-request-timeout" xmlname="concurrent-request-timeout"> - <Constraint/> - <Editor/> - </XModelAttribute> + name="concurrent-request-timeout" xmlname="concurrent-request-timeout"/> <XModelAttribute PROPERTIES="category=advanced" - name="conversation-id-parameter" xmlname="conversation-id-parameter"> - <Constraint/> - <Editor/> - </XModelAttribute> + name="conversation-id-parameter" xmlname="conversation-id-parameter"/> <XModelAttribute PROPERTIES="category=advanced" - name="parent-conversation-id-parameter" xmlname="parent-conversation-id-parameter"> - <Constraint/> - <Editor/> - </XModelAttribute> + name="parent-conversation-id-parameter" xmlname="parent-conversation-id-parameter"/> <XModelAttribute PROPERTIES="category=advanced" - name="conversation-is-long-running-parameter" xmlname="conversation-is-long-running-parameter"> - <Constraint/> - <Editor/> - </XModelAttribute> + name="conversation-is-long-running-parameter" xmlname="conversation-is-long-running-parameter"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> </XModelAttributes> @@ -782,19 +688,14 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute default="microcontainer" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="id=true;category=general" - default="org.jboss.seam.core.microcontainer" name="name" xmlname="name"> - <Constraint/> - <Editor/> - </XModelAttribute> + default="org.jboss.seam.core.microcontainer" name="name" xmlname="name"/> <XModelAttributeReference attributes="class,scope,precedence,installed,auto-create" entity="SeamComponent" name="component"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> </XModelAttributes> @@ -835,16 +736,13 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute default="pageflow-definitions" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="id=true;category=general" default="pageflow-definitions" name="name"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> </XModelAttributes> @@ -893,36 +791,19 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute default="pages" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="id=true;category=general" - default="org.jboss.seam.core.pages" name="name" xmlname="name"> - <Constraint/> - <Editor/> - </XModelAttribute> + default="org.jboss.seam.core.pages" name="name" xmlname="name"/> <XModelAttributeReference attributes="class,scope,precedence,installed,auto-create" entity="SeamComponent" name="component"/> <XModelAttribute PROPERTIES="category=advanced" - name="no-conversation-view-id" xmlname="no-conversation-view-id"> - <Constraint/> - <Editor/> - </XModelAttribute> - <XModelAttribute PROPERTIES="category=advanced" name="login-view-id" xmlname="login-view-id"> - <Constraint/> - <Editor/> - </XModelAttribute> - <XModelAttribute PROPERTIES="category=advanced" name="http-port" xmlname="http-port"> - <Constraint/> - <Editor/> - </XModelAttribute> - <XModelAttribute PROPERTIES="category=advanced" name="https-port" xmlname="https-port"> - <Constraint/> - <Editor/> - </XModelAttribute> + name="no-conversation-view-id" xmlname="no-conversation-view-id"/> + <XModelAttribute PROPERTIES="category=advanced" name="login-view-id" xmlname="login-view-id"/> + <XModelAttribute PROPERTIES="category=advanced" name="http-port" xmlname="http-port"/> + <XModelAttribute PROPERTIES="category=advanced" name="https-port" xmlname="https-port"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> </XModelAttributes> @@ -963,16 +844,13 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute default="parameters" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="id=true;category=general" default="parameters" name="name"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> </XModelAttributes> @@ -1025,16 +903,13 @@ <XModelAttributes> <XModelAttribute default="persistence-unit-properties" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="id=true;category=general" default="persistence unit properties" name="name"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> </XModelAttributes> @@ -1084,26 +959,18 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute default="pojo cache" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="id=true;category=general" - default="org.jboss.seam.core.pojoCache" name="name" xmlname="name"> - <Constraint/> - <Editor/> - </XModelAttribute> + default="org.jboss.seam.core.pojoCache" name="name" xmlname="name"/> <XModelAttributeReference attributes="class,scope,precedence,installed,auto-create" entity="SeamComponent" name="component"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> <XModelAttribute PROPERTIES="category=general" - name="cfg-resource-name" xmlname="cfg-resource-name"> - <Constraint/> - <Editor/> - </XModelAttribute> + name="cfg-resource-name" xmlname="cfg-resource-name"/> </XModelAttributes> <XActionItem kind="list"> <XActionItem kind="list" name="CreateActions"/> @@ -1142,16 +1009,13 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute default="process-definitions" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="id=true;category=general" default="process-definitions" name="name"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> </XModelAttributes> @@ -1202,23 +1066,15 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute default="resource bundle" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="id=true;category=general" - default="org.jboss.seam.core.resourceBundle" name="name" xmlname="name"> - <Constraint/> - <Editor/> - </XModelAttribute> + 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"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="bundle-names" xmlname="bundle-names"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> </XModelAttributes> @@ -1257,21 +1113,14 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute default="time zone selector" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="id=true;category=general" - default="org.jboss.seam.core.timeZoneSelector" name="name" xmlname="name"> - <Constraint/> - <Editor/> - </XModelAttribute> + default="org.jboss.seam.core.timeZoneSelector" name="name" xmlname="name"/> <XModelAttributeReference attributes="class,scope,precedence,installed,auto-create" entity="SeamComponent" name="component"/> - <XModelAttribute PROPERTIES="category=general" name="time-zone-id" xmlname="time-zone-id"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="time-zone-id" xmlname="time-zone-id"/> <XModelAttribute PROPERTIES="category=advanced" name="cookie-enabled" xmlname="cookie-enabled"> <Constraint loader="List"> <value/> @@ -1281,7 +1130,6 @@ <Editor name="List"/> </XModelAttribute> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> </XModelAttributes> @@ -1320,19 +1168,14 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute default="transaction listener" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="id=true;category=general" - default="org.jboss.seam.core.transactionListener" name="name" xmlname="name"> - <Constraint/> - <Editor/> - </XModelAttribute> + default="org.jboss.seam.core.transactionListener" name="name" xmlname="name"/> <XModelAttributeReference attributes="class,scope,precedence,installed,auto-create,jndi-name" entity="SeamComponent" name="component"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> </XModelAttributes> @@ -1649,4 +1492,97 @@ </XActionItem> </XActionItem> </XEntityExtension> + <XEntityExtension name="FileSeamComponents20"> + <XChildrenEntities> + <XChildEntity name="SeamCoreInit"/> + <XChildEntity name="SeamCoreManager"/> + <XChildEntity name="SeamCorePojoCache"/> + <XChildEntity name="SeamCoreResourceBundle"/> + </XChildrenEntities> + <XActionItem kind="list"> + <XActionItem ICON="action.empty" displayName="New" group="1" + kind="list" name="CreateActions"> + <XActionItem ICON="action.empty" displayName="Core" group="1" + kind="list" name="Core"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Init..." kind="action" name="AddInit"> + <EntityData EntityName="SeamCoreInit"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="jndi-pattern" Mandatory="no"/> + <AttributeData AttributeName="debug" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Manager..." kind="action" name="AddManager"> + <EntityData EntityName="SeamCoreManager"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="conversation-timeout" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Pojo Cache..." kind="action" name="AddPojoCache"> + <EntityData EntityName="SeamCorePojoCache"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="cfg-resource-name" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Resource Bundle..." kind="action" name="AddResourceBundle"> + <EntityData EntityName="SeamCoreResourceBundle"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="bundle-names" Mandatory="no"/> + </EntityData> + </XActionItem> + </XActionItem> + </XActionItem> + </XActionItem> + </XEntityExtension> + <XEntityExtension name="FileSeamComponents20_EditorActionList"> + <XChildrenEntities/> + <XActionItem kind="list"> + <XActionItem ICON="action.empty" displayName="New" group="1" + kind="list" name="CreateActions"> + <XActionItem ICON="action.empty" displayName="Core" group="1" + kind="list" name="Core"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Init..." kind="action" name="AddInit"> + <EntityData EntityName="SeamCoreInit"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="jndi-pattern" Mandatory="no"/> + <AttributeData AttributeName="debug" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Manager..." kind="action" name="AddManager"> + <EntityData EntityName="SeamCoreManager"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="conversation-timeout" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Pojo Cache..." kind="action" name="AddPojoCache"> + <EntityData EntityName="SeamCorePojoCache"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="cfg-resource-name" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Resource Bundle..." kind="action" name="AddResourceBundle"> + <EntityData EntityName="SeamCoreResourceBundle"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="bundle-names" Mandatory="no"/> + </EntityData> + </XActionItem> + </XActionItem> + </XActionItem> + </XActionItem> + </XEntityExtension> </XModelEntityGroup> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-drools.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-drools.meta 2007-08-17 10:19:42 UTC (rev 3205) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-drools.meta 2007-08-17 10:29:03 UTC (rev 3206) @@ -10,6 +10,7 @@ </MAPPING> <MAPPING name="SeamSchemas"> <PAIR name="drools" value="http://jboss.com/products/seam/drools-1.2.xsd"/> + <PAIR name="drools$20" value="http://jboss.com/products/seam/drools-2.0.xsd"/> </MAPPING> </MAPPINGS> <ICONS> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-framework.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-framework.meta 2007-08-17 10:19:42 UTC (rev 3205) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-framework.meta 2007-08-17 10:29:03 UTC (rev 3206) @@ -10,6 +10,7 @@ </MAPPING> <MAPPING name="SeamSchemas"> <PAIR name="framework" value="http://jboss.com/products/seam/framework-1.2.xsd"/> + <PAIR name="framework$20" value="http://jboss.com/products/seam/framework-2.0.xsd"/> </MAPPING> </MAPPINGS> <ICONS> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-jms.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-jms.meta 2007-08-17 10:19:42 UTC (rev 3205) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-jms.meta 2007-08-17 10:29:03 UTC (rev 3206) @@ -10,6 +10,7 @@ </MAPPING> <MAPPING name="SeamSchemas"> <PAIR name="jms" value="http://jboss.com/products/seam/jms-1.2.xsd"/> + <PAIR name="jms$20" value="http://jboss.com/products/seam/jms-2.0.xsd"/> </MAPPING> </MAPPINGS> <ICONS> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-mail.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-mail.meta 2007-08-17 10:19:42 UTC (rev 3205) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-mail.meta 2007-08-17 10:29:03 UTC (rev 3206) @@ -10,6 +10,7 @@ </MAPPING> <MAPPING name="SeamSchemas"> <PAIR name="mail" value="http://jboss.com/products/seam/mail-1.2.xsd"/> + <PAIR name="mail$20" value="http://jboss.com/products/seam/mail-2.0.xsd"/> </MAPPING> </MAPPINGS> <ICONS> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-pdf.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-pdf.meta 2007-08-17 10:19:42 UTC (rev 3205) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-pdf.meta 2007-08-17 10:29:03 UTC (rev 3206) @@ -10,6 +10,7 @@ </MAPPING> <MAPPING name="SeamSchemas"> <PAIR name="pdf" value="http://jboss.com/products/seam/pdf-1.2.xsd"/> + <PAIR name="pdf$20" value="http://jboss.com/products/seam/pdf-2.0.xsd"/> </MAPPING> </MAPPINGS> <ICONS> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-remoting.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-remoting.meta 2007-08-17 10:19:42 UTC (rev 3205) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-remoting.meta 2007-08-17 10:29:03 UTC (rev 3206) @@ -10,6 +10,7 @@ </MAPPING> <MAPPING name="SeamSchemas"> <PAIR name="remoting" value="http://jboss.com/products/seam/remoting-1.2.xsd"/> + <PAIR name="remoting$20" value="http://jboss.com/products/seam/remoting-2.0.xsd"/> </MAPPING> </MAPPINGS> <ICONS> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-security.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-security.meta 2007-08-17 10:19:42 UTC (rev 3205) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-security.meta 2007-08-17 10:29:03 UTC (rev 3206) @@ -10,6 +10,7 @@ </MAPPING> <MAPPING name="SeamSchemas"> <PAIR name="security" value="http://jboss.com/products/seam/security-1.2.xsd"/> + <PAIR name="security$20" value="http://jboss.com/products/seam/security-2.0.xsd"/> </MAPPING> </MAPPINGS> <ICONS> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-spring.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-spring.meta 2007-08-17 10:19:42 UTC (rev 3205) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-spring.meta 2007-08-17 10:29:03 UTC (rev 3206) @@ -10,6 +10,7 @@ </MAPPING> <MAPPING name="SeamSchemas"> <PAIR name="spring" value="http://jboss.com/products/seam/spring-1.2.xsd"/> + <PAIR name="spring$20" value="http://jboss.com/products/seam/spring-2.0.xsd"/> </MAPPING> </MAPPINGS> <ICONS> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-theme.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-theme.meta 2007-08-17 10:19:42 UTC (rev 3205) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-theme.meta 2007-08-17 10:29:03 UTC (rev 3206) @@ -10,6 +10,7 @@ </MAPPING> <MAPPING name="SeamSchemas"> <PAIR name="theme" value="http://jboss.com/products/seam/theme-1.2.xsd"/> + <PAIR name="theme$20" value="http://jboss.com/products/seam/theme-2.0.xsd"/> </MAPPING> </MAPPINGS> <ICONS> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-web.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-web.meta 2007-08-17 10:19:42 UTC (rev 3205) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-web.meta 2007-08-17 10:29:03 UTC (rev 3206) @@ -10,6 +10,7 @@ </MAPPING> <MAPPING name="SeamSchemas"> <PAIR name="web" value="http://jboss.com/products/seam/web-1.2.xsd"/> + <PAIR name="web$20" value="http://jboss.com/products/seam/web-2.0.xsd"/> </MAPPING> </MAPPINGS> <ICONS> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamComponentConstants.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamComponentConstants.java 2007-08-17 10:19:42 UTC (rev 3205) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamComponentConstants.java 2007-08-17 10:29:03 UTC (rev 3206) @@ -18,6 +18,8 @@ public String ENT_SEAM_COMPONENTS_11 = ENT_SEAM_COMPONENTS + "11"; public String ENT_SEAM_COMPONENTS_12 = ENT_SEAM_COMPONENTS + "12"; public String ENT_SEAM_COMPONENT_12 = "FileSeamComponent" + "12"; + public String ENT_SEAM_COMPONENTS_20 = ENT_SEAM_COMPONENTS + "20"; + public String ENT_SEAM_COMPONENT_20 = "FileSeamComponent" + "20"; public String ENT_SEAM_COMPONENT = "SeamComponent"; public String ENT_SEAM_FACTORY = "SeamFactory"; Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamComponentsEntityRecognizer.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamComponentsEntityRecognizer.java 2007-08-17 10:19:42 UTC (rev 3205) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamComponentsEntityRecognizer.java 2007-08-17 10:29:03 UTC (rev 3206) @@ -45,15 +45,18 @@ int k = body.indexOf("\"", j + 1); if(k < 0) return null; String schemaLocation = body.substring(j + 1, k); - boolean isSingleComponent = is12Component(body); + boolean isSingleComponent = isSingleComponent(body); int i20 = schemaLocation.indexOf("2.0"); - if(i20 >= 0) return null; + if(i20 >= 0) { + if(isSingleComponent) return ENT_SEAM_COMPONENT_20; + if(isMultiComponent(body)) return ENT_SEAM_COMPONENTS_20; + } int i12 = schemaLocation.indexOf("1.2"); if(i12 >= 0) { if(isSingleComponent) return ENT_SEAM_COMPONENT_12; - if(is12(body)) return ENT_SEAM_COMPONENTS_12; + if(isMultiComponent(body)) return ENT_SEAM_COMPONENTS_12; } return null; } @@ -67,7 +70,7 @@ return s.indexOf("\"http://jboss.com/products/seam/components\"&q... > 0; } - private boolean is12(String body) { + private boolean isMultiComponent(String body) { int i = body.indexOf("<components"); if(i < 0) return false; int j = body.indexOf(">", i); @@ -76,7 +79,7 @@ return s.indexOf("\"http://jboss.com/products/seam/components\"&q... > 0; } - private boolean is12Component(String body) { + private boolean isSingleComponent(String body) { int i = body.indexOf("<component"); int is = body.indexOf("<components"); if(i < 0 || is >= 0) return false; Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamComponentsFileLoader.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamComponentsFileLoader.java 2007-08-17 10:19:42 UTC (rev 3205) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamComponentsFileLoader.java 2007-08-17 10:29:03 UTC (rev 3206) @@ -10,8 +10,6 @@ ******************************************************************************/ package org.jboss.tools.seam.xml.components.model; -import java.util.Map; - import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.loaders.impl.SimpleWebFileLoader; import org.jboss.tools.common.model.util.NamespaceMapping; @@ -35,7 +33,7 @@ } protected String loadNamespace(Element element, XModelObject object) { - NamespaceMapping namespaceMapping = SeamNamespaces.getInstance(object.getModel().getMetaData()).getNamespaceMapping(element); + NamespaceMapping namespaceMapping = SeamNamespaces.getInstance(object.getModel().getMetaData(), getVersionSuffix(object)).getNamespaceMapping(element); object.set("namespaceMapping", namespaceMapping.toString()); util.setNamespaceMapping(namespaceMapping); @@ -45,10 +43,16 @@ public String serializeObject(XModelObject object) { String rootName = getRootName(object); Element element = createRootElement(rootName, null, null); - SeamNamespaces.getInstance(object.getModel().getMetaData()).validateNamespaces(object, element); + SeamNamespaces.getInstance(object.getModel().getMetaData(), getVersionSuffix(object)).validateNamespaces(object, element); NamespaceMapping namespaceMapping = NamespaceMapping.load(object.get("namespaceMapping")); util.setNamespaceMapping(namespaceMapping); return serializeToElement(element, object); } + private String getVersionSuffix(XModelObject o) { + String entity = o.getModelEntity().getName(); + if(entity.endsWith("20")) return "$20"; + return ""; + } + } Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamNamespaces.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamNamespaces.java 2007-08-17 10:19:42 UTC (rev 3205) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamNamespaces.java 2007-08-17 10:29:03 UTC (rev 3206) @@ -24,22 +24,26 @@ import org.w3c.dom.Node; public class SeamNamespaces { - private static SeamNamespaces instance; + private static Map<String,SeamNamespaces> map = new HashMap<String, SeamNamespaces>(); - public static SeamNamespaces getInstance(XModelMetaData meta) { + public static SeamNamespaces getInstance(XModelMetaData meta, String version) { + SeamNamespaces instance = map.get(version); if(instance == null) { - instance = new SeamNamespaces(meta); + instance = new SeamNamespaces(meta, version); } return instance; } + String versionSuffix = null; + private Map<String, String> namespaceToURI = new HashMap<String, String>(); private Map<String, String> uriToNamespace = new HashMap<String, String>(); private Map<String, String> namespaceToSchema = new HashMap<String, String>(); - private SeamNamespaces(XModelMetaData meta) { + private SeamNamespaces(XModelMetaData meta, String versionSuffix) { XMapping m = meta.getMapping("SeamNamespaces"); if(m == null) return; + this.versionSuffix = versionSuffix; String[] keys = m.getKeys(); for (int i = 0; i < keys.length; i++) { String v = m.getValue(keys[i]); @@ -50,8 +54,10 @@ if(m == null) return; keys = m.getKeys(); for (int i = 0; i < keys.length; i++) { + if(!keys[i].endsWith(versionSuffix)) continue; String v = m.getValue(keys[i]); - namespaceToSchema.put(keys[i], v); + String key = keys[i].substring(0, keys[i].length() - versionSuffix.length()); + namespaceToSchema.put(key, v); } }