Author: scabanovich Date: 2008-04-03 11:32:49 -0400 (Thu, 03 Apr 2008) New Revision: 7300 Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-async.meta 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-international.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-persistence.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-transaction.meta trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-web.meta trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/components-2.0.xsd trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/mail-2.0.xsd trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/security-2.0.xsd trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/web-2.0.xsd 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 Log: JBIDE-1749 Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-async.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-async.meta 2008-04-03 15:19:36 UTC (rev 7299) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-async.meta 2008-04-03 15:32:49 UTC (rev 7300) @@ -46,8 +46,8 @@ <XModelAttribute PROPERTIES="id=true;category=general" default="org.jboss.seam.async.dispatcher" name="name" xmlname="name"/> <XModelAttributeReference - attributes="class,scope,precedence,installed,auto-create" - entity="SeamComponent" name="component"/> + attributes="class,scope,precedence,installed,auto-create,startup" + entity="SeamComponent20" name="component"/> <XModelAttribute PROPERTIES="category=general" name="thread-pool-size" xmlname="thread-pool-size"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> @@ -94,8 +94,8 @@ <XModelAttribute PROPERTIES="id=true;category=general" default="org.jboss.seam.async.dispatcher" name="name" xmlname="name"/> <XModelAttributeReference - attributes="class,scope,precedence,installed,auto-create" - entity="SeamComponent" name="component"/> + attributes="class,scope,precedence,installed,auto-create,startup" + entity="SeamComponent20" name="component"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> </XModelAttribute> @@ -141,8 +141,8 @@ <XModelAttribute PROPERTIES="id=true;category=general" default="org.jboss.seam.async.dispatcher" name="name" xmlname="name"/> <XModelAttributeReference - attributes="class,scope,precedence,installed,auto-create,jndi-name" - entity="SeamComponent" name="component"/> + attributes="class,scope,precedence,installed,auto-create,jndi-name,startup" + entity="SeamComponent20" name="component"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> </XModelAttribute> 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 2008-04-03 15:19:36 UTC (rev 7299) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-components.meta 2008-04-03 15:32:49 UTC (rev 7300) @@ -272,8 +272,8 @@ <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"/> + attributes="class,scope,precedence,installed,auto-create,jndi-name,startup" + entity="SeamComponent20" name="component"/> <XModelAttribute default="xml" name="extension" xmlname="EXTENSION"> <Editor name="Uneditable"/> </XModelAttribute> @@ -306,6 +306,15 @@ </Constraint> <Editor name="ListString"/> </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced" + default="default(false)" name="startup" xmlname="startup"> + <Constraint loader="ListString"> + <value name="default(false)"/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> </XModelAttributes> <XActionItem kind="list"> <XActionItem BaseActionName="Open" HandlerClassName="%Open%" @@ -814,7 +823,7 @@ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData" XMLSUBPATH="components" name="FileSeamComponents20"> <XChildrenEntities> - <XChildEntity name="SeamComponent"/> + <XChildEntity name="SeamComponent20"/> <XChildEntity name="SeamFactory20"/> <XChildEntity name="SeamEvent20"/> <XChildEntity name="SeamImport"/> @@ -903,7 +912,7 @@ ICON="action.new.struts.webapp.res_ref" PROPERTIES="validator.add=true" WizardClassName="%Default%" displayName="Component..." kind="action" name="AddComponent"> - <EntityData EntityName="SeamComponent"> + <EntityData EntityName="SeamComponent20"> <AttributeData AttributeName="name"/> <AttributeData AttributeName="class" Mandatory="no"/> </EntityData> @@ -967,7 +976,7 @@ ICON="action.new.struts.webapp.res_ref" PROPERTIES="validator.add=true" WizardClassName="%Default%" displayName="Component..." kind="action" name="AddComponent"> - <EntityData EntityName="SeamComponent"> + <EntityData EntityName="SeamComponent20"> <AttributeData AttributeName="name"/> <AttributeData AttributeName="class" Mandatory="no"/> </EntityData> @@ -1133,8 +1142,8 @@ <Editor name="List"/> </XModelAttribute> <XModelAttribute PROPERTIES="category=advanced" name="precedence" xmlname="precedence"/> - <XModelAttribute PROPERTIES="category=advanced" default="default(true)" - name="installed" xmlname="installed"> + <XModelAttribute PROPERTIES="category=advanced" + default="default(true)" name="installed" xmlname="installed"> <Constraint loader="ListString"> <value name="default(true)"/> <value name="true"/> @@ -1142,8 +1151,8 @@ </Constraint> <Editor name="ListString"/> </XModelAttribute> - <XModelAttribute PROPERTIES="category=advanced" default="default(false)" - name="auto-create" xmlname="auto-create"> + <XModelAttribute PROPERTIES="category=advanced" + default="default(false)" name="auto-create" xmlname="auto-create"> <Constraint loader="ListString"> <value name="default(false)"/> <value name="true"/> @@ -1210,6 +1219,134 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData;children=%Ordered%" + XMLSUBPATH="component" name="SeamComponent20"> + <XChildrenEntities> + <XChildEntity name="SeamProperty"/> + <XChildEntity name="SeamPropertyList"/> + <XChildEntity name="SeamPropertyMap"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam.component" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="component" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </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"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="scope" xmlname="scope"> + <Constraint loader="List"> + <value/> + <value name="stateless"/> + <value name="event"/> + <value name="page"/> + <value name="conversation"/> + <value name="session"/> + <value name="business_process"/> + <value name="application"/> + <value name="STATELESS"/> + <value name="EVENT"/> + <value name="PAGE"/> + <value name="CONVERSATION"/> + <value name="SESSION"/> + <value name="BUSINESS_PROCESS"/> + <value name="APPLICATION"/> + </Constraint> + <Editor name="List"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced" name="precedence" xmlname="precedence"/> + <XModelAttribute PROPERTIES="category=advanced" + default="default(true)" name="installed" xmlname="installed"> + <Constraint loader="ListString"> + <value name="default(true)"/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced" + default="default(false)" name="auto-create" xmlname="auto-create"> + <Constraint loader="ListString"> + <value name="default(false)"/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced" + default="default(false)" name="startup" xmlname="startup"> + <Constraint loader="ListString"> + <value name="default(false)"/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced" name="jndi-name" xmlname="jndi-name"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" 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" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Add List Property..." kind="action" name="AddListProperty"> + <EntityData EntityName="SeamPropertyList"> + <AttributeData AttributeName="name"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" 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" displayName="Create" kind="list" name="EditActions"/> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + <XActionItem 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="event" name="SeamEvent"> <XChildrenEntities> @@ -1354,8 +1491,8 @@ <Editor name="List"/> </XModelAttribute> <XModelAttribute PROPERTIES="category=advanced" name="method" xmlname="method"/> - <XModelAttribute PROPERTIES="category=advanced" default="default(false)" - name="auto-create" xmlname="auto-create"> + <XModelAttribute PROPERTIES="category=advanced" + default="default(false)" name="auto-create" xmlname="auto-create"> <Constraint loader="ListString"> <value name="default(false)"/> <value name="true"/> @@ -1407,8 +1544,8 @@ <XModelAttributeReference attributes="name,value,scope,method,auto-create,comment" entity="SeamFactory" name="factory"/> - <XModelAttribute PROPERTIES="category=advanced" default="default(false)" - name="startup" xmlname="startup"> + <XModelAttribute PROPERTIES="category=advanced" + default="default(false)" name="startup" visibility="false" xmlname="startup"> <Constraint loader="ListString"> <value name="default(false)"/> <value name="true"/> 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 2008-04-03 15:19:36 UTC (rev 7299) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-core.meta 2008-04-03 15:32:49 UTC (rev 7300) @@ -1330,7 +1330,7 @@ <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="id=true;category=general" - default="org.jboss.seam.core.resourceBundle" name="name" xmlname="name"/> + default="org.jboss.seam.core.resourceLoader" name="name" xmlname="name"/> <XModelAttributeReference attributes="class,scope,precedence,installed,auto-create" entity="SeamComponent" name="component"/> 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 2008-04-03 15:19:36 UTC (rev 7299) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-drools.meta 2008-04-03 15:32:49 UTC (rev 7300) @@ -89,8 +89,8 @@ <Editor name="Uneditable"/> </XModelAttribute> <XModelAttributeReference - attributes="name,class,scope,precedence,installed,auto-create" - entity="SeamComponent" name="component"/> + attributes="name,class,scope,precedence,installed,auto-create,startup" + entity="SeamComponent20" name="component"/> <XModelAttribute PROPERTIES="category=advanced" name="configuration-file" xmlname="configuration-file"/> <XModelAttribute PROPERTIES="category=advanced" name="config-name" xmlname="config-name"/> @@ -318,7 +318,7 @@ </XActionItem> <XActionItem HandlerClassName="%Create%" ICON="action.empty" PROPERTIES="validator.add=true" WizardClassName="%Default%" - displayName="Rule Base..." kind="action" name="AddRuleAgent"> + displayName="Rule Agent..." kind="action" name="AddRuleAgent"> <EntityData EntityName="SeamDroolsRuleAgent"> <AttributeData AttributeName="name"/> <AttributeData AttributeName="configuration-file" Mandatory="no"/> @@ -352,7 +352,7 @@ </XActionItem> <XActionItem HandlerClassName="%Create%" ICON="action.empty" PROPERTIES="validator.add=true" WizardClassName="%Default%" - displayName="Rule Base..." kind="action" name="AddRuleAgent"> + displayName="Rule Agent..." kind="action" name="AddRuleAgent"> <EntityData EntityName="SeamDroolsRuleAgent"> <AttributeData AttributeName="name"/> <AttributeData AttributeName="configuration-file" Mandatory="no"/> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-international.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-international.meta 2008-04-03 15:19:36 UTC (rev 7299) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-international.meta 2008-04-03 15:32:49 UTC (rev 7300) @@ -41,8 +41,8 @@ <XModelAttribute PROPERTIES="id=true;category=general" default="org.jboss.seam.international.localeSelector" name="name" xmlname="name"/> <XModelAttributeReference - attributes="class,scope,precedence,installed,auto-create" - entity="SeamComponent" name="component"/> + attributes="class,scope,precedence,installed,auto-create,startup" + entity="SeamComponent20" name="component"/> <XModelAttribute PROPERTIES="category=general" name="locale-string" xmlname="locale-string"/> <XModelAttribute PROPERTIES="category=advanced" name="cookie-enabled" xmlname="cookie-enabled"> <Constraint loader="List"> @@ -97,8 +97,8 @@ <XModelAttribute PROPERTIES="id=true;category=general" default="org.jboss.seam.international.timeZoneSelector" name="name" xmlname="name"/> <XModelAttributeReference - attributes="class,scope,precedence,installed,auto-create" - entity="SeamComponent" name="component"/> + attributes="class,scope,precedence,installed,auto-create,startup" + entity="SeamComponent20" name="component"/> <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"> 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 2008-04-03 15:19:36 UTC (rev 7299) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-mail.meta 2008-04-03 15:32:49 UTC (rev 7300) @@ -103,8 +103,8 @@ <XModelAttribute PROPERTIES="id=true;category=general" default="org.jboss.seam.mail.meldware" name="name" xmlname="name"/> <XModelAttributeReference - attributes="class,scope,precedence,installed,auto-create" - entity="SeamComponent" name="component"/> + attributes="class,scope,precedence,installed,auto-create,startup" + entity="SeamComponent20" name="component"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> </XModelAttribute> @@ -151,10 +151,19 @@ <XModelAttribute PROPERTIES="id=true;category=general" default="org.jboss.seam.mail.meldwareUser" name="name" xmlname="name"/> <XModelAttributeReference - attributes="class,scope,precedence,installed,auto-create" - entity="SeamComponent" name="component"/> + attributes="class,scope,precedence,installed,auto-create,startup" + entity="SeamComponent20" name="component"/> <XModelAttribute PROPERTIES="category=general" name="username" xmlname="username"/> <XModelAttribute PROPERTIES="category=general" name="password" xmlname="password"/> + <XModelAttribute PROPERTIES="category=advanced" + default="default(false)" name="administrator" xmlname="administrator"> + <Constraint loader="ListString"> + <value name="default(false)"/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> </XModelAttribute> @@ -205,7 +214,8 @@ <XModelAttribute PROPERTIES="category=general" name="password" xmlname="password"/> <XModelAttribute PROPERTIES="category=general" name="host" xmlname="host"/> <XModelAttribute PROPERTIES="category=general" name="port" xmlname="port"/> - <XModelAttribute PROPERTIES="category=advanced" name="debug" xmlname="debug" default="default(false)"> + <XModelAttribute PROPERTIES="category=advanced" + default="default(false)" name="debug" xmlname="debug"> <Constraint loader="ListString"> <value name="default(false)"/> <value name="true"/> @@ -213,7 +223,8 @@ </Constraint> <Editor name="ListString"/> </XModelAttribute> - <XModelAttribute PROPERTIES="category=advanced" name="ssl" xmlname="ssl" default="default(false)"> + <XModelAttribute PROPERTIES="category=advanced" + default="default(false)" name="ssl" xmlname="ssl"> <Constraint loader="List"> <value name="default(false)"/> <value name="true"/> @@ -226,8 +237,8 @@ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> </XModelAttribute> - <XModelAttribute PROPERTIES="category=advanced" name="tls" - visibility="false" xmlname="tls" default="default(true)"> + <XModelAttribute PROPERTIES="category=advanced" + default="default(true)" name="tls" visibility="false" xmlname="tls"> <Constraint loader="List"> <value name="default(true)"/> <value name="true"/> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-persistence.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-persistence.meta 2008-04-03 15:19:36 UTC (rev 7299) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-persistence.meta 2008-04-03 15:32:49 UTC (rev 7300) @@ -103,8 +103,8 @@ </XModelAttribute> <XModelAttribute PROPERTIES="id=true;category=general" name="name" xmlname="name"/> <XModelAttributeReference - attributes="class,scope,precedence,installed,auto-create" - entity="SeamComponent" name="component"/> + attributes="class,scope,precedence,installed,auto-create,startup" + entity="SeamComponent20" name="component"/> <XModelAttribute PROPERTIES="category=general" name="persistence-unit-name" xmlname="persistence-unit-name"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> @@ -151,8 +151,8 @@ <Editor name="Uneditable"/> </XModelAttribute> <XModelAttributeReference - attributes="name,class,scope,precedence,installed,auto-create" - entity="SeamComponent" name="component"/> + attributes="name,class,scope,precedence,installed,auto-create,startup" + entity="SeamComponent20" name="component"/> <XModelAttribute PROPERTIES="category=general" name="filter name" xmlname="persistence:name.#text"/> <XModelAttribute PROPERTIES="category=advanced" name="enabled" xmlname="enabled"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> @@ -263,8 +263,8 @@ </XModelAttribute> <XModelAttribute PROPERTIES="id=true;category=general" name="name" xmlname="name"/> <XModelAttributeReference - attributes="class,scope,precedence,installed,auto-create" - entity="SeamComponent" name="component"/> + attributes="class,scope,precedence,installed,auto-create,startup" + entity="SeamComponent20" name="component"/> <XModelAttribute PROPERTIES="category=general" name="cfg-resource-name" xmlname="cfg-resource-name"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> @@ -313,8 +313,8 @@ </XModelAttribute> <XModelAttribute PROPERTIES="id=true;category=general" name="name" xmlname="name"/> <XModelAttributeReference - attributes="class,scope,precedence,installed,auto-create" - entity="SeamComponent" name="component"/> + attributes="class,scope,precedence,installed,auto-create,startup" + entity="SeamComponent20" name="component"/> <XModelAttribute PROPERTIES="category=general" name="entity-manager-factory" xmlname="entity-manager-factory"/> <XModelAttribute PROPERTIES="category=general" @@ -365,8 +365,8 @@ </XModelAttribute> <XModelAttribute PROPERTIES="id=true;category=general" name="name" xmlname="name"/> <XModelAttributeReference - attributes="class,scope,precedence,installed,auto-create" - entity="SeamComponent" name="component"/> + attributes="class,scope,precedence,installed,auto-create,startup" + entity="SeamComponent20" name="component"/> <XModelAttribute PROPERTIES="category=general" name="session-factory" xmlname="session-factory"/> <XModelAttribute PROPERTIES="category=general" name="session-factory-jndi-name" xmlname="session-factory-jndi-name"/> 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 2008-04-03 15:19:36 UTC (rev 7299) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-remoting.meta 2008-04-03 15:32:49 UTC (rev 7300) @@ -84,6 +84,62 @@ </XActionItem> <XDependencies/> </XModelEntity> + <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.core.SeamComponentsCoreFormLayoutData" + XMLSUBPATH="remoting:remoting-config" name="SeamRemotingConfig20"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam.remoting.config" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="remoting config" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;category=general" + default="org.jboss.seam.remoting.remoting" name="name" xmlname="name"/> + <XModelAttributeReference + attributes="class,scope,precedence,installed,auto-create,startup" + entity="SeamComponent20" name="component"/> + <XModelAttribute PROPERTIES="category=general" name="poll-interval" xmlname="poll-interval"/> + <XModelAttribute PROPERTIES="category=general" name="poll-timeout" xmlname="poll-timeout"/> + <XModelAttribute PROPERTIES="category=advanced" name="debug" xmlname="debug"> + <Constraint loader="ListString"> + <value/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"/> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + </XActionItem> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" + ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> + </XActionItem> + <XActionItem ICON="action.empty" kind="list" name="Properties"> + <XActionItem HandlerClassName="%Properties%" ICON="action.empty" + displayName="Properties..." kind="action" name="Properties"/> + </XActionItem> + <XActionItem displayName="move" kind="list" name="MoveActions"> + <XActionItem HIDE="always" HandlerClassName="%Move%" + ICON="action.move" displayName="Move" kind="action" name="Move"/> + </XActionItem> + </XActionItem> + <XDependencies/> + </XModelEntity> <XEntityExtension name="FileSeamComponents12"> <XChildrenEntities> <XChildEntity name="SeamRemotingConfig"/> @@ -129,7 +185,7 @@ </XEntityExtension> <XEntityExtension name="FileSeamComponents20"> <XChildrenEntities> - <XChildEntity name="SeamRemotingConfig"/> + <XChildEntity name="SeamRemotingConfig20"/> </XChildrenEntities> <XActionItem kind="list"> <XActionItem ICON="action.empty" displayName="New" group="1" @@ -139,7 +195,7 @@ <XActionItem HandlerClassName="%Create%" ICON="action.empty" PROPERTIES="validator.add=true" WizardClassName="%Default%" displayName="Config..." kind="action" name="AddRemotingConfig"> - <EntityData EntityName="SeamRemotingConfig"> + <EntityData EntityName="SeamRemotingConfig20"> <AttributeData AttributeName="name"/> <AttributeData AttributeName="poll-interval" Mandatory="no"/> <AttributeData AttributeName="poll-timeout" Mandatory="no"/> @@ -159,7 +215,7 @@ <XActionItem HandlerClassName="%Create%" ICON="action.empty" PROPERTIES="validator.add=true" WizardClassName="%Default%" displayName="Config..." kind="action" name="AddRemotingConfig"> - <EntityData EntityName="SeamRemotingConfig"> + <EntityData EntityName="SeamRemotingConfig20"> <AttributeData AttributeName="name"/> <AttributeData AttributeName="poll-interval" Mandatory="no"/> <AttributeData AttributeName="poll-timeout" Mandatory="no"/> 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 2008-04-03 15:19:36 UTC (rev 7299) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-security.meta 2008-04-03 15:32:49 UTC (rev 7300) @@ -30,6 +30,51 @@ <GlobalActions kind="list"/> <XModelEntity ImplementingClass="%Custom%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.core.SeamComponentsCoreFormLayoutData" + XMLSUBPATH="security:faces-security-events" name="SeamFacesSecurityEvents20"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam.security.identity" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="faces security events" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttributeReference + attributes="class,scope,precedence,installed,auto-create,startup" + entity="SeamComponent20" name="component"/> + <XModelAttribute PROPERTIES="category=advanced" name="cookie-max-age" xmlname="cookie-max-age"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"/> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + </XActionItem> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" + ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> + </XActionItem> + <XActionItem ICON="action.empty" kind="list" name="Properties"> + <XActionItem HandlerClassName="%Properties%" ICON="action.empty" + displayName="Properties..." kind="action" name="Properties"/> + </XActionItem> + <XActionItem displayName="move" kind="list" name="MoveActions"> + <XActionItem HIDE="always" HandlerClassName="%Move%" + ICON="action.move" displayName="Move" kind="action" name="Move"/> + </XActionItem> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.core.SeamComponentsCoreFormLayoutData" XMLSUBPATH="security:identity" name="SeamSecurityIdentity"> <XChildrenEntities/> <XEntityRenderer> @@ -108,7 +153,10 @@ <Editor name="Uneditable"/> </XModelAttribute> <XModelAttributeReference - attributes="name,class,scope,precedence,installed,auto-create,authenticate-method,remember-me,jaas-config-name,security-rules" + attributes="class,scope,precedence,installed,auto-create,startup" + entity="SeamComponent20" name="component"/> + <XModelAttributeReference + attributes="authenticate-method,remember-me,jaas-config-name,security-rules" entity="SeamSecurityIdentity" name="sequrity"/> <XModelAttribute PROPERTIES="category=advanced" name="authenticate-every-request" xmlname="authenticate-every-request"> @@ -119,7 +167,6 @@ </Constraint> <Editor name="List"/> </XModelAttribute> - <XModelAttribute PROPERTIES="category=advanced" name="cookie-max-age" xmlname="cookie-max-age"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> </XModelAttribute> @@ -192,6 +239,7 @@ <XEntityExtension name="FileSeamComponents20"> <XChildrenEntities> <XChildEntity name="SeamSecurityIdentity20"/> + <XChildEntity name="SeamFacesSecurityEvents20"/> </XChildrenEntities> <XActionItem kind="list"> <XActionItem ICON="action.empty" displayName="New" group="1" @@ -207,6 +255,14 @@ <AttributeData AttributeName="remember-me" Mandatory="no"/> </EntityData> </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Faces Security Events..." kind="action" name="AddFacesSecurityEvents"> + <EntityData EntityName="FacesSecurityEvents20"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="cookie-max-age" Mandatory="no"/> + </EntityData> + </XActionItem> </XActionItem> </XActionItem> </XActionItem> @@ -226,6 +282,14 @@ <AttributeData AttributeName="remember-me" Mandatory="no"/> </EntityData> </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Faces Security Events..." kind="action" name="AddFacesSecurityEvents"> + <EntityData EntityName="FacesSecurityEvents20"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="cookie-max-age" Mandatory="no"/> + </EntityData> + </XActionItem> </XActionItem> </XActionItem> </XActionItem> 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 2008-04-03 15:19:36 UTC (rev 7299) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-spring.meta 2008-04-03 15:32:49 UTC (rev 7300) @@ -152,8 +152,8 @@ <XModelAttribute PROPERTIES="id=true;category=general" default="org.jboss.seam.async.dispatcher" name="name" xmlname="name"/> <XModelAttributeReference - attributes="class,scope,precedence,installed,auto-create,jndi-name" - entity="SeamComponent" name="component"/> + attributes="class,scope,precedence,installed,auto-create,jndi-name,startup" + entity="SeamComponent20" name="component"/> <XModelAttribute PROPERTIES="category=general;save=always" name="task-executor" xmlname="task-executor"/> <XModelAttribute PROPERTIES="category=general" @@ -202,12 +202,12 @@ <XModelAttribute PROPERTIES="id=true;category=general" default="org.jboss.seam.transaction.transaction" name="name" xmlname="name"/> <XModelAttributeReference - attributes="class,scope,precedence,installed,auto-create,jndi-name" - entity="SeamComponent" name="component"/> + attributes="class,scope,precedence,installed,auto-create,jndi-name,startup" + entity="SeamComponent20" name="component"/> <XModelAttribute PROPERTIES="category=general;save=always" name="platform-transaction-manager" xmlname="platform-transaction-manager"/> - <XModelAttribute PROPERTIES="category=advanced" default="default(true)" - name="conversation-context-required" xmlname="conversation-context-required"> + <XModelAttribute PROPERTIES="category=advanced" + default="default(true)" name="conversation-context-required" xmlname="conversation-context-required"> <Constraint loader="List"> <value name="default(true)"/> <value name="true"/> 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 2008-04-03 15:19:36 UTC (rev 7299) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-theme.meta 2008-04-03 15:32:49 UTC (rev 7300) @@ -158,8 +158,8 @@ <Editor name="Uneditable"/> </XModelAttribute> <XModelAttributeReference - attributes="name,class,scope,precedence,installed,auto-create" - entity="SeamComponent" name="component"/> + attributes="name,class,scope,precedence,installed,auto-create,startup" + entity="SeamComponent20" name="component"/> <XModelAttribute PROPERTIES="category=general" name="theme" xmlname="theme"/> <XModelAttribute PROPERTIES="category=advanced" name="available-themes" xmlname="available-themes"/> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-transaction.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-transaction.meta 2008-04-03 15:19:36 UTC (rev 7299) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-transaction.meta 2008-04-03 15:32:49 UTC (rev 7300) @@ -45,8 +45,8 @@ <XModelAttribute PROPERTIES="id=true;category=general" default="org.jboss.seam.transaction.transaction" name="name" xmlname="name"/> <XModelAttributeReference - attributes="class,scope,precedence,installed,auto-create,jndi-name" - entity="SeamComponent" name="component"/> + attributes="class,scope,precedence,installed,auto-create,jndi-name,startup" + entity="SeamComponent20" name="component"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> </XModelAttribute> @@ -91,8 +91,8 @@ <XModelAttribute PROPERTIES="id=true;category=general" default="org.jboss.seam.transaction.transaction" name="name" xmlname="name"/> <XModelAttributeReference - attributes="class,scope,precedence,installed,auto-create,jndi-name" - entity="SeamComponent" name="component"/> + attributes="class,scope,precedence,installed,auto-create,jndi-name,startup" + entity="SeamComponent20" name="component"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> </XModelAttribute> @@ -137,8 +137,8 @@ <XModelAttribute PROPERTIES="id=true;category=general" default="org.jboss.seam.transaction.transaction" name="name" xmlname="name"/> <XModelAttributeReference - attributes="class,scope,precedence,installed,auto-create" - entity="SeamComponent" name="component"/> + attributes="class,scope,precedence,installed,auto-create,startup" + entity="SeamComponent20" name="component"/> <XModelAttribute PROPERTIES="save=always" name="entity-manager" xmlname="entity-manager"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> @@ -184,8 +184,8 @@ <XModelAttribute PROPERTIES="id=true;category=general" default="org.jboss.seam.transaction.transaction" name="name" xmlname="name"/> <XModelAttributeReference - attributes="class,scope,precedence,installed,auto-create" - entity="SeamComponent" name="component"/> + attributes="class,scope,precedence,installed,auto-create,startup" + entity="SeamComponent20" name="component"/> <XModelAttribute PROPERTIES="save=always" name="session" xmlname="session"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> 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 2008-04-03 15:19:36 UTC (rev 7299) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-web.meta 2008-04-03 15:32:49 UTC (rev 7300) @@ -44,10 +44,11 @@ <XModelAttribute PROPERTIES="id=true;category=general" default="org.jboss.seam.web.ajax4jsfFilter" name="name" xmlname="name"/> <XModelAttributeReference - attributes="class,scope,precedence,installed,auto-create" - entity="SeamComponent" name="component"/> - <XModelAttribute PROPERTIES="category=general" name="url-pattern" xmlname="url-pattern"/> - <XModelAttribute PROPERTIES="category=advanced" name="disabled" xmlname="disabled"/> + attributes="class,scope,precedence,installed,auto-create,startup" + entity="SeamComponent20" name="component"/> + <XModelAttributeReference + attributes="url-pattern,disabled,regex-url-pattern" + entity="SeamWebContextFilter20" name="filter"/> <XModelAttribute PROPERTIES="category=general" name="enable-cache" xmlname="enable-cache"> <Constraint loader="List"> <value/> @@ -71,32 +72,19 @@ </XModelAttribute> </XModelAttributes> <XActionItem kind="list"> - <XActionItem kind="list" name="CreateActions"/> - <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> - <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> - <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" - ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> - <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" - ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> - </XActionItem> - <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> - <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" - ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> - </XActionItem> - <XActionItem ICON="action.empty" kind="list" name="Properties"> - <XActionItem HandlerClassName="%Properties%" ICON="action.empty" - displayName="Properties..." kind="action" name="Properties"/> - </XActionItem> - <XActionItem displayName="move" kind="list" name="MoveActions"> - <XActionItem HIDE="always" HandlerClassName="%Move%" - ICON="action.move" displayName="Move" kind="action" name="Move"/> - </XActionItem> + <XActionItemReference entity="SeamWebContextFilter" + name="CopyActions" path="CopyActions"/> + <XActionItemReference entity="SeamWebContextFilter" + name="DeleteActions" path="DeleteActions"/> + <XActionItemReference entity="SeamWebContextFilter" name="Properties" path="Properties"/> + <XActionItemReference entity="SeamWebContextFilter" + name="MoveActions" path="MoveActions"/> </XActionItem> <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%Custom%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.core.SeamComponentsCoreFormLayoutData" - XMLSUBPATH="web:context-filter" name="SeamWebAuthenticationFilter20"> + XMLSUBPATH="web:authentication-filter" name="SeamWebAuthenticationFilter20"> <XChildrenEntities/> <XEntityRenderer> <ICONS> @@ -110,10 +98,11 @@ <XModelAttribute PROPERTIES="id=true;category=general" default="org.jboss.seam.web.authenticationFilter" name="name" xmlname="name"/> <XModelAttributeReference - attributes="class,scope,precedence,installed,auto-create" - entity="SeamComponent" name="component"/> - <XModelAttribute PROPERTIES="category=general" name="url-pattern" xmlname="url-pattern"/> - <XModelAttribute PROPERTIES="category=advanced" name="disabled" xmlname="disabled"/> + attributes="class,scope,precedence,installed,auto-create,startup" + entity="SeamComponent20" name="component"/> + <XModelAttributeReference + attributes="url-pattern,disabled,regex-url-pattern" + entity="SeamWebContextFilter20" name="filter"/> <XModelAttribute PROPERTIES="category=advanced" name="realm" xmlname="realm"/> <XModelAttribute PROPERTIES="category=advanced" name="key" xmlname="key"/> <XModelAttribute PROPERTIES="category=advanced" @@ -124,26 +113,13 @@ </XModelAttribute> </XModelAttributes> <XActionItem kind="list"> - <XActionItem kind="list" name="CreateActions"/> - <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> - <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> - <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" - ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> - <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" - ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> - </XActionItem> - <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> - <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" - ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> - </XActionItem> - <XActionItem ICON="action.empty" kind="list" name="Properties"> - <XActionItem HandlerClassName="%Properties%" ICON="action.empty" - displayName="Properties..." kind="action" name="Properties"/> - </XActionItem> - <XActionItem displayName="move" kind="list" name="MoveActions"> - <XActionItem HIDE="always" HandlerClassName="%Move%" - ICON="action.move" displayName="Move" kind="action" name="Move"/> - </XActionItem> + <XActionItemReference entity="SeamWebContextFilter" + name="CopyActions" path="CopyActions"/> + <XActionItemReference entity="SeamWebContextFilter" + name="DeleteActions" path="DeleteActions"/> + <XActionItemReference entity="SeamWebContextFilter" name="Properties" path="Properties"/> + <XActionItemReference entity="SeamWebContextFilter" + name="MoveActions" path="MoveActions"/> </XActionItem> <XDependencies/> </XModelEntity> @@ -164,10 +140,11 @@ <XModelAttribute PROPERTIES="id=true;category=general" default="org.jboss.seam.servlet.characterEncodingFilter" name="name" xmlname="name"/> <XModelAttributeReference - attributes="class,scope,precedence,installed,auto-create" - entity="SeamComponent" name="component"/> - <XModelAttribute PROPERTIES="category=general" name="url-pattern" xmlname="url-pattern"/> - <XModelAttribute PROPERTIES="category=advanced" name="disabled" xmlname="disabled"/> + attributes="class,scope,precedence,installed,auto-create,startup" + entity="SeamComponent20" name="component"/> + <XModelAttributeReference + attributes="url-pattern,disabled,regex-url-pattern" + entity="SeamWebContextFilter20" name="filter"/> <XModelAttribute PROPERTIES="category=general" name="encoding" xmlname="encoding"/> <XModelAttribute PROPERTIES="category=general" name="override-client" xmlname="override-client"> <Constraint loader="List"> @@ -182,26 +159,13 @@ </XModelAttribute> </XModelAttributes> <XActionItem kind="list"> - <XActionItem kind="list" name="CreateActions"/> - <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> - <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> - <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" - ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> - <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" - ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> - </XActionItem> - <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> - <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" - ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> - </XActionItem> - <XActionItem ICON="action.empty" kind="list" name="Properties"> - <XActionItem HandlerClassName="%Properties%" ICON="action.empty" - displayName="Properties..." kind="action" name="Properties"/> - </XActionItem> - <XActionItem displayName="move" kind="list" name="MoveActions"> - <XActionItem HIDE="always" HandlerClassName="%Move%" - ICON="action.move" displayName="Move" kind="action" name="Move"/> - </XActionItem> + <XActionItemReference entity="SeamWebContextFilter" + name="CopyActions" path="CopyActions"/> + <XActionItemReference entity="SeamWebContextFilter" + name="DeleteActions" path="DeleteActions"/> + <XActionItemReference entity="SeamWebContextFilter" name="Properties" path="Properties"/> + <XActionItemReference entity="SeamWebContextFilter" + name="MoveActions" path="MoveActions"/> </XActionItem> <XDependencies/> </XModelEntity> @@ -254,6 +218,43 @@ </XModelEntity> <XModelEntity ImplementingClass="%Custom%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.core.SeamComponentsCoreFormLayoutData" + XMLSUBPATH="web:context-filter" name="SeamWebContextFilter20"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam.web.filter" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="context filter" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;category=general" + default="org.jboss.seam.servlet.contextFilter" name="name" xmlname="name"/> + <XModelAttributeReference + attributes="class,scope,precedence,installed,auto-create" + entity="SeamComponent" name="component"/> + <XModelAttribute PROPERTIES="category=general" name="url-pattern" xmlname="url-pattern"/> + <XModelAttribute PROPERTIES="category=advanced" name="disabled" xmlname="disabled"/> + <XModelAttribute PROPERTIES="category=advanced" + name="regex-url-pattern" xmlname="regex-url-pattern"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItemReference entity="SeamWebContextFilter" + name="CopyActions" path="CopyActions"/> + <XActionItemReference entity="SeamWebContextFilter" + name="DeleteActions" path="DeleteActions"/> + <XActionItemReference entity="SeamWebContextFilter" name="Properties" path="Properties"/> + <XActionItemReference entity="SeamWebContextFilter" + name="MoveActions" path="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.core.SeamComponentsCoreFormLayoutData" XMLSUBPATH="web:exception-filter" name="SeamWebExceptionFilter"> <XChildrenEntities/> <XEntityRenderer> @@ -276,31 +277,54 @@ </XModelAttribute> </XModelAttributes> <XActionItem kind="list"> - <XActionItem kind="list" name="CreateActions"/> - <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> - <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> - <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" - ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> - <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" - ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> - </XActionItem> - <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> - <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" - ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> - </XActionItem> - <XActionItem ICON="action.empty" kind="list" name="Properties"> - <XActionItem HandlerClassName="%Properties%" ICON="action.empty" - displayName="Properties..." kind="action" name="Properties"/> - </XActionItem> - <XActionItem displayName="move" kind="list" name="MoveActions"> - <XActionItem HIDE="always" HandlerClassName="%Move%" - ICON="action.move" displayName="Move" kind="action" name="Move"/> - </XActionItem> + <XActionItemReference entity="SeamWebContextFilter" + name="CopyActions" path="CopyActions"/> + <XActionItemReference entity="SeamWebContextFilter" + name="DeleteActions" path="DeleteActions"/> + <XActionItemReference entity="SeamWebContextFilter" name="Properties" path="Properties"/> + <XActionItemReference entity="SeamWebContextFilter" + name="MoveActions" path="MoveActions"/> </XActionItem> <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%Custom%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.core.SeamComponentsCoreFormLayoutData" + XMLSUBPATH="web:exception-filter" name="SeamWebExceptionFilter20"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam.web.filter" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="exception filter" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;category=general" + default="org.jboss.seam.servlet.exceptionFilter" name="name" xmlname="name"/> + <XModelAttributeReference + attributes="class,scope,precedence,installed,auto-create,startup" + entity="SeamComponent20" name="component"/> + <XModelAttributeReference + attributes="url-pattern,disabled,regex-url-pattern" + entity="SeamWebContextFilter20" name="filter"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItemReference entity="SeamWebContextFilter" + name="CopyActions" path="CopyActions"/> + <XActionItemReference entity="SeamWebContextFilter" + name="DeleteActions" path="DeleteActions"/> + <XActionItemReference entity="SeamWebContextFilter" name="Properties" path="Properties"/> + <XActionItemReference entity="SeamWebContextFilter" + name="MoveActions" path="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.core.SeamComponentsCoreFormLayoutData" XMLSUBPATH="web:logging-filter" name="SeamWebLoggingFilter20"> <XChildrenEntities/> <XEntityRenderer> @@ -315,35 +339,23 @@ <XModelAttribute PROPERTIES="id=true;category=general" default="org.jboss.seam.web.loggingFilter" name="name" xmlname="name"/> <XModelAttributeReference - attributes="class,scope,precedence,installed,auto-create" - entity="SeamComponent" name="component"/> - <XModelAttribute PROPERTIES="category=general" name="url-pattern" xmlname="url-pattern"/> - <XModelAttribute PROPERTIES="category=advanced" name="disabled" xmlname="disabled"/> + attributes="class,scope,precedence,installed,auto-create,startup" + entity="SeamComponent20" name="component"/> + <XModelAttributeReference + attributes="url-pattern,disabled,regex-url-pattern" + entity="SeamWebContextFilter20" name="filter"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> </XModelAttribute> </XModelAttributes> <XActionItem kind="list"> - <XActionItem kind="list" name="CreateActions"/> - <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> - <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> - <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" - ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> - <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" - ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> - </XActionItem> - <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> - <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" - ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> - </XActionItem> - <XActionItem ICON="action.empty" kind="list" name="Properties"> - <XActionItem HandlerClassName="%Properties%" ICON="action.empty" - displayName="Properties..." kind="action" name="Properties"/> - </XActionItem> - <XActionItem displayName="move" kind="list" name="MoveActions"> - <XActionItem HIDE="always" HandlerClassName="%Move%" - ICON="action.move" displayName="Move" kind="action" name="Move"/> - </XActionItem> + <XActionItemReference entity="SeamWebContextFilter" + name="CopyActions" path="CopyActions"/> + <XActionItemReference entity="SeamWebContextFilter" + name="DeleteActions" path="DeleteActions"/> + <XActionItemReference entity="SeamWebContextFilter" name="Properties" path="Properties"/> + <XActionItemReference entity="SeamWebContextFilter" + name="MoveActions" path="MoveActions"/> </XActionItem> <XDependencies/> </XModelEntity> @@ -382,31 +394,65 @@ </XModelAttribute> </XModelAttributes> <XActionItem kind="list"> - <XActionItem kind="list" name="CreateActions"/> - <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> - <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> - <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" - ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> - <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" - ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> - </XActionItem> - <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> - <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" - ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> - </XActionItem> - <XActionItem ICON="action.empty" kind="list" name="Properties"> - <XActionItem HandlerClassName="%Properties%" ICON="action.empty" - displayName="Properties..." kind="action" name="Properties"/> - </XActionItem> - <XActionItem displayName="move" kind="list" name="MoveActions"> - <XActionItem HIDE="always" HandlerClassName="%Move%" - ICON="action.move" displayName="Move" kind="action" name="Move"/> - </XActionItem> + <XActionItemReference entity="SeamWebContextFilter" + name="CopyActions" path="CopyActions"/> + <XActionItemReference entity="SeamWebContextFilter" + name="DeleteActions" path="DeleteActions"/> + <XActionItemReference entity="SeamWebContextFilter" name="Properties" path="Properties"/> + <XActionItemReference entity="SeamWebContextFilter" + name="MoveActions" path="MoveActions"/> </XActionItem> <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%Custom%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.core.SeamComponentsCoreFormLayoutData" + XMLSUBPATH="web:multipart-filter" name="SeamWebMultipartFilter20"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam.web.filter" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="multipart filter" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;category=general" + default="org.jboss.seam.servlet.multipartFilter" name="name" xmlname="name"/> + <XModelAttributeReference + attributes="class,scope,precedence,installed,auto-create,startup" + entity="SeamComponent20" name="component"/> + <XModelAttributeReference + attributes="url-pattern,disabled,regex-url-pattern" + entity="SeamWebContextFilter20" name="filter"/> + <XModelAttribute PROPERTIES="category=advanced" + name="create-temp-files" xmlname="create-temp-files"> + <Constraint loader="List"> + <value/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="List"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced" + name="max-request-size" xmlname="max-request-size"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItemReference entity="SeamWebContextFilter" + name="CopyActions" path="CopyActions"/> + <XActionItemReference entity="SeamWebContextFilter" + name="DeleteActions" path="DeleteActions"/> + <XActionItemReference entity="SeamWebContextFilter" name="Properties" path="Properties"/> + <XActionItemReference entity="SeamWebContextFilter" + name="MoveActions" path="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.core.SeamComponentsCoreFormLayoutData" XMLSUBPATH="web:redirect-filter" name="SeamWebRedirectFilter"> <XChildrenEntities/> <XEntityRenderer> @@ -429,31 +475,54 @@ </XModelAttribute> </XModelAttributes> <XActionItem kind="list"> - <XActionItem kind="list" name="CreateActions"/> - <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> - <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> - <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" - ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> - <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" - ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> - </XActionItem> - <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> - <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" - ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> - </XActionItem> - <XActionItem ICON="action.empty" kind="list" name="Properties"> - <XActionItem HandlerClassName="%Properties%" ICON="action.empty" - displayName="Properties..." kind="action" name="Properties"/> - </XActionItem> - <XActionItem displayName="move" kind="list" name="MoveActions"> - <XActionItem HIDE="always" HandlerClassName="%Move%" - ICON="action.move" displayName="Move" kind="action" name="Move"/> - </XActionItem> + <XActionItemReference entity="SeamWebContextFilter" + name="CopyActions" path="CopyActions"/> + <XActionItemReference entity="SeamWebContextFilter" + name="DeleteActions" path="DeleteActions"/> + <XActionItemReference entity="SeamWebContextFilter" name="Properties" path="Properties"/> + <XActionItemReference entity="SeamWebContextFilter" + name="MoveActions" path="MoveActions"/> </XActionItem> <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%Custom%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.core.SeamComponentsCoreFormLayoutData" + XMLSUBPATH="web:redirect-filter" name="SeamWebRedirectFilter20"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam.web.filter" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="redirect filter" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;category=general" + default="org.jboss.seam.servlet.redirectFilter" name="name" xmlname="name"/> + <XModelAttributeReference + attributes="class,scope,precedence,installed,auto-create,startup" + entity="SeamComponent20" name="component"/> + <XModelAttributeReference + attributes="url-pattern,disabled,regex-url-pattern" + entity="SeamWebContextFilter20" name="filter"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItemReference entity="SeamWebContextFilter" + name="CopyActions" path="CopyActions"/> + <XActionItemReference entity="SeamWebContextFilter" + name="DeleteActions" path="DeleteActions"/> + <XActionItemReference entity="SeamWebContextFilter" name="Properties" path="Properties"/> + <XActionItemReference entity="SeamWebContextFilter" + name="MoveActions" path="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.core.SeamComponentsCoreFormLayoutData" XMLSUBPATH="web:servlet-session" name="SeamWebServletSession20"> <XChildrenEntities/> <XEntityRenderer> @@ -467,8 +536,8 @@ </XModelAttribute> <XModelAttribute PROPERTIES="id=true;category=general" name="name" xmlname="name"/> <XModelAttributeReference - attributes="class,scope,precedence,installed,auto-create" - entity="SeamComponent" name="component"/> + attributes="class,scope,precedence,installed,auto-create,startup" + entity="SeamComponent20" name="component"/> <XModelAttribute PROPERTIES="category=general" name="invalidate-on-scheme-change" xmlname="invalidate-on-scheme-change"> <Constraint loader="List"> @@ -483,26 +552,13 @@ </XModelAttribute> </XModelAttributes> <XActionItem kind="list"> - <XActionItem kind="list" name="CreateActions"/> - <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> - <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> - <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" - ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> - <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" - ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> - </XActionItem> - <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> - <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" - ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> - </XActionItem> - <XActionItem ICON="action.empty" kind="list" name="Properties"> - <XActionItem HandlerClassName="%Properties%" ICON="action.empty" - displayName="Properties..." kind="action" name="Properties"/> - </XActionItem> - <XActionItem displayName="move" kind="list" name="MoveActions"> - <XActionItem HIDE="always" HandlerClassName="%Move%" - ICON="action.move" displayName="Move" kind="action" name="Move"/> - </XActionItem> + <XActionItemReference entity="SeamWebContextFilter" + name="CopyActions" path="CopyActions"/> + <XActionItemReference entity="SeamWebContextFilter" + name="DeleteActions" path="DeleteActions"/> + <XActionItemReference entity="SeamWebContextFilter" name="Properties" path="Properties"/> + <XActionItemReference entity="SeamWebContextFilter" + name="MoveActions" path="MoveActions"/> </XActionItem> <XDependencies/> </XModelEntity> @@ -598,10 +654,10 @@ </XEntityExtension> <XEntityExtension name="FileSeamComponents20"> <XChildrenEntities> - <XChildEntity name="SeamWebContextFilter"/> - <XChildEntity name="SeamWebExceptionFilter"/> - <XChildEntity name="SeamWebMultipartFilter"/> - <XChildEntity name="SeamWebRedirectFilter"/> + <XChildEntity name="SeamWebContextFilter20"/> + <XChildEntity name="SeamWebExceptionFilter20"/> + <XChildEntity name="SeamWebMultipartFilter20"/> + <XChildEntity name="SeamWebRedirectFilter20"/> <XChildEntity name="SeamWebAuthenticationFilter20"/> <XChildEntity name="SeamWebCharacterFilter20"/> <XChildEntity name="SeamWebAjaxFilter20"/> @@ -616,7 +672,7 @@ <XActionItem HandlerClassName="%Create%" ICON="action.empty" PROPERTIES="validator.add=true" WizardClassName="%Default%" displayName="Context Filter..." kind="action" name="AddContextFilter"> - <EntityData EntityName="SeamWebContextFilter"> + <EntityData EntityName="SeamWebContextFilter20"> <AttributeData AttributeName="name"/> <AttributeData AttributeName="url-pattern" Mandatory="no"/> </EntityData> @@ -624,7 +680,7 @@ <XActionItem HandlerClassName="%Create%" ICON="action.empty" PROPERTIES="validator.add=true" WizardClassName="%Default%" displayName="Exception Filter..." kind="action" name="AddExceptionFilter"> - <EntityData EntityName="SeamWebExceptionFilter"> + <EntityData EntityName="SeamWebExceptionFilter20"> <AttributeData AttributeName="name"/> <AttributeData AttributeName="url-pattern" Mandatory="no"/> </EntityData> @@ -632,7 +688,7 @@ <XActionItem HandlerClassName="%Create%" ICON="action.empty" PROPERTIES="validator.add=true" WizardClassName="%Default%" displayName="Multipart Filter..." kind="action" name="AddMultipartFilter"> - <EntityData EntityName="SeamWebMultipartFilter"> + <EntityData EntityName="SeamWebMultipartFilter20"> <AttributeData AttributeName="name"/> <AttributeData AttributeName="url-pattern" Mandatory="no"/> </EntityData> @@ -640,7 +696,7 @@ <XActionItem HandlerClassName="%Create%" ICON="action.empty" PROPERTIES="validator.add=true" WizardClassName="%Default%" displayName="Redirect Filter..." kind="action" name="AddRedirectFilter"> - <EntityData EntityName="SeamWebRedirectFilter"> + <EntityData EntityName="SeamWebRedirectFilter20"> <AttributeData AttributeName="name"/> <AttributeData AttributeName="url-pattern" Mandatory="no"/> </EntityData> @@ -698,7 +754,7 @@ <XActionItem HandlerClassName="%Create%" ICON="action.empty" PROPERTIES="validator.add=true" WizardClassName="%Default%" displayName="Context Filter..." kind="action" name="AddContextFilter"> - <EntityData EntityName="SeamWebContextFilter"> + <EntityData EntityName="SeamWebContextFilter20"> <AttributeData AttributeName="name"/> <AttributeData AttributeName="url-pattern" Mandatory="no"/> </EntityData> @@ -706,7 +762,7 @@ <XActionItem HandlerClassName="%Create%" ICON="action.empty" PROPERTIES="validator.add=true" WizardClassName="%Default%" displayName="Exception Filter..." kind="action" name="AddExceptionFilter"> - <EntityData EntityName="SeamWebExceptionFilter"> + <EntityData EntityName="SeamWebExceptionFilter20"> <AttributeData AttributeName="name"/> <AttributeData AttributeName="url-pattern" Mandatory="no"/> </EntityData> @@ -714,7 +770,7 @@ <XActionItem HandlerClassName="%Create%" ICON="action.empty" PROPERTIES="validator.add=true" WizardClassName="%Default%" displayName="Multipart Filter..." kind="action" name="AddMultipartFilter"> - <EntityData EntityName="SeamWebMultipartFilter"> + <EntityData EntityName="SeamWebMultipartFilter20"> <AttributeData AttributeName="name"/> <AttributeData AttributeName="url-pattern" Mandatory="no"/> </EntityData> @@ -722,7 +778,7 @@ <XActionItem HandlerClassName="%Create%" ICON="action.empty" PROPERTIES="validator.add=true" WizardClassName="%Default%" displayName="Redirect Filter..." kind="action" name="AddRedirectFilter"> - <EntityData EntityName="SeamWebRedirectFilter"> + <EntityData EntityName="SeamWebRedirectFilter20"> <AttributeData AttributeName="name"/> <AttributeData AttributeName="url-pattern" Mandatory="no"/> </EntityData> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/components-2.0.xsd =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/components-2.0.xsd 2008-04-03 15:19:36 UTC (rev 7299) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/components-2.0.xsd 2008-04-03 15:32:49 UTC (rev 7300) @@ -1,162 +1,140 @@ -<?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/components" - xmlns:components="http://jboss.com/products/seam/components"> - <xs:element name="components"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="components:component"/> - <xs:element ref="components:factory"/> - <xs:element ref="components:event"/> - <xs:element ref="components:import"/> - <xs:any namespace="##other" processContents="strict"/> - </xs:choice> - </xs:complexType> - </xs:element> - <xs:element name="component"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="components:property"/> - </xs:sequence> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="components:attlist.ejbcomponent"/> - </xs:complexType> - </xs:element> - - <xs:element name="import" type="xs:string"/> - - <xs:attributeGroup name="attlist.ejbcomponent"> - <xs:attribute name="jndi-name"/> - </xs:attributeGroup> - - <xs:attributeGroup name="attlist.component"> - <xs:attribute name="name"/> - <xs:attribute name="class"/> - <xs:attribute name="scope"> - <xs:simpleType> - <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:attribute> - - <xs:attribute name="precedence"/> - <xs:attribute name="installed" default="true"/> - <xs:attribute name="auto-create" default="false"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:attributeGroup> - <xs:element name="factory"> - <xs:complexType> - <xs:attributeGroup ref="components:attlist.factory"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.factory"> - <xs:attribute name="name" use="required"/> - <xs:attribute name="method"/> - <xs:attribute name="value"/> - <xs:attribute name="scope"> - <xs:simpleType> - <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:attribute> - <xs:attribute name="auto-create"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="startup"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:attributeGroup> - <xs:element name="property"> - <xs:complexType mixed="true"> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="components:key"/> - <xs:element ref="components:value"/> - </xs:choice> - <xs:attributeGroup ref="components:attlist.property"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.property"> - <xs:attribute name="name" use="required"/> - </xs:attributeGroup> - <xs:element name="key" type="xs:string"/> - <xs:element name="value" type="xs:string"/> - - <xs:complexType name="multiValuedProperty"> - <xs:sequence minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="components:value"/> - </xs:sequence> - </xs:complexType> - - <xs:complexType name="mapProperty"> - <xs:sequence minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="components:key"/> - <xs:element ref="components:value"/> - </xs:sequence> - </xs:complexType> - - <xs:element name="event"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="components:action"/> - </xs:choice> - <xs:attributeGroup ref="components:attlist.event"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.event"> - <xs:attribute name="type" use="required"/> - </xs:attributeGroup> - - <xs:element name="action"> - <xs:complexType> - <xs:attributeGroup ref="components:attlist.action"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.action"> - <xs:attribute name="execute" use="required"/> - </xs:attributeGroup> - -</xs:schema> +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" + targetNamespace="http://jboss.com/products/seam/components" + xmlns:components="http://jboss.com/products/seam/components"> + <xs:element name="components"> + <xs:complexType> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="components:component"/> + <xs:element ref="components:factory"/> + <xs:element ref="components:event"/> + <xs:element ref="components:import"/> + <xs:any namespace="##other" processContents="strict"/> + </xs:choice> + </xs:complexType> + </xs:element> + <xs:element name="component"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="components:property"/> + </xs:sequence> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="components:attlist.ejbcomponent"/> + </xs:complexType> + </xs:element> + + <xs:element name="import" type="xs:string"/> + + <xs:attributeGroup name="attlist.ejbcomponent"> + <xs:attribute name="jndi-name"/> + </xs:attributeGroup> + + <xs:attributeGroup name="attlist.component"> + <xs:attribute name="name"/> + <xs:attribute name="class"/> + <xs:attribute name="scope"> + <xs:simpleType> + <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:attribute> + <xs:attribute name="precedence" type="xs:int"/> + <xs:attribute name="installed" default="true" type="xs:boolean"/> + <xs:attribute name="auto-create" default="false" type="xs:boolean"/> + <xs:attribute name="startup" default="false" type="xs:boolean"/> + </xs:attributeGroup> + <xs:element name="factory"> + <xs:complexType> + <xs:attributeGroup ref="components:attlist.factory"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.factory"> + <xs:attribute name="name" use="required"/> + <xs:attribute name="method"/> + <xs:attribute name="value"/> + <xs:attribute name="scope"> + <xs:simpleType> + <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:attribute> + <xs:attribute name="auto-create" type="xs:boolean"/> + </xs:attributeGroup> + <xs:element name="property"> + <xs:complexType mixed="true"> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="components:key"/> + <xs:element ref="components:value"/> + </xs:choice> + <xs:attributeGroup ref="components:attlist.property"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.property"> + <xs:attribute name="name" use="required"/> + </xs:attributeGroup> + <xs:element name="key" type="xs:string"/> + <xs:element name="value" type="xs:string"/> + + <xs:complexType name="multiValuedProperty"> + <xs:sequence minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="components:value"/> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="mapProperty"> + <xs:sequence minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="components:key"/> + <xs:element ref="components:value"/> + </xs:sequence> + </xs:complexType> + + <xs:element name="event"> + <xs:complexType> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="components:action"/> + </xs:choice> + <xs:attributeGroup ref="components:attlist.event"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.event"> + <xs:attribute name="type" use="required"/> + </xs:attributeGroup> + + <xs:element name="action"> + <xs:complexType> + <xs:attributeGroup ref="components:attlist.action"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.action"> + <xs:attribute name="execute" use="required"/> + </xs:attributeGroup> + +</xs:schema> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/mail-2.0.xsd =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/mail-2.0.xsd 2008-04-03 15:19:36 UTC (rev 7299) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/mail-2.0.xsd 2008-04-03 15:32:49 UTC (rev 7300) @@ -1,50 +1,50 @@ -<?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/mail" - xmlns:mail="http://jboss.com/products/seam/mail" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.0.xsd"/> - - <xs:attributeGroup name="attlist.mailSession"> - <xs:attribute name="username" type="xs:string"/> - <xs:attribute name="password" type="xs:string"/> - <xs:attribute name="host" type="xs:string" default="localhost"/> - <xs:attribute name="port" type="xs:string" /> - <xs:attribute name="debug" type="xs:string" default="false" /> - <xs:attribute name="ssl" type="xs:boolean" default="false" /> - <xs:attribute name="tls" type="xs:boolean" default="true" /> - <xs:attribute name="session-jndi-name" type="xs:string" /> - </xs:attributeGroup> - <xs:element name="mail-session"> - <xs:complexType> - <xs:attributeGroup ref="components:attlist.component" /> - <xs:attributeGroup ref="mail:attlist.mailSession" /> - </xs:complexType> - </xs:element> - - <xs:element name="users" type="components:multiValuedProperty"/> - <xs:element name="meldware"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="mail:users" /> - </xs:choice> - <xs:attributeGroup ref="components:attlist.component" /> - </xs:complexType> - </xs:element> - - <xs:element name="aliases" type="components:multiValuedProperty"/> - <xs:attributeGroup name="attlist.meldwareUser"> - <xs:attribute name="username" type="xs:string" /> - <xs:attribute name="password" type="xs:string" /> - <xs:attribute name="admin" type="xs:boolean" default="false"/> - </xs:attributeGroup> - <xs:element name="meldware-user"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="mail:aliases" /> - </xs:choice> - <xs:attributeGroup ref="components:attlist.component" /> - <xs:attributeGroup ref="mail:attlist.meldwareUser" /> - </xs:complexType> - </xs:element> -</xs:schema> +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" + targetNamespace="http://jboss.com/products/seam/mail" + xmlns:mail="http://jboss.com/products/seam/mail" + xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> + <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.0.xsd"/> + + <xs:attributeGroup name="attlist.mailSession"> + <xs:attribute name="username" type="xs:string"/> + <xs:attribute name="password" type="xs:string"/> + <xs:attribute name="host" type="xs:string" default="localhost"/> + <xs:attribute name="port" type="xs:string" /> + <xs:attribute name="debug" type="xs:string" default="false" /> + <xs:attribute name="ssl" type="xs:boolean" default="false" /> + <xs:attribute name="tls" type="xs:boolean" default="true" /> + <xs:attribute name="session-jndi-name" type="xs:string" /> + </xs:attributeGroup> + <xs:element name="mail-session"> + <xs:complexType> + <xs:attributeGroup ref="components:attlist.component" /> + <xs:attributeGroup ref="mail:attlist.mailSession" /> + </xs:complexType> + </xs:element> + + <xs:element name="users" type="components:multiValuedProperty"/> + <xs:element name="meldware"> + <xs:complexType> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="mail:users" /> + </xs:choice> + <xs:attributeGroup ref="components:attlist.component" /> + </xs:complexType> + </xs:element> + + <xs:element name="aliases" type="components:multiValuedProperty"/> + <xs:attributeGroup name="attlist.meldwareUser"> + <xs:attribute name="username" type="xs:string" /> + <xs:attribute name="password" type="xs:string" /> + <xs:attribute name="administrator" type="xs:boolean" default="false"/> + </xs:attributeGroup> + <xs:element name="meldware-user"> + <xs:complexType> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="mail:aliases" /> + </xs:choice> + <xs:attributeGroup ref="components:attlist.component" /> + <xs:attributeGroup ref="mail:attlist.meldwareUser" /> + </xs:complexType> + </xs:element> +</xs:schema> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/security-2.0.xsd =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/security-2.0.xsd 2008-04-03 15:19:36 UTC (rev 7299) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/security-2.0.xsd 2008-04-03 15:32:49 UTC (rev 7300) @@ -10,13 +10,24 @@ <xs:attributeGroup ref="security:attlist.identity"/> </xs:complexType> </xs:element> + + <xs:element name="faces-security-events"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="security:attlist.faces-security-events"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.identity"> <xs:attribute name="authenticate-method" /> <xs:attribute name="remember-me" type="xs:boolean"/> <xs:attribute name="authenticate-every-request" type="xs:boolean"/> <xs:attribute name="jaas-config-name" type="xs:string"/> <xs:attribute name="security-rules" type="xs:string"/> - <xs:attribute name="cookie-max-age" /> </xs:attributeGroup> + <xs:attributeGroup name="attlist.faces-security-events"> + <xs:attribute name="cookie-max-age"/> + </xs:attributeGroup> + </xs:schema> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/web-2.0.xsd =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/web-2.0.xsd 2008-04-03 15:19:36 UTC (rev 7299) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/web-2.0.xsd 2008-04-03 15:32:49 UTC (rev 7300) @@ -1,118 +1,119 @@ -<?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/web" xmlns:web="http://jboss.com/products/seam/web" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.0.xsd"/> - - <xs:element name="multipart-filter"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="web:attlist.filter"/> - <xs:attributeGroup ref="web:attlist.multipartFilter"/> - </xs:complexType> - </xs:element> - - <xs:element name="redirect-filter"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="web:attlist.filter"/> - </xs:complexType> - </xs:element> - - <xs:element name="exception-filter"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="web:attlist.filter"/> - </xs:complexType> - </xs:element> - - <xs:element name="context-filter"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="web:attlist.filter"/> - </xs:complexType> - </xs:element> - - <xs:element name="character-encoding-filter"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="web:attlist.filter"/> - <xs:attribute name="encoding" type="xs:string"/> - <xs:attribute name="override-client" type="xs:boolean"/> - </xs:complexType> - </xs:element> - - <xs:element name="authentication-filter"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="web:attlist.filter"/> - <xs:attribute name="realm" type="xs:string"/> - <xs:attribute name="key" type="xs:string"/> - <xs:attribute name="nonce-validity-seconds" type="xs:int"/> - <xs:attribute name="auth-type" type="xs:string"/> - </xs:complexType> - </xs:element> - - <xs:element name="logging-filter"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="web:attlist.filter"/> - </xs:complexType> - </xs:element> - - <xs:element name="ajax4jsf-filter"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="web:attlist.filter"/> - <xs:attributeGroup ref="web:attlist.ajax4jsfFilter"/> - </xs:complexType> - </xs:element> - - <xs:attributeGroup name="attlist.filter"> - <xs:attribute name="url-pattern" type="xs:string"/> - <xs:attribute name="disabled" type="xs:string" default="false" /> - </xs:attributeGroup> - - <xs:attributeGroup name="attlist.multipartFilter"> - <xs:attribute name="create-temp-files"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="max-request-size" type="xs:integer"/> - </xs:attributeGroup> - - <xs:attributeGroup name="attlist.ajax4jsfFilter"> - <xs:attribute name="enable-cache"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="force-parser"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="log4j-init-file" type="xs:string"/> - </xs:attributeGroup> - - <xs:element name="servlet-session"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="web:attlist.servlet-session"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.servlet-session"> - <xs:attribute name="invalidate-on-scheme-change" type="xs:boolean"/> - </xs:attributeGroup> - -</xs:schema> +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" + targetNamespace="http://jboss.com/products/seam/web" xmlns:web="http://jboss.com/products/seam/web" + xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> + <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.0.xsd"/> + + <xs:element name="multipart-filter"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="web:attlist.filter"/> + <xs:attributeGroup ref="web:attlist.multipartFilter"/> + </xs:complexType> + </xs:element> + + <xs:element name="redirect-filter"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="web:attlist.filter"/> + </xs:complexType> + </xs:element> + + <xs:element name="exception-filter"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="web:attlist.filter"/> + </xs:complexType> + </xs:element> + + <xs:element name="context-filter"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="web:attlist.filter"/> + </xs:complexType> + </xs:element> + + <xs:element name="character-encoding-filter"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="web:attlist.filter"/> + <xs:attribute name="encoding" type="xs:string"/> + <xs:attribute name="override-client" type="xs:boolean"/> + </xs:complexType> + </xs:element> + + <xs:element name="authentication-filter"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="web:attlist.filter"/> + <xs:attribute name="realm" type="xs:string"/> + <xs:attribute name="key" type="xs:string"/> + <xs:attribute name="nonce-validity-seconds" type="xs:int"/> + <xs:attribute name="auth-type" type="xs:string"/> + </xs:complexType> + </xs:element> + + <xs:element name="logging-filter"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="web:attlist.filter"/> + </xs:complexType> + </xs:element> + + <xs:element name="ajax4jsf-filter"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="web:attlist.filter"/> + <xs:attributeGroup ref="web:attlist.ajax4jsfFilter"/> + </xs:complexType> + </xs:element> + + <xs:attributeGroup name="attlist.filter"> + <xs:attribute name="url-pattern" type="xs:string"/> + <xs:attribute name="regex-url-pattern" type="xs:string"/> + <xs:attribute name="disabled" type="xs:string" default="false" /> + </xs:attributeGroup> + + <xs:attributeGroup name="attlist.multipartFilter"> + <xs:attribute name="create-temp-files"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="true"/> + <xs:enumeration value="false"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="max-request-size" type="xs:integer"/> + </xs:attributeGroup> + + <xs:attributeGroup name="attlist.ajax4jsfFilter"> + <xs:attribute name="enable-cache"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="true"/> + <xs:enumeration value="false"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="force-parser"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="true"/> + <xs:enumeration value="false"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="log4j-init-file" type="xs:string"/> + </xs:attributeGroup> + + <xs:element name="servlet-session"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="web:attlist.servlet-session"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.servlet-session"> + <xs:attribute name="invalidate-on-scheme-change" type="xs:boolean"/> + </xs:attributeGroup> + +</xs:schema> 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 2008-04-03 15:19:36 UTC (rev 7299) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamComponentConstants.java 2008-04-03 15:32:49 UTC (rev 7300) @@ -20,8 +20,9 @@ public String ENT_SEAM_COMPONENTS_12 = ENT_SEAM_COMPONENTS + "12"; //$NON-NLS-1$ public String ENT_SEAM_COMPONENT_12 = "FileSeamComponent" + "12"; //$NON-NLS-1$ //$NON-NLS-2$ public String ENT_SEAM_COMPONENTS_20 = ENT_SEAM_COMPONENTS + SUFF_20; - public String ENT_SEAM_COMPONENT_20 = "FileSeamComponent" + SUFF_20; //$NON-NLS-1$ + public String ENT_SEAM_COMPONENT_FILE_20 = "FileSeamComponent" + SUFF_20; //$NON-NLS-1$ public String ENT_SEAM_COMPONENT = "SeamComponent"; //$NON-NLS-1$ + public String ENT_SEAM_COMPONENT_20 = ENT_SEAM_COMPONENT + SUFF_20; public String ENT_SEAM_FACTORY = "SeamFactory"; //$NON-NLS-1$ public String ENT_SEAM_FACTORY_20 = ENT_SEAM_FACTORY + SUFF_20; 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 2008-04-03 15:19:36 UTC (rev 7299) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamComponentsEntityRecognizer.java 2008-04-03 15:32:49 UTC (rev 7300) @@ -49,7 +49,7 @@ int i20 = schemaLocation.indexOf("2.0"); //$NON-NLS-1$ if(i20 >= 0) { - if(isSingleComponent) return ENT_SEAM_COMPONENT_20; + if(isSingleComponent) return ENT_SEAM_COMPONENT_FILE_20; if(isMultiComponent(body)) return ENT_SEAM_COMPONENTS_20; }