Author: scabanovich Date: 2009-08-28 06:25:35 -0400 (Fri, 28 Aug 2009) New Revision: 17345 Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam-attrs.properties trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam-lists.properties trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.properties trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-async.meta trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-core.meta trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-drools.meta trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-framework.meta trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-international.meta trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-jms.meta trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-mail.meta trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-pdf.meta trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-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-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-ui.meta trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-web.meta trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-wicket.meta trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamComponentsFileLoader.java Log: https://jira.jboss.org/jira/browse/JBIDE-4811 Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam-attrs.properties =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam-attrs.properties 2009-08-28 06:17:49 UTC (rev 17344) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam-attrs.properties 2009-08-28 10:25:35 UTC (rev 17345) @@ -27,6 +27,8 @@ Seam.persistence-unit-name=Persistence-Unit-Name Seam.filter_name=Filter Name Seam.enabled=Enabled +Seam.consequence-exception-handler=Consequence-Exception-Handler +Seam.mode=Mode Seam.debug=Debug Seam.jndi-pattern=Jndi-Pattern Seam.client-side-conversations=Client-Side-Conversations @@ -108,6 +110,7 @@ Seam.role-identity-store=Role-Identity-Store Seam.user-class=User-Class Seam.role-class=Role-Class +Seam.token-class=Token-Class Seam.features=Features Seam.user-permission-class=User-Permission-Class Seam.role-permission-class=Role-Permission-Class Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam-lists.properties =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam-lists.properties 2009-08-28 06:17:49 UTC (rev 17344) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam-lists.properties 2009-08-28 10:25:35 UTC (rev 17345) @@ -21,4 +21,7 @@ Seam.lists.MANUAL=MANUAL Seam.lists.AUTO=AUTO Seam.lists.COMMIT=COMMIT +Seam.lists.usernameOnly=usernameOnly +Seam.lists.disabled=disabled +Seam.lists.autoLogin=autoLogin # END NON-TRANSLATABLE Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.properties =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.properties 2009-08-28 06:17:49 UTC (rev 17344) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.properties 2009-08-28 10:25:35 UTC (rev 17345) @@ -1374,6 +1374,9 @@ FileSeamComponents21_AddWebApplication.WindowTitle=Add Web Application FileSeamComponents21_AddWebApplication.Title=Seam Wicket Web App +FileSeamComponents21_AddRememberMe.WindowTitle=Add Remember Me +FileSeamComponents21_AddRememberMe.Title=Seam Sequrity Remember Me + FileSeamComponents22_AddIdentity.WindowTitle=Add Identity FileSeamComponents22_AddIdentity.Title=Seam Security Identity @@ -1386,6 +1389,9 @@ FileSeamComponents22_AddJPAIdentityStore.WindowTitle=Add JPA Identity Store FileSeamComponents22_AddJPAIdentityStore.Title=Seam Security JPAIdentity Store +FileSeamComponents22_AddJPATokenStore.WindowTitle=Add JPA Token Store +FileSeamComponents22_AddJPATokenStore.Title=Seam Security JPAToken Store + FileSeamComponents22_AddLDAPIdentityStore.WindowTitle=Add LDAP Identity Store FileSeamComponents22_AddLDAPIdentityStore.Title=Seam Security LDAPIdentity Store @@ -1401,6 +1407,9 @@ FileSeamComponents22_AddPersistentPermissionResolver.WindowTitle=Add Persistent Permission Resolver FileSeamComponents22_AddPersistentPermissionResolver.Title=Seam Security Persistent Permission Resolver +FileSeamComponents22_AddRememberMe.WindowTitle=Add Remember Me +FileSeamComponents22_AddRememberMe.Title=Seam Sequrity Remember Me + FileSeamComponents22_AddThemeSelector.WindowTitle=Add Theme Selector FileSeamComponents22_AddThemeSelector.Title=Seam Theme Selector 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 2009-08-28 06:17:49 UTC (rev 17344) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-async.meta 2009-08-28 10:25:35 UTC (rev 17345) @@ -11,6 +11,7 @@ <MAPPING name="SeamSchemas"> <PAIR name="async$20" value="http://jboss.com/products/seam/async-2.0.xsd"/> <PAIR name="async$21" value="http://jboss.com/products/seam/async-2.1.xsd"/> + <PAIR name="async$22" value="http://jboss.com/products/seam/async-2.2.xsd"/> </MAPPING> </MAPPINGS> <ICONS> 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 2009-08-28 06:17:49 UTC (rev 17344) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-core.meta 2009-08-28 10:25:35 UTC (rev 17345) @@ -12,9 +12,11 @@ <MAPPING name="SeamSchemas"> <PAIR name="bpm$20" value="http://jboss.com/products/seam/bpm-2.0.xsd"/> <PAIR name="bpm$21" value="http://jboss.com/products/seam/bpm-2.1.xsd"/> + <PAIR name="bpm$22" value="http://jboss.com/products/seam/bpm-2.2.xsd"/> <PAIR name="core" value="http://jboss.com/products/seam/core-1.2.xsd"/> <PAIR name="core$20" value="http://jboss.com/products/seam/core-2.0.xsd"/> <PAIR name="core$21" value="http://jboss.com/products/seam/core-2.1.xsd"/> + <PAIR name="core$22" value="http://jboss.com/products/seam/core-2.2.xsd"/> </MAPPING> </MAPPINGS> <ICONS> 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 2009-08-28 06:17:49 UTC (rev 17344) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-drools.meta 2009-08-28 10:25:35 UTC (rev 17345) @@ -12,6 +12,7 @@ <PAIR name="drools" value="http://jboss.com/products/seam/drools-1.2.xsd"/> <PAIR name="drools$20" value="http://jboss.com/products/seam/drools-2.0.xsd"/> <PAIR name="drools$21" value="http://jboss.com/products/seam/drools-2.1.xsd"/> + <PAIR name="drools$22" value="http://jboss.com/products/seam/drools-2.2.xsd"/> </MAPPING> </MAPPINGS> <ICONS> @@ -31,6 +32,63 @@ </ICONS> <GlobalActions kind="list"/> <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.core.SeamComponentsCoreFormLayoutData;children=%Ordered%;childrenLoader=list;saveDefault=false" + XMLSUBPATH="drools:event-listeners" name="SeamDroolsEventListeners22"> + <XChildrenEntities> + <XChildEntity name="SeamListEntry"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam.property" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="event listeners" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;category=general" + default="event-listeners" name="name"> + <Editor name="Uneditable"/> + </XModelAttribute> + <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" + WizardClassName="%Default%" displayName="Add Entry..." + kind="action" name="AddEntry"> + <EntityData EntityName="SeamListEntry"> + <AttributeData AttributeName="value"/> + </EntityData> + </XActionItem> + </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.core.SeamComponentsCoreFormLayoutData" XMLSUBPATH="drools:managed-working-memory" name="SeamDroolsManagedWorkingMemory"> <XChildrenEntities/> @@ -80,6 +138,56 @@ </XModelEntity> <XModelEntity ImplementingClass="%Custom%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.core.SeamComponentsCoreFormLayoutData" + XMLSUBPATH="drools:managed-working-memory" name="SeamDroolsManagedWorkingMemory22"> + <XChildrenEntities> + <XChildEntity maxCount="1" name="SeamDroolsEventListeners22" required="yes"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam.drools.memory" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="managed working memory" + loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttributeReference + attributes="name,class,scope,precedence,installed,auto-create" + entity="SeamComponent" name="component"/> + <XModelAttribute PROPERTIES="category=general" name="rule-base" xmlname="rule-base"/> + <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"> + <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/> + </XActionItem> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + </XActionItem> + <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="drools:rule-agent" name="SeamDroolsRuleAgent"> <XChildrenEntities/> <XEntityRenderer> @@ -184,6 +292,58 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.core.SeamComponentsCoreFormLayoutData" + XMLSUBPATH="drools:rule-base" name="SeamDroolsRuleBase22"> + <XChildrenEntities> + <XChildEntity maxCount="1" name="SeamDroolsRuleFiles" required="yes"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam.drools.base" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="rule base" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttributeReference + attributes="name,class,scope,precedence,installed,auto-create" + entity="SeamComponent" name="component"/> + <XModelAttribute PROPERTIES="category=advanced" name="dsl-file" xmlname="dsl-file"/> + <XModelAttribute PROPERTIES="category=general" name="rule-files" xmlname="rule-files"/> + <XModelAttribute PROPERTIES="category=advanced" + name="consequence-exception-handler" xmlname="consequence-exception-handler"/> + <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"> + <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/> + </XActionItem> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + </XActionItem> + <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;children=%Ordered%;childrenLoader=list;saveDefault=false" XMLSUBPATH="drools:rule-files" name="SeamDroolsRuleFiles"> <XChildrenEntities> @@ -376,8 +536,8 @@ </XEntityExtension> <XEntityExtension name="FileSeamComponents22"> <XChildrenEntities> - <XChildEntity name="SeamDroolsManagedWorkingMemory"/> - <XChildEntity name="SeamDroolsRuleBase"/> + <XChildEntity name="SeamDroolsManagedWorkingMemory22"/> + <XChildEntity name="SeamDroolsRuleBase22"/> <XChildEntity name="SeamDroolsRuleAgent"/> </XChildrenEntities> <XActionItem kind="list"> @@ -388,7 +548,7 @@ <XActionItem HandlerClassName="%Create%" ICON="action.empty" PROPERTIES="validator.add=true" WizardClassName="%Default%" displayName="Managed Working Memory..." kind="action" name="AddManagedWorkingMemory"> - <EntityData EntityName="SeamDroolsManagedWorkingMemory"> + <EntityData EntityName="SeamDroolsManagedWorkingMemory22"> <AttributeData AttributeName="name"/> <AttributeData AttributeName="rule-base" Mandatory="no"/> </EntityData> @@ -396,7 +556,7 @@ <XActionItem HandlerClassName="%Create%" ICON="action.empty" PROPERTIES="validator.add=true" WizardClassName="%Default%" displayName="Rule Base..." kind="action" name="AddRuleBase"> - <EntityData EntityName="SeamDroolsRuleBase"> + <EntityData EntityName="SeamDroolsRuleBase22"> <AttributeData AttributeName="name"/> <AttributeData AttributeName="rule-files" Mandatory="no"/> </EntityData> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-framework.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-framework.meta 2009-08-28 06:17:49 UTC (rev 17344) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-framework.meta 2009-08-28 10:25:35 UTC (rev 17345) @@ -12,6 +12,7 @@ <PAIR name="framework" value="http://jboss.com/products/seam/framework-1.2.xsd"/> <PAIR name="framework$20" value="http://jboss.com/products/seam/framework-2.0.xsd"/> <PAIR name="framework$21" value="http://jboss.com/products/seam/framework-2.1.xsd"/> + <PAIR name="framework$22" value="http://jboss.com/products/seam/framework-2.2.xsd"/> </MAPPING> </MAPPINGS> <ICONS> 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 2009-08-28 06:17:49 UTC (rev 17344) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-international.meta 2009-08-28 10:25:35 UTC (rev 17345) @@ -11,6 +11,7 @@ <MAPPING name="SeamSchemas"> <PAIR name="international$20" value="http://jboss.com/products/seam/international-2.0.xsd"/> <PAIR name="international$21" value="http://jboss.com/products/seam/international-2.1.xsd"/> + <PAIR name="international$22" value="http://jboss.com/products/seam/international-2.2.xsd"/> </MAPPING> </MAPPINGS> <ICONS> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-jms.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-jms.meta 2009-08-28 06:17:49 UTC (rev 17344) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-jms.meta 2009-08-28 10:25:35 UTC (rev 17345) @@ -12,6 +12,7 @@ <PAIR name="jms" value="http://jboss.com/products/seam/jms-1.2.xsd"/> <PAIR name="jms$20" value="http://jboss.com/products/seam/jms-2.0.xsd"/> <PAIR name="jms$21" value="http://jboss.com/products/seam/jms-2.1.xsd"/> + <PAIR name="jms$22" value="http://jboss.com/products/seam/jms-2.2.xsd"/> </MAPPING> </MAPPINGS> <ICONS> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-mail.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-mail.meta 2009-08-28 06:17:49 UTC (rev 17344) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-mail.meta 2009-08-28 10:25:35 UTC (rev 17345) @@ -12,6 +12,7 @@ <PAIR name="mail" value="http://jboss.com/products/seam/mail-1.2.xsd"/> <PAIR name="mail$20" value="http://jboss.com/products/seam/mail-2.0.xsd"/> <PAIR name="mail$21" value="http://jboss.com/products/seam/mail-2.1.xsd"/> + <PAIR name="mail$22" value="http://jboss.com/products/seam/mail-2.2.xsd"/> </MAPPING> </MAPPINGS> <ICONS> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-pdf.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-pdf.meta 2009-08-28 06:17:49 UTC (rev 17344) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-pdf.meta 2009-08-28 10:25:35 UTC (rev 17345) @@ -12,6 +12,7 @@ <PAIR name="pdf" value="http://jboss.com/products/seam/pdf-1.2.xsd"/> <PAIR name="pdf$20" value="http://jboss.com/products/seam/pdf-2.0.xsd"/> <PAIR name="pdf$21" value="http://jboss.com/products/seam/pdf-2.1.xsd"/> + <PAIR name="pdf$22" value="http://jboss.com/products/seam/pdf-2.2.xsd"/> </MAPPING> </MAPPINGS> <ICONS> 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 2009-08-28 06:17:49 UTC (rev 17344) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-persistence.meta 2009-08-28 10:25:35 UTC (rev 17345) @@ -11,6 +11,7 @@ <MAPPING name="SeamSchemas"> <PAIR name="persistence$20" value="http://jboss.com/products/seam/persistence-2.0.xsd"/> <PAIR name="persistence$21" value="http://jboss.com/products/seam/persistence-2.1.xsd"/> + <PAIR name="persistence$22" value="http://jboss.com/products/seam/persistence-2.2.xsd"/> </MAPPING> </MAPPINGS> <ICONS> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-remoting.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-remoting.meta 2009-08-28 06:17:49 UTC (rev 17344) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-remoting.meta 2009-08-28 10:25:35 UTC (rev 17345) @@ -12,6 +12,7 @@ <PAIR name="remoting" value="http://jboss.com/products/seam/remoting-1.2.xsd"/> <PAIR name="remoting$20" value="http://jboss.com/products/seam/remoting-2.0.xsd"/> <PAIR name="remoting$21" value="http://jboss.com/products/seam/remoting-2.1.xsd"/> + <PAIR name="remoting$22" value="http://jboss.com/products/seam/remoting-2.2.xsd"/> </MAPPING> </MAPPINGS> <ICONS> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-security.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-security.meta 2009-08-28 06:17:49 UTC (rev 17344) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-security.meta 2009-08-28 10:25:35 UTC (rev 17345) @@ -12,6 +12,7 @@ <PAIR name="security" value="http://jboss.com/products/seam/security-1.2.xsd"/> <PAIR name="security$20" value="http://jboss.com/products/seam/security-2.0.xsd"/> <PAIR name="security$21" value="http://jboss.com/products/seam/security-2.1.xsd"/> + <PAIR name="security$22" value="http://jboss.com/products/seam/security-2.2.xsd"/> </MAPPING> </MAPPINGS> <ICONS> @@ -362,6 +363,45 @@ </XModelEntity> <XModelEntity ImplementingClass="%Custom%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.core.SeamComponentsCoreFormLayoutData" + XMLSUBPATH="security:jpa-token-store" name="SeamSecurityJPATokenStore22"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam.security.identity" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="jpa-token-store" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;category=general" + default="org.jboss.seam.security.jpaTokenStore" name="name" xmlname="name"/> + <XModelAttributeReference + attributes="class,scope,precedence,installed,auto-create,startup,startupDepends" + entity="SeamComponent21" name="component"/> + <XModelAttribute PROPERTIES="category=general" name="entity-manager" xmlname="entity-manager"/> + <XModelAttribute PROPERTIES="category=advanced" name="token-class" xmlname="token-class"/> + <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"> + <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/> + </XActionItem> + <XActionItemReference entity="SeamSecurityIdentity" + name="CopyActions" path="CopyActions"/> + <XActionItemReference entity="SeamSecurityIdentity" + name="DeleteActions" path="DeleteActions"/> + <XActionItemReference entity="SeamSecurityIdentity" name="Properties" path="Properties"/> + <XActionItemReference entity="SeamSecurityIdentity" + 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="security:ldap-identity-store" name="SeamSecurityLDAPIdentityStore21"> <XChildrenEntities/> <XEntityRenderer> @@ -520,6 +560,131 @@ </XModelEntity> <XModelEntity ImplementingClass="%Custom%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.core.SeamComponentsCoreFormLayoutData" + XMLSUBPATH="security:remember-me" name="SeamSecurityRememberMe21"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam.security.identity" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="remember-me" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;category=general" + default="org.jboss.seam.security.rememberMe" name="name" xmlname="name"/> + <XModelAttributeReference + attributes="class,scope,precedence,installed,auto-create" + entity="SeamComponent" name="component"/> + <XModelAttribute PROPERTIES="category=advanced" name="cookie-max-age" xmlname="cookie-max-age"/> + <XModelAttribute PROPERTIES="category=advanced" + default="default(true)" name="enabled" xmlname="enabled"> + <Constraint loader="ListString"> + <value name="default(true)"/> + <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"> + <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/> + </XActionItem> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + </XActionItem> + <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:remember-me" name="SeamSecurityRememberMe22"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam.security.identity" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="remember-me" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;category=general" + default="org.jboss.seam.security.rememberMe" name="name" xmlname="name"/> + <XModelAttributeReference + attributes="class,scope,precedence,installed,auto-create" + entity="SeamComponent" name="component"/> + <XModelAttribute PROPERTIES="category=advanced" name="cookie-max-age" xmlname="cookie-max-age"/> + <XModelAttribute PROPERTIES="category=advanced" + default="default(true)" name="enabled" xmlname="enabled"> + <Constraint loader="ListString"> + <value name="default(true)"/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced" name="mode" xmlname="mode"> + <Constraint loader="ListString"> + <value/> + <value name="disabled"/> + <value name="usernameOnly"/> + <value name="autoLogin"/> + </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"> + <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/> + </XActionItem> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + </XActionItem> + <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:rule-based-permission-resolver" name="SeamSecurityRuleBasedPermissionResolver21"> <XChildrenEntities/> <XEntityRenderer> @@ -641,6 +806,7 @@ <XChildEntity name="SeamSecurityJPAPermissionStore21"/> <XChildEntity name="SeamSecurityRuleBasedPermissionResolver21"/> <XChildEntity name="SeamSecurityPersistentPermissionResolver21"/> + <XChildEntity name="SeamSecurityRememberMe21"/> </XChildrenEntities> <XActionItem kind="list"> <XActionItem ICON="action.empty" displayName="New" group="1" @@ -723,6 +889,15 @@ <AttributeData AttributeName="permission-store" Mandatory="no"/> </EntityData> </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Remember Me..." kind="action" name="AddRememberMe"> + <EntityData EntityName="SeamSecurityRememberMe21"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="cookie-max-age" Mandatory="no"/> + <AttributeData AttributeName="enabled" Mandatory="no"/> + </EntityData> + </XActionItem> </XActionItem> </XActionItem> </XActionItem> @@ -733,11 +908,13 @@ <XChildEntity name="SeamFacesSecurityEvents20"/> <XChildEntity name="SeamSecurityIdentityManager21"/> <XChildEntity name="SeamSecurityJPAIdentityStore21"/> + <XChildEntity name="SeamSecurityJPATokenStore22"/> <XChildEntity name="SeamSecurityLDAPIdentityStore21"/> <XChildEntity name="SeamSecurityPermissionManager21"/> <XChildEntity name="SeamSecurityJPAPermissionStore21"/> <XChildEntity name="SeamSecurityRuleBasedPermissionResolver21"/> <XChildEntity name="SeamSecurityPersistentPermissionResolver21"/> + <XChildEntity name="SeamSecurityRememberMe22"/> </XChildrenEntities> <XActionItem kind="list"> <XActionItem ICON="action.empty" displayName="New" group="1" @@ -780,6 +957,15 @@ </XActionItem> <XActionItem HandlerClassName="%Create%" ICON="action.empty" PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="JPA Token Store..." kind="action" name="AddJPATokenStore"> + <EntityData EntityName="SeamSecurityJPATokenStore22"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="entity-manager" Mandatory="no"/> + <AttributeData AttributeName="token-class" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" displayName="LDAP Identity Store..." kind="action" name="AddLDAPIdentityStore"> <EntityData EntityName="SeamSecurityLDAPIdentityStore21"> <AttributeData AttributeName="name"/> @@ -820,6 +1006,16 @@ <AttributeData AttributeName="permission-store" Mandatory="no"/> </EntityData> </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Remember Me..." kind="action" name="AddRememberMe"> + <EntityData EntityName="SeamSecurityRememberMe22"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="cookie-max-age" Mandatory="no"/> + <AttributeData AttributeName="enabled" Mandatory="no"/> + <AttributeData AttributeName="mode" Mandatory="no"/> + </EntityData> + </XActionItem> </XActionItem> </XActionItem> </XActionItem> 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 2009-08-28 06:17:49 UTC (rev 17344) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-theme.meta 2009-08-28 10:25:35 UTC (rev 17345) @@ -12,6 +12,7 @@ <PAIR name="theme" value="http://jboss.com/products/seam/theme-1.2.xsd"/> <PAIR name="theme$20" value="http://jboss.com/products/seam/theme-2.0.xsd"/> <PAIR name="theme$21" value="http://jboss.com/products/seam/theme-2.1.xsd"/> + <PAIR name="theme$22" value="http://jboss.com/products/seam/theme-2.2.xsd"/> </MAPPING> </MAPPINGS> <ICONS> 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 2009-08-28 06:17:49 UTC (rev 17344) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-transaction.meta 2009-08-28 10:25:35 UTC (rev 17345) @@ -11,6 +11,7 @@ <MAPPING name="SeamSchemas"> <PAIR name="transaction$20" value="http://jboss.com/products/seam/transaction-2.0.xsd"/> <PAIR name="transaction$21" value="http://jboss.com/products/seam/transaction-2.1.xsd"/> + <PAIR name="transaction$22" value="http://jboss.com/products/seam/transaction-2.2.xsd"/> </MAPPING> </MAPPINGS> <ICONS> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-ui.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-ui.meta 2009-08-28 06:17:49 UTC (rev 17344) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-ui.meta 2009-08-28 10:25:35 UTC (rev 17345) @@ -10,6 +10,7 @@ </MAPPING> <MAPPING name="SeamSchemas"> <PAIR name="ui$21" value="http://jboss.com/products/seam/ui-2.1.xsd"/> + <PAIR name="ui$22" value="http://jboss.com/products/seam/ui-2.2.xsd"/> </MAPPING> </MAPPINGS> <ICONS> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-web.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-web.meta 2009-08-28 06:17:49 UTC (rev 17344) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-web.meta 2009-08-28 10:25:35 UTC (rev 17345) @@ -12,6 +12,7 @@ <PAIR name="web" value="http://jboss.com/products/seam/web-1.2.xsd"/> <PAIR name="web$20" value="http://jboss.com/products/seam/web-2.0.xsd"/> <PAIR name="web$21" value="http://jboss.com/products/seam/web-2.1.xsd"/> + <PAIR name="web$22" value="http://jboss.com/products/seam/web-2.2.xsd"/> </MAPPING> </MAPPINGS> <ICONS> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-wicket.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-wicket.meta 2009-08-28 06:17:49 UTC (rev 17344) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-wicket.meta 2009-08-28 10:25:35 UTC (rev 17345) @@ -10,6 +10,7 @@ </MAPPING> <MAPPING name="SeamSchemas"> <PAIR name="wicket$21" value="http://jboss.com/products/seam/wicket-2.1.xsd"/> + <PAIR name="wicket$22" value="http://jboss.com/products/seam/wicket-2.2.xsd"/> </MAPPING> </MAPPINGS> <ICONS> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamComponentsFileLoader.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamComponentsFileLoader.java 2009-08-28 06:17:49 UTC (rev 17344) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamComponentsFileLoader.java 2009-08-28 10:25:35 UTC (rev 17345) @@ -53,7 +53,7 @@ String entity = o.getModelEntity().getName(); if(entity.endsWith(SeamComponentConstants.SUFF_20)) return "$20"; //$NON-NLS-1$ if(entity.endsWith(SeamComponentConstants.SUFF_21)) return "$21"; //$NON-NLS-1$ - if(entity.endsWith(SeamComponentConstants.SUFF_22)) return "$21"; //$NON-NLS-1$ + if(entity.endsWith(SeamComponentConstants.SUFF_22)) return "$22"; //$NON-NLS-1$ return ""; //$NON-NLS-1$ }