[jbosstools-commits] JBoss Tools SVN: r41837 - in branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.pages.xml: .settings and 3 other directories.

Author: scabanovich Date: 2012-06-08 15:37:13 -0400 (Fri, 08 Jun 2012) New Revision: 41837 Added: branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.pages.xml/.settings/ branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.pages.xml/.settings/org.eclipse.jdt.core.prefs Modified: branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.pages.xml/resources/help/keys-seam-pages.properties branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesConstants.java branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesEntityRecognizer.java Log: JBIDE-12132 https://issues.jboss.org/browse/JBIDE-12132 Support of pages.xml 2.3 with namespace http://jboss.org/schema/seam/pages Merge to 3.3.x Added: branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.pages.xml/.settings/org.eclipse.jdt.core.prefs =================================================================== --- branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.pages.xml/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.pages.xml/.settings/org.eclipse.jdt.core.prefs 2012-06-08 19:37:13 UTC (rev 41837) @@ -0,0 +1,8 @@ +#Fri Sep 30 12:13:51 PDT 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.5 Property changes on: branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.pages.xml/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.pages.xml/resources/help/keys-seam-pages.properties =================================================================== --- branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.pages.xml/resources/help/keys-seam-pages.properties 2012-06-08 19:31:33 UTC (rev 41836) +++ branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.pages.xml/resources/help/keys-seam-pages.properties 2012-06-08 19:37:13 UTC (rev 41837) @@ -2,6 +2,7 @@ FileSeamPage20.editorTitle=Seam Page Editor FileSeamPage21.editorTitle=Seam Page Editor FileSeamPage22.editorTitle=Seam Page Editor +FileSeamPage23.editorTitle=Seam Page Editor AddSeamPageException_Properties.Title=Add Exception @@ -54,6 +55,8 @@ FileSeamPages22_Properties.Title=File Seam Pages +FileSeamPages23_Properties.Title=File Seam Pages + SeamPage_AddParam.WindowTitle=Add Param SeamPage_AddParam.Title=Param Modified: branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta =================================================================== --- branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta 2012-06-08 19:31:33 UTC (rev 41836) +++ branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta 2012-06-08 19:37:13 UTC (rev 41837) @@ -9,10 +9,12 @@ <PAIR name="SeamPage_2.0" value="FileSeamPage20"/> <PAIR name="SeamPage_2.1" value="FileSeamPage21"/> <PAIR name="SeamPage_2.2" value="FileSeamPage22"/> + <PAIR name="SeamPage_2.3" value="FileSeamPage23"/> <PAIR name="SeamPages1.2" value="FileSeamPages12"/> <PAIR name="SeamPages2.0" value="FileSeamPages20"/> <PAIR name="SeamPages2.1" value="FileSeamPages21"/> <PAIR name="SeamPages2.2" value="FileSeamPages22"/> + <PAIR name="SeamPages2.3" value="FileSeamPages23"/> </MAPPING> <MAPPING name="FilteredTreeConstraints"> <PAIR name="FileSystems$144" value="org.jboss.tools.seam.pages.xml.model.impl.SeamPagesFilteredTreeConstraint"/> @@ -632,6 +634,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="FileSeamPage23"> + <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.org/schema/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.org/schema/seam/pages http://jboss.org/schema/seam/pages-2.3.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="FileSeamPage23_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%" @@ -1241,6 +1397,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="FileSeamPages23"> + <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.org/schema/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.org/schema/seam/pages http://jboss.org/schema/seam/pages-2.3.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="FileSeamPages23_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"> @@ -4771,6 +5077,8 @@ <XChildEntity name="FileSeamPages21"/> <XChildEntity name="FileSeamPage22"/> <XChildEntity name="FileSeamPages22"/> + <XChildEntity name="FileSeamPage23"/> + <XChildEntity name="FileSeamPages23"/> </XChildrenEntities> <XActionItem kind="list"> <XActionItem ICON="action.empty" displayName="New" group="1" @@ -4815,6 +5123,8 @@ <XChildEntity name="FileSeamPages21"/> <XChildEntity name="FileSeamPage22"/> <XChildEntity name="FileSeamPages22"/> + <XChildEntity name="FileSeamPage23"/> + <XChildEntity name="FileSeamPages23"/> </XChildrenEntities> <XActionItem kind="list"> <XActionItem ICON="action.empty" displayName="New" group="1" @@ -4859,6 +5169,8 @@ <XChildEntity name="FileSeamPages21"/> <XChildEntity name="FileSeamPage22"/> <XChildEntity name="FileSeamPages22"/> + <XChildEntity name="FileSeamPage23"/> + <XChildEntity name="FileSeamPages23"/> </XChildrenEntities> <XActionItem kind="list"/> </XEntityExtension> @@ -4872,6 +5184,8 @@ <XChildEntity name="FileSeamPages21"/> <XChildEntity name="FileSeamPage22"/> <XChildEntity name="FileSeamPages22"/> + <XChildEntity name="FileSeamPage23"/> + <XChildEntity name="FileSeamPages23"/> </XChildrenEntities> <XActionItem kind="list"/> </XEntityExtension> Modified: branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesConstants.java =================================================================== --- branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesConstants.java 2012-06-08 19:31:33 UTC (rev 41836) +++ branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesConstants.java 2012-06-08 19:37:13 UTC (rev 41837) @@ -19,6 +19,7 @@ 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 SUFF_23 = "23"; //$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$ @@ -29,6 +30,8 @@ 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_FILE_SEAM_PAGES_23 = ENT_FILE_SEAM_PAGES + SUFF_23; + public String ENT_FILE_SEAM_PAGE_23 = ENT_FILE_SEAM_PAGE + SUFF_23; public String ENT_SEAM_PAGE = "SeamPage"; //$NON-NLS-1$ public String ENT_SEAM_PAGE_12 = ENT_SEAM_PAGE + SUFF_12; Modified: branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesEntityRecognizer.java =================================================================== --- branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesEntityRecognizer.java 2012-06-08 19:31:33 UTC (rev 41836) +++ branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesEntityRecognizer.java 2012-06-08 19:37:13 UTC (rev 41837) @@ -47,6 +47,8 @@ Parser p = new Parser(body); if(!p.recognized) { return null; + } else if(p.isOrg) { + return p.isSingle ? ENT_FILE_SEAM_PAGE_23 : ENT_FILE_SEAM_PAGES_23; } else if(p.is20) { return p.isSingle ? ENT_FILE_SEAM_PAGE_20 : ENT_FILE_SEAM_PAGES_20; } else if(p.is21) { @@ -62,6 +64,7 @@ boolean isSingle = false; boolean is20 = false; boolean is21 = false; + boolean isOrg = false; Parser(String body) { int i = body.indexOf("<page"); //$NON-NLS-1$ @@ -73,7 +76,9 @@ int j = body.indexOf(">", i); //$NON-NLS-1$ if(j < 0) return; String s = body.substring(i, j); - if(s.indexOf("\"http://jboss.com/products/seam/pages\"") < 0) { //$NON-NLS-1$ + if(s.indexOf("\"http://jboss.org/schema/seam/pages\"") >= 0) { //$NON-NLS-1$ + isOrg = true; + } else if(s.indexOf("\"http://jboss.com/products/seam/pages\"") < 0) { //$NON-NLS-1$ return; } if(s.indexOf("2.0") >= 0) is20 = true;