Author: scabanovich Date: 2009-08-27 11:22:20 -0400 (Thu, 27 Aug 2009) New Revision: 17334 Added: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/schemas/pages-2.2.xsd Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.xml trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/help/keys-seam-pages.properties trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/help/keys-seam-pages_ja.properties trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesConstants.java trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesEntityRecognizer.java trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesLoaderUtil.java trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/DiagramAdopt.java trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java Log: https://jira.jboss.org/jira/browse/JBIDE-4811 Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.xml 2009-08-27 14:30:44 UTC (rev 17333) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.xml 2009-08-27 15:22:20 UTC (rev 17334) @@ -113,6 +113,10 @@ name="http://jboss.com/products/seam/pages-2.1.xsd" uri="schemas/pages-2.1.xsd"/> + <uri + name="http://jboss.com/products/seam/pages-2.2.xsd" + uri="schemas/pages-2.2.xsd"/> + </catalogContribution> </extension> Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/help/keys-seam-pages.properties =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/help/keys-seam-pages.properties 2009-08-27 14:30:44 UTC (rev 17333) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/help/keys-seam-pages.properties 2009-08-27 15:22:20 UTC (rev 17334) @@ -1,6 +1,7 @@ FileSeamPage12.editorTitle=Seam Page Editor FileSeamPage20.editorTitle=Seam Page Editor FileSeamPage21.editorTitle=Seam Page Editor +FileSeamPage22.editorTitle=Seam Page Editor AddSeamPageException_Properties.Title=Add Exception Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/help/keys-seam-pages_ja.properties =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/help/keys-seam-pages_ja.properties 2009-08-27 14:30:44 UTC (rev 17333) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/help/keys-seam-pages_ja.properties 2009-08-27 15:22:20 UTC (rev 17334) @@ -1,6 +1,7 @@ FileSeamPage12.editorTitle=Seam \u30DA\u30FC\u30B8\u30FB\u30A8\u30C7\u30A3\u30BF\u30FC FileSeamPage20.editorTitle=Seam \u30DA\u30FC\u30B8\u30FB\u30A8\u30C7\u30A3\u30BF\u30FC FileSeamPage21.editorTitle=Seam \u30DA\u30FC\u30B8\u30FB\u30A8\u30C7\u30A3\u30BF\u30FC +FileSeamPage22.editorTitle=Seam \u30DA\u30FC\u30B8\u30FB\u30A8\u30C7\u30A3\u30BF\u30FC AddSeamPageException_Properties.Title=\u4F8B\u5916\u306E\u8FFD\u52A0 FileSeamPage12_Rename.WindowTitle=\u540D\u524D\u5909\u66F4 FileSeamPage12_Properties.Title=\u30D5\u30A1\u30A4\u30EB Seam \u30DA\u30FC\u30B8 Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta 2009-08-27 14:30:44 UTC (rev 17333) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta 2009-08-27 15:22:20 UTC (rev 17334) @@ -8,9 +8,11 @@ <PAIR name="SeamPage_1.2" value="FileSeamPage12"/> <PAIR name="SeamPage_2.0" value="FileSeamPage20"/> <PAIR name="SeamPage_2.1" value="FileSeamPage21"/> + <PAIR name="SeamPage_2.2" value="FileSeamPage22"/> <PAIR name="SeamPages1.2" value="FileSeamPages12"/> <PAIR name="SeamPages2.0" value="FileSeamPages20"/> <PAIR name="SeamPages2.1" value="FileSeamPages21"/> + <PAIR name="SeamPages2.2" value="FileSeamPages22"/> </MAPPING> <MAPPING name="FilteredTreeConstraints"> <PAIR name="FileSystems$144" value="org.jboss.tools.seam.pages.xml.model.impl.SeamPagesFilteredTreeConstraint"/> @@ -476,6 +478,160 @@ <XDependencies/> </XModelEntity> <XModelEntity + ImplementationLoadingClass="org.jboss.tools.seam.pages.xml.model.SeamPageFileLoader" + ImplementingClass="org.jboss.tools.seam.pages.xml.model.FileSeamPageImpl" + ObjectEditorClass="%XML%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData" + XMLSUBPATH="page" name="FileSeamPage22"> + <XChildrenEntities> + <XChildEntity name="SeamPageParam20"/> + <XChildEntity name="SeamPageHeader21"/> + <XChildEntity name="SeamPageRewrite21"/> + <XChildEntity maxCount="1" name="SeamPageBeginConversation21"/> + <XChildEntity maxCount="1" name="SeamPageEndConversation21"/> + <XChildEntity maxCount="1" name="SeamPageStartTask"/> + <XChildEntity maxCount="1" name="SeamPageBeginTask"/> + <XChildEntity maxCount="1" name="SeamPageEndTask"/> + <XChildEntity maxCount="1" name="SeamPageCreateProcess"/> + <XChildEntity maxCount="1" name="SeamPageResumeProcess"/> + <XChildEntity name="SeamPageIn"/> + <XChildEntity maxCount="1" name="SeamPageRaiseEvent20"/> + <XChildEntity name="SeamPageAction21"/> + <XChildEntity name="SeamPageNavigation21"/> + <XChildEntity name="SeamPageNavigationRule21"/> + </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"/> + <XModelAttributeReference + attributes="action,view id,switch,no conversation view id,conversation required,login required,scheme,timeout,bundle,conversation,restrict,description" + entity="SeamPage12" name="page"/> + <XModelAttribute PROPERTIES="category=advanced" + name="concurrent request timeout" xmlname="concurrent-request-timeout"/> + <XModelAttribute PROPERTIES="category=advanced" + default="default(true)" name="validate model" xmlname="validate-model"> + <Constraint loader="ListString"> + <value name="default(false)"/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced" name="expires" xmlname="expires"/> + <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/pages" 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/pages http://jboss.com/products/seam/pages-2.2.xsd" + name="xsi:schemaLocation" xmlname="xsi:schemaLocation"/> + <XModelAttribute name="encoding"> + <Constraint loader="ListString"> + <value name="ISO-8859-1"/> + <value name="UTF-8"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + </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> + <XActionItemReference entity="SeamPage21" name="CreateActions" path="CreateActions"/> + <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="FileSeamPage22_EditorActionList"> + <XChildrenEntities/> + <XEntityRenderer/> + <XModelAttributes/> + <XActionItem kind="list"> + <XActionItemReference entity="SeamPage21" name="CreateActions" path="CreateActions"/> + <XActionItemReference entity="SeamPage21" name="Properties" path="Properties"/> + <XActionItemReference entity="SeamPage21" name="VerifyActions" path="VerifyActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementationLoadingClass="org.jboss.tools.seam.pages.xml.model.SeamPages12FileLoader" ImplementingClass="org.jboss.tools.seam.pages.xml.model.FileSeamPagesImpl" ObjectEditorClass="%XML%" @@ -935,6 +1091,156 @@ </XActionItem> <XDependencies/> </XModelEntity> + <XModelEntity + ImplementationLoadingClass="org.jboss.tools.seam.pages.xml.model.SeamPagesFileLoader" + ImplementingClass="org.jboss.tools.seam.pages.xml.model.FileSeamPagesImpl" + ObjectEditorClass="%XML%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData" + XMLSUBPATH="pages" name="FileSeamPages22"> + <XChildrenEntities> + <XChildEntity maxCount="1" name="SeamPageFolderConversation" required="yes"/> + <XChildEntity maxCount="1" name="SeamPageFolderPage22" required="yes"/> + <XChildEntity maxCount="1" name="SeamPageFolderException21" required="yes"/> + <XChildEntity maxCount="1" name="SeamPagesDiagram" required="yes"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam.file" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="pages configuration" 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> + <XModelAttributeReference + attributes="no conversation view id,login view id" + entity="FileSeamPages12" name="page2"/> + <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"> + <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/pages" 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/pages http://jboss.com/products/seam/pages-2.1.xsd" + 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> + </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="%Redirect%" + ICON="action.new.struts.webapp.res_ref" + PROPERTIES="validator.add=true;sourcepath=Pages;actionpath=CreateActions/AddPage" + WizardClassName="%Default%" displayName="Page..." kind="action" name="AddPage"/> + <XActionItem HandlerClassName="%Redirect%" + ICON="action.new.struts.webapp.res_ref" + PROPERTIES="validator.add=true;sourcepath=Conversations;actionpath=CreateActions/AddConversation" + WizardClassName="%Default%" displayName="Conversation..." + kind="action" name="AddConversation"/> + <XActionItem HandlerClassName="%Redirect%" + ICON="action.new.struts.webapp.res_ref" + PROPERTIES="validator.add=true;sourcepath=Exceptions;actionpath=CreateActions/AddException" + WizardClassName="%Default%" displayName="Exception..." + kind="action" name="AddException"/> + </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="FileSeamPages22_EditorActionList"> + <XChildrenEntities/> + <XEntityRenderer/> + <XModelAttributes/> + <XActionItem kind="list"> + <XActionItemReference entity="FileSeamPages22" name="CreateActions" path="CreateActions"/> + <XActionItemReference entity="FileSeamPages21" name="Properties" path="Properties"/> + <XActionItemReference entity="FileSeamPages21" name="VerifyActions" path="VerifyActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> <XModelEntity ImplementingClass="%Custom%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData;children=%Ordered%" XMLSUBPATH="page" name="SeamPage12"> @@ -1345,6 +1651,148 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData;children=%Ordered%" + XMLSUBPATH="page" name="SeamPage22"> + <XChildrenEntities> + <XChildEntity name="SeamPageParam20"/> + <XChildEntity name="SeamPageHeader21"/> + <XChildEntity name="SeamPageRewrite21"/> + <XChildEntity maxCount="1" name="SeamPageBeginConversation21"/> + <XChildEntity maxCount="1" name="SeamPageEndConversation21"/> + <XChildEntity maxCount="1" name="SeamPageStartTask"/> + <XChildEntity maxCount="1" name="SeamPageBeginTask"/> + <XChildEntity maxCount="1" name="SeamPageEndTask"/> + <XChildEntity maxCount="1" name="SeamPageCreateProcess"/> + <XChildEntity maxCount="1" name="SeamPageResumeProcess"/> + <XChildEntity name="SeamPageIn"/> + <XChildEntity maxCount="1" name="SeamPageRaiseEvent20"/> + <XChildEntity name="SeamPageAction21"/> + <XChildEntity name="SeamPageNavigation21"/> + <XChildEntity name="SeamPageNavigationRule21"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam-pages.page" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="page" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttributeReference + attributes="action,view id,switch,no conversation view id,conversation required,login required,scheme,timeout,bundle,conversation,restrict,description" + entity="SeamPage12" name="page"/> + <XModelAttribute PROPERTIES="category=advanced" + name="concurrent request timeout" xmlname="concurrent-request-timeout"/> + <XModelAttribute PROPERTIES="category=advanced" + default="default(true)" name="validate model" xmlname="validate-model"> + <Constraint loader="ListString"> + <value name="default(false)"/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced" name="expires" xmlname="expires"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem displayName="New" group="1" kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true;key=SeamPage_AddParam" + WizardClassName="%Default%" displayName="Param..." kind="action" name="AddParam"> + <EntityData EntityName="SeamPageParam20"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="value" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true;key=SeamPage_AddParam" + WizardClassName="%Default%" displayName="Header..." kind="action" name="AddHeader"> + <EntityData EntityName="SeamPageHeader21"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="value" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true;key=SeamPage_AddParam" + WizardClassName="%Default%" displayName="Rewrite..." kind="action" name="AddRewrite"> + <EntityData EntityName="SeamPageRewrite21"> + <AttributeData AttributeName="pattern"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true;key=SeamPage_AddIn" + WizardClassName="%Default%" displayName="In..." kind="action" name="AddIn"> + <EntityData EntityName="SeamPageIn"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="scope" Mandatory="no"/> + <AttributeData AttributeName="value"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true;key=SeamPage_AddAction" + WizardClassName="%Default%" displayName="Action..." kind="action" name="AddAction"> + <EntityData EntityName="SeamPageAction21"> + <AttributeData AttributeName="execute"/> + <AttributeData AttributeName="if" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true;key=SeamPage_AddNavigation" + WizardClassName="%Default%" displayName="Navigation..." + kind="action" name="AddNavigation"> + <EntityData EntityName="SeamPageNavigation21"> + <AttributeData AttributeName="from action" Mandatory="no"/> + <AttributeData AttributeName="evaluate" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem + HandlerClassName="org.jboss.tools.seam.pages.xml.model.handlers.AddRuleHandler" + ICON="action.empty" + PROPERTIES="validator.add=true;entity=SeamPageNavigationRule21;renderEntity=SeamPageRender;redirectEntity=SeamPageRedirect21;key=SeamPage_AddRule" + WizardClassName="%Default%" displayName="Navigation Rule..." + kind="action" name="AddRule"> + <EntityData EntityName="AddSeamPageRule"> + <AttributeData AttributeName="kind" Mandatory="no"/> + <AttributeData AttributeName="view id"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> + <XActionItem HIDE="disabled" + HandlerClassName="org.jboss.tools.seam.pages.xml.model.handlers.OpenPageHandler" + ICON="action.empty" PROPERTIES="actionpath=Open" + displayName="Open Page" kind="action" name="OpenPage"/> + <XActionItem HIDE="disabled" + HandlerClassName="org.jboss.tools.seam.pages.xml.model.handlers.SelectOnDiagramHandler" + ICON="action.empty" displayName="Select on Diagram" kind="action" name="Select"/> + <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="%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.SeamXMLFormLayoutData" XMLSUBPATH="action" name="SeamPageAction"> <XChildrenEntities/> @@ -2324,6 +2772,45 @@ </XActionItem> <XDependencies/> </XModelEntity> + <XModelEntity ImplementingClass="%Ordered%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData" name="SeamPageFolderPage22"> + <XChildrenEntities> + <XChildEntity name="SeamPage22"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="default.folder" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="page list" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute default="Pages" name="name" xmlname="NAME"> + <Editor name="Uneditable"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <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="Page..." kind="action" name="AddPage"> + <EntityData EntityName="SeamPage22"> + <AttributeData AttributeName="view id"/> + <AttributeData AttributeName="action" Mandatory="no"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItemReference entity="SeamPageFolderPage20" + name="CopyActions" path="CopyActions"/> + <XActionItemReference entity="SeamPageFolderPage20" + name="DeleteActions" path="DeleteActions"/> + <XActionItemReference entity="SeamPageFolderPage20" name="Properties" path="Properties"/> + </XActionItem> + <XDependencies/> + </XModelEntity> <XModelEntity ImplementingClass="org.jboss.tools.seam.pages.xml.model.impl.SeamPageHTTPErrorImpl" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData;children=%Ordered%" @@ -4282,6 +4769,8 @@ <XChildEntity name="FileSeamPage20"/> <XChildEntity name="FileSeamPage21"/> <XChildEntity name="FileSeamPages21"/> + <XChildEntity name="FileSeamPage22"/> + <XChildEntity name="FileSeamPages22"/> </XChildrenEntities> <XActionItem kind="list"> <XActionItem ICON="action.empty" displayName="New" group="1" @@ -4324,6 +4813,8 @@ <XChildEntity name="FileSeamPage20"/> <XChildEntity name="FileSeamPage21"/> <XChildEntity name="FileSeamPages21"/> + <XChildEntity name="FileSeamPage22"/> + <XChildEntity name="FileSeamPages22"/> </XChildrenEntities> <XActionItem kind="list"> <XActionItem ICON="action.empty" displayName="New" group="1" @@ -4366,6 +4857,8 @@ <XChildEntity name="FileSeamPage20"/> <XChildEntity name="FileSeamPage21"/> <XChildEntity name="FileSeamPages21"/> + <XChildEntity name="FileSeamPage22"/> + <XChildEntity name="FileSeamPages22"/> </XChildrenEntities> <XActionItem kind="list"/> </XEntityExtension> @@ -4377,6 +4870,8 @@ <XChildEntity name="FileSeamPage20"/> <XChildEntity name="FileSeamPage21"/> <XChildEntity name="FileSeamPages21"/> + <XChildEntity name="FileSeamPage22"/> + <XChildEntity name="FileSeamPages22"/> </XChildrenEntities> <XActionItem kind="list"/> </XEntityExtension> Added: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/schemas/pages-2.2.xsd =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/schemas/pages-2.2.xsd (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/schemas/pages-2.2.xsd 2009-08-27 15:22:20 UTC (rev 17334) @@ -0,0 +1,643 @@ +<?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/pages" + xmlns:pages="http://jboss.com/products/seam/pages"> + + <xs:annotation> + <xs:documentation>About this format ...</xs:documentation> + </xs:annotation> + + <xs:element name="pages"> + <xs:annotation> + <xs:documentation>The root of a pages.xml file</xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="pages:conversation"/> + <xs:element ref="pages:page"/> + <xs:element ref="pages:exception"/> + </xs:choice> + <xs:attributeGroup ref="pages:attlist.pages"/> + </xs:complexType> + <xs:key name="conversation-key"> + <xs:annotation> + <xs:documentation><p>You can read this as:</p> + <p>The pages element has a bunch of conversation elements, and for each of those conversation elements, they must have a unique name within this document.</p> + </xs:documentation> + </xs:annotation> + <xs:selector xpath="conversation"/> + <xs:field xpath="name"/> + </xs:key> + </xs:element> + + <xs:attributeGroup name="attlist.pages"> + <xs:attribute name="no-conversation-view-id" type="pages:view-id" /> + <xs:attribute name="login-view-id" type="pages:view-id"/> + <xs:attribute name="http-port" type="xs:unsignedLong"/> + <xs:attribute name="https-port" type="xs:unsignedLong"/> + </xs:attributeGroup> + + <xs:element name="exception"> + <xs:annotation> + <xs:documentation>A Seam exception handler</xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" ref="pages:end-conversation"/> + <xs:choice> + <xs:element ref="pages:http-error"/> + <xs:element ref="pages:redirect"/> + </xs:choice> + </xs:sequence> + <xs:attributeGroup ref="pages:attlist.exception"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.exception"> + <xs:attribute name="class" type="xs:token"/> + <xs:attribute name="log" type="pages:tf-boolean"/> + <xs:attribute name="log-level" type="pages:loglevel-values"/> + + <!-- The logLevel attribute is deprecated and will be removed in the next major version! Please use log-level instead --> + <xs:attribute name="logLevel" type="pages:loglevel-values"/> + </xs:attributeGroup> + + <xs:element name="conversation"> + <xs:annotation> + <xs:documentation>Natural conversation configuration</xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:attributeGroup ref="pages:attlist.conversation"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.conversation"> + <xs:attribute name="name" use="required" type="xs:token" /> + <xs:attribute name="parameter-name" use="required" type="xs:token" /> + <xs:attribute name="parameter-value" type="xs:token" /> + </xs:attributeGroup> + + <xs:element name="page"> + <xs:annotation> + <xs:documentation>Configuration for a specific page or set up pages</xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="pages:restrict"/> + <xs:element ref="pages:description"/> + <xs:element ref="pages:param"/> + <xs:element ref="pages:header" /> + <xs:element ref="pages:rewrite" /> + <xs:element ref="pages:begin-conversation"/> + <xs:element ref="pages:end-conversation"/> + <xs:element ref="pages:start-task"/> + <xs:element ref="pages:begin-task"/> + <xs:element ref="pages:end-task"/> + <xs:element ref="pages:create-process"/> + <xs:element ref="pages:resume-process"/> + <xs:element ref="pages:in"/> + <xs:element ref="pages:raise-event"/> + <xs:element ref="pages:action"/> + <xs:element ref="pages:navigation"/> + </xs:choice> + <xs:attributeGroup ref="pages:attlist.page"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.page"> + <xs:attribute name="action" type="xs:token" /> + <xs:attribute name="view-id" type="pages:view-id"/> + <xs:attribute name="switch" default="enabled" type="pages:ableness"/> + <xs:attribute name="no-conversation-view-id" type="pages:view-id" /> + <xs:attribute name="conversation-required" default="false" type="pages:tf-boolean"/> + <xs:attribute name="login-required" default="false" type="pages:tf-boolean"/> + <xs:attribute name="scheme" type="pages:schemes" /> + <xs:attribute name="timeout" type="xs:unsignedLong" /> + <xs:attribute name="concurrent-request-timeout" type="xs:unsignedLong" > + <xs:annotation> + <xs:documentation> + Requests to conversations are serialized by default, and if + a lock cannot be acquired in time, the request will be + dropped. You can set the timeout on a page-by-page basis + here. + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="bundle" type="xs:token" /> + <xs:attribute name="conversation" type="xs:token" /> + <xs:attribute name="expires" type="xs:unsignedLong" /> + <xs:attribute name="validate-model" default="true" type="pages:tf-boolean"/> + </xs:attributeGroup> + + <xs:element name="param"> + <xs:annotation> + <xs:documentation>A page parameter</xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:attributeGroup ref="pages:attlist.param"/> + </xs:complexType> + </xs:element> + + <xs:attributeGroup name="attlist.param"> + <xs:attribute name="name" type="xs:token" /> + <xs:attribute name="value" type="xs:token" /> + <xs:attribute name="converter" type="xs:token" /> + <xs:attribute name="converterId" type="xs:token" /> + <xs:attribute name="validator" type="xs:token" /> + <xs:attribute name="validatorId" type="xs:token" /> + <xs:attribute name="required" type="pages:tf-boolean"/> + <xs:attribute name="validateModel" default="true" type="pages:tf-boolean"/> + </xs:attributeGroup> + + <xs:element name="header"> + <xs:annotation> + <xs:documentation>HTTP headers to be added</xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:attributeGroup ref="pages:attlist.header"/> + </xs:complexType> + </xs:element> + + <xs:attributeGroup name="attlist.header"> + <xs:attribute name="name" use="required" type="xs:token" /> + <xs:attribute name="value" type="xs:token" /> + </xs:attributeGroup> + + <xs:element name="rewrite"> + <xs:annotation> + <xs:documentation>URL rewriting pattern for this view</xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:attributeGroup ref="pages:attlist.rewrite"/> + </xs:complexType> + </xs:element> + + <xs:attributeGroup name="attlist.rewrite"> + <xs:attribute name="pattern" use="required" type="xs:token" /> + </xs:attributeGroup> + + <xs:element name="action"> + <xs:annotation> + <xs:documentation>Page action</xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:attributeGroup ref="pages:attlist.action"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.action"> + <xs:attribute name="if" type="pages:boolean-value-expression" /> + <xs:attribute name="on-postback" default="true" type="pages:tf-boolean"/> + <xs:attribute name="execute" use="required" type="pages:method-expression" /> + </xs:attributeGroup> + + <xs:element name="restrict" type="pages:boolean-value-expression" default="true"> + <xs:annotation> + <xs:documentation>Security restrictions</xs:documentation> + </xs:annotation> + </xs:element> + + <xs:element name="navigation"> + <xs:annotation> + <xs:documentation>Page navigation</xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:choice maxOccurs="2"> + <xs:sequence> + <xs:choice minOccurs="0"> + <xs:element ref="pages:begin-conversation"/> + <xs:element ref="pages:end-conversation"/> + <xs:element ref="pages:start-task"/> + <xs:element ref="pages:begin-task"/> + <xs:element ref="pages:end-task"/> + <xs:element ref="pages:create-process"/> + <xs:element ref="pages:resume-process"/> + </xs:choice> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="pages:out"/> + <xs:element minOccurs="0" ref="pages:raise-event" maxOccurs="1"/> + <xs:choice minOccurs="0"> + <xs:element ref="pages:render"/> + <xs:element ref="pages:redirect"/> + </xs:choice> + </xs:sequence> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="pages:rule"/> + </xs:choice> + <xs:attributeGroup ref="pages:attlist.navigation"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.navigation"> + <xs:attribute name="from-action" type="pages:from-action-expression" /> + <xs:attribute name="evaluate" type="pages:method-expression" /> + </xs:attributeGroup> + + <xs:element name="rule"> + <xs:complexType> + <xs:sequence> + <xs:choice minOccurs="0"> + <xs:element ref="pages:begin-conversation"/> + <xs:element ref="pages:end-conversation"/> + <xs:element ref="pages:start-task"/> + <xs:element ref="pages:begin-task"/> + <xs:element ref="pages:end-task"/> + <xs:element ref="pages:create-process"/> + <xs:element ref="pages:resume-process"/> + </xs:choice> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="pages:out"/> + <xs:element minOccurs="0" ref="pages:raise-event"/> + <xs:choice minOccurs="0"> + <xs:element ref="pages:render"/> + <xs:element ref="pages:redirect"/> + </xs:choice> + </xs:sequence> + <xs:attributeGroup ref="pages:attlist.rule"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.rule"> + <xs:attribute name="if-outcome" type="pages:outcome-expression" /> + <xs:attribute name="if" type="pages:boolean-value-expression" /> + </xs:attributeGroup> + + <xs:element name="raise-event"> + <xs:annotation> + <xs:documentation>Event to be raised</xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:attributeGroup ref="pages:attlist.raise-event"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.raise-event"> + <xs:attribute name="type" use="required" type="xs:token" /> + </xs:attributeGroup> + + <xs:element name="begin-conversation"> + <xs:annotation> + <xs:documentation>This page begins a new conversation</xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:attributeGroup ref="pages:attlist.begin-conversation"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.begin-conversation"> + <xs:attribute name="join" default="false" type="pages:tf-boolean"/> + <xs:attribute name="nested" default="false" type="pages:tf-boolean"/> + <xs:attribute name="pageflow" type="xs:token" /> + <xs:attribute name="flush-mode" type="pages:flush-modes" /> + <xs:attribute name="if" type="pages:boolean-value-expression" /> + <xs:attribute name="conversation" type="xs:token" /> + </xs:attributeGroup> + + <xs:element name="end-conversation"> + <xs:annotation> + <xs:documentation>This page ends a conversation</xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:attributeGroup ref="pages:attlist.end-conversation"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.end-conversation"> + <xs:attribute name="before-redirect" default="false" type="pages:tf-boolean"/> + <xs:attribute name="root" default="false" type="pages:tf-boolean"/> + <xs:attribute name="if" type="pages:boolean-value-expression" /> + </xs:attributeGroup> + + <xs:element name="begin-task"> + <xs:annotation> + <xs:documentation>Begin a BPM task</xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:attributeGroup ref="pages:attlist.begin-task"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.begin-task"> + <xs:attribute name="task-id" type="xs:token" /> + <xs:attribute name="pageflow" type="xs:token" /> + <xs:attribute name="flush-mode" type="pages:flush-modes" /> + </xs:attributeGroup> + + <xs:element name="start-task"> + <xs:annotation> + <xs:documentation>Start a BPM task</xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:attributeGroup ref="pages:attlist.start-task"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.start-task"> + <xs:attribute name="task-id" type="xs:token" /> + <xs:attribute name="pageflow" type="xs:token" /> + <xs:attribute name="flush-mode" type="pages:flush-modes" /> + </xs:attributeGroup> + + <xs:element name="end-task"> + <xs:annotation> + <xs:documentation>Add a BPM task</xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:attributeGroup ref="pages:attlist.end-task"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.end-task"> + <xs:attribute name="transition" type="xs:token" /> + <xs:attribute name="before-redirect" default="false" type="pages:tf-boolean" /> + </xs:attributeGroup> + + <xs:element name="create-process"> + <xs:annotation> + <xs:documentation>Create a BPM process</xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:attributeGroup ref="pages:attlist.create-process"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.create-process"> + <xs:attribute name="definition" type="xs:token" /> + </xs:attributeGroup> + + <xs:element name="resume-process"> + <xs:annotation> + <xs:documentation>Resume a BPM process instance</xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:attributeGroup ref="pages:attlist.resume-process"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.resume-process"> + <xs:attribute name="process-id" type="xs:token" /> + </xs:attributeGroup> + + <xs:element name="in"> + <xs:annotation> + <xs:documentation>A page input</xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:attributeGroup ref="pages:attlist.in"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.in"> + <xs:attribute name="name" use="required" type="xs:token" /> + <xs:attribute name="scope" type="pages:allowed-scopes" /> + <xs:attribute name="value" use="required" type="xs:token" /> + </xs:attributeGroup> + + <xs:element name="out"> + <xs:annotation> + <xs:documentation>A contextual output for a navigation rule</xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:attributeGroup ref="pages:attlist.out"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.out"> + <xs:attribute name="name" use="required" type="xs:token" /> + <xs:attribute name="scope" default="CONVERSATION" type="pages:allowed-scopes" /> + <xs:attribute name="value" use="required" type="xs:token" /> + </xs:attributeGroup> + + <xs:element name="render"> + <xs:annotation> + <xs:documentation>Render a view</xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" ref="pages:message"/> + </xs:sequence> + <xs:attributeGroup ref="pages:attlist.render"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.render"> + <xs:attribute name="view-id" type="pages:view-id-expression" /> + </xs:attributeGroup> + + <xs:element name="redirect"> + <xs:annotation> + <xs:documentation>Redirect to another view or URL</xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" ref="pages:message"/> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="pages:param"/> + </xs:sequence> + + <xs:attributeGroup ref="pages:attlist.redirect"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.redirect"> + <xs:attribute name="view-id" type="pages:view-id-expression" /> + <xs:attribute name="url" type="pages:url-expression" /> + <xs:attribute name="include-page-params" type="pages:tf-boolean" /> + </xs:attributeGroup> + + <xs:element name="http-error"> + <xs:annotation> + <xs:documentation>Send an HTTP error code</xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" ref="pages:message"/> + </xs:sequence> + <xs:attributeGroup ref="pages:attlist.http-error"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.http-error"> + <xs:attribute name="error-code" use="required" type="xs:unsignedLong" /> + </xs:attributeGroup> + + <xs:element name="message"> + <xs:annotation> + <xs:documentation>Add a message to the faces messages</xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:simpleContent> + <xs:extension base="xs:string"> + <xs:attributeGroup ref="pages:attlist.message"/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.message"> + <xs:attribute name="for" type="xs:token"/> + <xs:attribute name="severity" default="INFO" type="pages:loglevel-values" /> + </xs:attributeGroup> + + <xs:element name="description" type="xs:string"> + <xs:annotation> + <xs:documentation>A page description for workflow switching</xs:documentation> + </xs:annotation> + </xs:element> + + <xs:simpleType name="url"> + <xs:restriction base="xs:anyURI"> + <xs:pattern value="http://.*|https://.*"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="url-expression"> + <xs:union memberTypes="pages:url pages:method-expression"></xs:union> + </xs:simpleType> + + <xs:simpleType name="schemes"> + <xs:restriction base="xs:token"> + <xs:enumeration value="https"/> + <xs:enumeration value="http"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="outcome"> + <xs:restriction base="xs:string"> + <xs:pattern value="[^#\{\}]+"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="view-id"> + <xs:restriction base="xs:string"> + <xs:pattern value="(/.*)|\*"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="view-id-expression"> + <xs:union memberTypes="pages:view-id pages:value-expression"></xs:union> + </xs:simpleType> + + <xs:simpleType name="outcome-expression"> + <xs:union memberTypes="pages:outcome pages:value-expression"></xs:union> + </xs:simpleType> + + <xs:simpleType name="from-action-expression"> + <xs:union memberTypes="pages:outcome pages:method-expression"></xs:union> + </xs:simpleType> + + <xs:simpleType name="ableness"> + <xs:restriction base="xs:token"> + <xs:enumeration value="enabled"/> + <xs:enumeration value="disabled"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="tf-boolean"> + <xs:annotation> + <xs:documentation> + <p>Allows for the following values:</p> + <ul> + <li>true</li> + <li>false</li> + </ul> + </xs:documentation> + </xs:annotation> + <xs:restriction base="xs:boolean"> + <xs:pattern value="true"/> + <xs:pattern value="false"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="allowed-scopes"> + <xs:restriction base="xs:token"> + <xs:enumeration value="stateless"/> + <xs:enumeration value="event"/> + <xs:enumeration value="page"/> + <xs:enumeration value="conversation"/> + <xs:enumeration value="session"/> + <xs:enumeration value="business_process"/> + <xs:enumeration value="application"/> + <xs:enumeration value="STATELESS"/> + <xs:enumeration value="EVENT"/> + <xs:enumeration value="PAGE"/> + <xs:enumeration value="CONVERSATION"/> + <xs:enumeration value="SESSION"/> + <xs:enumeration value="BUSINESS_PROCESS"/> + <xs:enumeration value="APPLICATION"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="loglevel-values"> + <xs:restriction base="xs:token"> + <xs:enumeration value="info"/> + <xs:enumeration value="warn"/> + <xs:enumeration value="error"/> + <xs:enumeration value="fatal"/> + <xs:enumeration value="debug"/> + <xs:enumeration value="trace"/> + <xs:enumeration value="INFO"/> + <xs:enumeration value="WARN"/> + <xs:enumeration value="ERROR"/> + <xs:enumeration value="FATAL"/> + <xs:enumeration value="DEBUG"/> + <xs:enumeration value="TRACE"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="http-error-codes"> + <xs:annotation> + <xs:documentation><p><b>Note:</b> These do not include the HTTP extensions.</p></xs:documentation> + </xs:annotation> + <xs:restriction base="xs:token"> + <xs:enumeration value="100"/> + <xs:enumeration value="101"/> + <xs:enumeration value="200"/> + <xs:enumeration value="201"/> + <xs:enumeration value="202"/> + <xs:enumeration value="203"/> + <xs:enumeration value="204"/> + <xs:enumeration value="205"/> + <xs:enumeration value="206"/> + <xs:enumeration value="300"/> + <xs:enumeration value="301"/> + <xs:enumeration value="302"/> + <xs:enumeration value="303"/> + <xs:enumeration value="304"/> + <xs:enumeration value="305"/> + <xs:enumeration value="306"/> + <xs:enumeration value="307"/> + <xs:enumeration value="400"/> + <xs:enumeration value="401"/> + <xs:enumeration value="402"/> + <xs:enumeration value="403"/> + <xs:enumeration value="404"/> + <xs:enumeration value="405"/> + <xs:enumeration value="406"/> + <xs:enumeration value="407"/> + <xs:enumeration value="408"/> + <xs:enumeration value="409"/> + <xs:enumeration value="410"/> + <xs:enumeration value="411"/> + <xs:enumeration value="412"/> + <xs:enumeration value="413"/> + <xs:enumeration value="414"/> + <xs:enumeration value="415"/> + <xs:enumeration value="416"/> + <xs:enumeration value="417"/> + <xs:enumeration value="500"/> + <xs:enumeration value="501"/> + <xs:enumeration value="502"/> + <xs:enumeration value="503"/> + <xs:enumeration value="504"/> + <xs:enumeration value="505"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="flush-modes"> + <xs:restriction base="xs:token"> + <xs:enumeration value="manual"/> + <xs:enumeration value="auto"/> + <xs:enumeration value="commit"/> + <xs:enumeration value="MANUAL"/> + <xs:enumeration value="AUTO"/> + <xs:enumeration value="COMMIT"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="method-expression"> + <xs:restriction base="xs:token"> + <xs:pattern value="#\{.*\}"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="value-expression"> + <xs:restriction base="xs:token"> + <xs:pattern value="#\{.*\}"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="boolean-value-expression"> + <xs:restriction base="xs:token"> + <xs:pattern value="true|false|#\{.*\}"/> + </xs:restriction> + </xs:simpleType> + +</xs:schema> Property changes on: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/schemas/pages-2.2.xsd ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesConstants.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesConstants.java 2009-08-27 14:30:44 UTC (rev 17333) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesConstants.java 2009-08-27 15:22:20 UTC (rev 17334) @@ -18,6 +18,7 @@ public String SUFF_12 = "12"; //$NON-NLS-1$ public String SUFF_20 = "20"; //$NON-NLS-1$ public String SUFF_21 = "21"; //$NON-NLS-1$ + public String SUFF_22 = "22"; //$NON-NLS-1$ public String ENT_FILE_SEAM_PAGES = "FileSeamPages"; //$NON-NLS-1$ public String ENT_FILE_SEAM_PAGES_12 = ENT_FILE_SEAM_PAGES + SUFF_12; public String ENT_FILE_SEAM_PAGE = "FileSeamPage"; //$NON-NLS-1$ @@ -26,6 +27,8 @@ public String ENT_FILE_SEAM_PAGE_20 = ENT_FILE_SEAM_PAGE + SUFF_20; public String ENT_FILE_SEAM_PAGES_21 = ENT_FILE_SEAM_PAGES + SUFF_21; public String ENT_FILE_SEAM_PAGE_21 = ENT_FILE_SEAM_PAGE + SUFF_21; + public String ENT_FILE_SEAM_PAGES_22 = ENT_FILE_SEAM_PAGES + SUFF_22; + public String ENT_FILE_SEAM_PAGE_22 = ENT_FILE_SEAM_PAGE + SUFF_22; public String ENT_SEAM_PAGE = "SeamPage"; //$NON-NLS-1$ public String ENT_SEAM_PAGE_12 = ENT_SEAM_PAGE + SUFF_12; Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesEntityRecognizer.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesEntityRecognizer.java 2009-08-27 14:30:44 UTC (rev 17333) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesEntityRecognizer.java 2009-08-27 15:22:20 UTC (rev 17334) @@ -38,8 +38,10 @@ return p.isSingle ? ENT_FILE_SEAM_PAGE_12 : ENT_FILE_SEAM_PAGES_12; } else if(p.is20) { return p.isSingle ? ENT_FILE_SEAM_PAGE_20 : ENT_FILE_SEAM_PAGES_20; + } else if(p.is21) { + return p.isSingle ? ENT_FILE_SEAM_PAGE_21 : ENT_FILE_SEAM_PAGES_21; } else { - return p.isSingle ? ENT_FILE_SEAM_PAGE_21 : ENT_FILE_SEAM_PAGES_21; + return p.isSingle ? ENT_FILE_SEAM_PAGE_22 : ENT_FILE_SEAM_PAGES_22; } } @@ -48,6 +50,7 @@ boolean is12 = false; boolean isSingle = false; boolean is20 = false; + boolean is21 = false; Parser(String body) { int i = body.indexOf("<page"); //$NON-NLS-1$ @@ -66,6 +69,7 @@ return; } if(s.indexOf("2.0") >= 0) is20 = true; + if(s.indexOf("2.1") >= 0) is21 = true; } recognized = true; } Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesLoaderUtil.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesLoaderUtil.java 2009-08-27 14:30:44 UTC (rev 17333) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesLoaderUtil.java 2009-08-27 15:22:20 UTC (rev 17334) @@ -122,6 +122,8 @@ ? SUFF_20 : (entity.getName().endsWith(SUFF_21)) ? SUFF_21 + : (entity.getName().endsWith(SUFF_22)) + ? SUFF_22 : null; if(suff == null) { System.out.println("Unknown suffix in seam page entity " + entity.getName()); Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/DiagramAdopt.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/DiagramAdopt.java 2009-08-27 14:30:44 UTC (rev 17333) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/DiagramAdopt.java 2009-08-27 15:22:20 UTC (rev 17334) @@ -90,8 +90,10 @@ return SUFF_12; } else if(entity.endsWith(SUFF_20)) { return SUFF_20; + } else if(entity.endsWith(SUFF_21)) { + return SUFF_21; } else { - return SUFF_21; + return SUFF_22; } } Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java 2009-08-27 14:30:44 UTC (rev 17333) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java 2009-08-27 15:22:20 UTC (rev 17334) @@ -106,7 +106,7 @@ if(!entity.startsWith(ENT_NAVIGATION)) continue; if(entity.startsWith(ENT_NAVIGATION_RULE)) { addTarget(ns[j], true); - if(!entity.endsWith(SUFF_21)) { + if(!entity.endsWith(SUFF_21) && !entity.endsWith(SUFF_22)) { continue; } } @@ -305,7 +305,7 @@ if(result == null) result = new ArrayList<XModelObject>(); result.add(t); } - if(!entity.endsWith(SUFF_21)) { + if(!entity.endsWith(SUFF_21) && !entity.endsWith(SUFF_22)) { continue; } }