[jbosstools-commits] JBoss Tools SVN: r20738 - in trunk/jst/plugins/org.jboss.tools.jst.web: resources/meta and 1 other directories.

Author: scabanovich Date: 2010-03-10 10:23:33 -0500 (Wed, 10 Mar 2010) New Revision: 20738 Modified: trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web.properties trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/webapp30.meta trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/FileWebAppLoader.java Log: https://jira.jboss.org/jira/browse/JBIDE-5975 Modified: trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web.properties =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web.properties 2010-03-10 15:22:05 UTC (rev 20737) +++ trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web.properties 2010-03-10 15:23:33 UTC (rev 20738) @@ -366,37 +366,37 @@ WebAppJspConfig_CreatePropertyGroup.WindowTitle=Add JSP Property Group WebAppJspConfig_CreatePropertyGroup.Title=JSP Property Group -WebAppFolderResources_CreateResourceRef.WindowTitle=Add Resource Reference -WebAppFolderResources_CreateResourceRef.Title=Web Resource Reference +Web.CreateResourceRef.WindowTitle=Add Resource Reference +Web.CreateResourceRef.Title=Web Resource Reference -WebAppFolderResources_CreateResourceEnvRef.WindowTitle=Add Resource Env Reference -WebAppFolderResources_CreateResourceEnvRef.Title=Web Resource Env Reference +Web.CreateResourceEnvRef.WindowTitle=Add Resource Env Reference +Web.CreateResourceEnvRef.Title=Web Resource Env Reference WebAppFolderResources_Properties.Title=Resources -WebAppFolderSecurityConstraints_CreateSecurityConstraint.WindowTitle=Add Security Constraint -WebAppFolderSecurityConstraints_CreateSecurityConstraint.Title=Web Security Constraint +Web.CreateSecurityConstraint.WindowTitle=Add Security Constraint +Web.CreateSecurityConstraint.Title=Web Security Constraint WebAppFolderSecurityConstraints_Properties.Title=Security Constraints FileWebApp_CreateLoginConfig.WindowTitle=Add Login Config FileWebApp_CreateLoginConfig.Title=Web Login Config -WebAppFolderSecurityRoles_CreateSecurityRole.WindowTitle=Add Security Role -WebAppFolderSecurityRoles_CreateSecurityRole.Title=Web Security Role +Web.CreateSecurityRole.WindowTitle=Add Security Role +Web.CreateSecurityRole.Title=Web Security Role WebAppFolderSecurityRoles_Properties.Title=Security Roles -WebAppFolderEnvEntries_CreateEnvEntry.WindowTitle=Add Env Entry -WebAppFolderEnvEntries_CreateEnvEntry.Title=Web Env Entry +Web.CreateEnvEntry.WindowTitle=Add Env Entry +Web.CreateEnvEntry.Title=Web Env Entry WebAppFolderEnvEntries_Properties.Title=Env Entries -WebAppFolderEJB_CreateEjbRef.WindowTitle=Add EJB Ref -WebAppFolderEJB_CreateEjbRef.Title=Web EJB Ref +Web.CreateEjbRef.WindowTitle=Add EJB Ref +Web.CreateEjbRef.Title=Web EJB Ref -WebAppFolderEJB_CreateEjbLocalRef.WindowTitle=Add EJB Local Ref -WebAppFolderEJB_CreateEjbLocalRef.Title=Web EJB Local Ref +Web.CreateEjbLocalRef.WindowTitle=Add EJB Local Ref +Web.CreateEjbLocalRef.Title=Web EJB Local Ref WebAppFolderEJB_Properties.Title=EJB @@ -404,14 +404,14 @@ WebAppFolderFilters_CreateFilter.Title=Filter WebAppFolderFilters24_CreateFilter.WindowTitle=Add Filter WebAppFolderFilters24_CreateFilter.Title=Filter +WebAppFolderFilters30_CreateFilter.WindowTitle=Add Filter +WebAppFolderFilters30_CreateFilter.Title=Filter WebAppFolderFilters_Properties.Title=Filters WebAppFolderFilters24_Properties.Title=Filters -WebAppFolderFilters_CreateFilterMapping.WindowTitle=Add Filter Mapping -WebAppFolderFilters_CreateFilterMapping.Title=Filter Mapping -WebAppFolderFilters24_CreateFilterMapping.WindowTitle=Add Filter Mapping -WebAppFolderFilters24_CreateFilterMapping.Title=Filter Mapping +Web.CreateFilterMapping.WindowTitle=Add Filter Mapping +Web.CreateFilterMapping.Title=Filter Mapping WebAppFolderListeners_Properties.Title=Web Listeners WebAppFolderListeners24_Properties.Title=Web Listeners @@ -435,16 +435,16 @@ WebAppFolderPersistence25_CreatePersistenceUnitRef.Title=Web Persistence Unit Ref WebAppFolderPersistence25_Properties.Title=Persistence -WebAppFolderServices_CreateServiceRef.WindowTitle=Add Service Ref -WebAppFolderServices_CreateServiceRef.Title=Service Ref +Web.CreateServiceRef.WindowTitle=Add Service Ref +Web.CreateServiceRef.Title=Service Ref WebAppFolderServices_Properties.Title=Services -WebAppFolderMessageDestinations_CreateServiceMessageDestinationRef.WindowTitle=Add Service Message Destination Ref -WebAppFolderMessageDestinations_CreateServiceMessageDestinationRef.Title=Service Message Destination Ref +Web.CreateServiceMessageDestinationRef.WindowTitle=Add Service Message Destination Ref +Web.CreateServiceMessageDestinationRef.Title=Service Message Destination Ref -WebAppFolderMessageDestinations_CreateServiceMessageDestination.WindowTitle=Add Service Message Destination -WebAppFolderMessageDestinations_CreateServiceMessageDestination.Title=Service Message Destination +Web.CreateServiceMessageDestination.WindowTitle=Add Service Message Destination +Web.CreateServiceMessageDestination.Title=Service Message Destination WebAppFolderMessageDestinations_Properties.Title=Message Destinations @@ -506,17 +506,14 @@ WebAppSecurityConstraint_Properties.Title=Web Security Constraint -WebAppSecurityConstraint_CreateResourceCollection=/struts_pro/WebAppSecurityConstraint_CreateResourceCollection.html -WebAppSecurityConstraint_CreateResourceCollection.WindowTitle=Add Resource Collection -WebAppSecurityConstraint_CreateResourceCollection.Title=Web Resource Collection +Web.CreateResourceCollection.WindowTitle=Add Resource Collection +Web.CreateResourceCollection.Title=Web Resource Collection -WebAppSecurityConstraint_CreateAuthConstraint=/struts_pro/WebAppSecurityConstraint_CreateAuthConstraint.html -WebAppSecurityConstraint_CreateAuthConstraint.WindowTitle=Add Auth Constraint -WebAppSecurityConstraint_CreateAuthConstraint.Title=Web Auth Constraint +Web.CreateAuthConstraint.WindowTitle=Add Auth Constraint +Web.CreateAuthConstraint.Title=Web Auth Constraint -WebAppSecurityConstraint_CreateUserConstraint=/struts_pro/WebAppSecurityConstraint_CreateUserConstraint.html -WebAppSecurityConstraint_CreateUserConstraint.WindowTitle=Add User Constraint -WebAppSecurityConstraint_CreateUserConstraint.Title=Web User Constraint +Web.CreateUserConstraint.WindowTitle=Add User Constraint +Web.CreateUserConstraint.Title=Web User Constraint ##### web security-role element ##### @@ -530,15 +527,18 @@ WebAppServlet_Properties.Title=Web Servlet -WebAppServlet_CreateInitParam.WindowTitle=Add Init Param -WebAppServlet_CreateInitParam.Title=Web Init Param +Web.CreateSecurityRoleRef.WindowTitle=Add Security Role Reference +Web.CreateSecurityRoleRef.Title=Web Security Role Reference -WebAppServlet_CreateSecurityRoleRef.WindowTitle=Add Security Role Reference -WebAppServlet_CreateSecurityRoleRef.Title=Web Security Role Reference +Web.CreateRunAs.WindowTitle=Add Run As +Web.CreateRunAs.Title=Run As -WebAppServlet_CreateRunAs.WindowTitle=Add Run As -WebAppServlet_CreateRunAs.Title=Run As +Web.CreateMultipartConfig.WindowTitle=Add Multipart Config +Web.CreateMultipartConfig.Title=Multipart Config +Web.CreateCookieConfig.WindowTitle=Add Cookie Config +Web.CreateCookieConfig.Title=Cookie Config + ##### web servlet-mapping element ##### WebAppServletMapping_Properties.Title=Web Servlet Mapping @@ -570,7 +570,10 @@ Web.CreatePersistenceProperty.Title=Web Persistence Property Web.CreateInjectionTarget.WindowTitle=Add Injection Target Web.CreateInjectionTarget.Title=Web Injection Target +Web.CreateInitParam.WindowTitle=Add Init Param +Web.CreateInitParam.Title=Web Init Param + WebAppPersistenceContextRef25_Properties.Title=Web Persistence Context Ref WebAppPersistenceProperty25_Properties.Title=Web Persistence Property WebAppPersistenceUnitRef25_Properties.Title=Web Persistence Unit Ref @@ -659,3 +662,59 @@ OptionRoot_CreatePageTemplate_0.Title=Template OptionRoot_CreatePageTemplate.WindowTitle=Add Page Template OptionRoot_CreatePageTemplate.Title=Template + + + +## web.xml 3.0 ## +FileWebApp30_Properties.Title=File Web Descriptor 3.0 +WebAppAbsoluteOrdering_Properties.Title=Web Absolute Ordering +WebAppCookieConfig_Properties.Title=Web Cookie Config +WebAppDataSource30_Properties.Title=Web Data Source +WebAppEjbLocalRef30_Properties.Title=Web Ejb Local Ref +WebAppEjbRef30_Properties.Title=Web Ejb Ref +WebAppEnvEntry30_Properties.Title=Web Env Entry +WebAppFilter30_Properties.Title=Web Filter +WebAppFolderAbsoluteOrderings_Properties.Title=Absolute Orderings +WebAppFolderDataSources30_Properties.Title=Data Sources +WebAppFolderEJB30_Properties.Title=EJB +WebAppFolderEnvEntries30_Properties.Title=Env Entries +WebAppFolderFilters30_Properties.Title=Filters +WebAppFolderMessageDestinations30_Properties.Title=MessageDestinations +WebAppFolderResources30_Properties.Title=Resources +WebAppFolderSecurityConstraints30_Properties.Title=Security Constraints +WebAppFolderServices30_Properties.Title=Services +WebAppFolderServlets30_Properties.Title=Servlets +WebAppHandler30_Properties.Title=Handler +WebAppJSPPropertyGroup30_Properties.Title=JSP Property Group +WebAppJspConfig30_Properties.Title=JSP Config +WebAppMessageDestination30_Properties.Title=Message Destination +WebAppMessageDestinationRef30_Properties.Title=Message Destination Reference +WebAppMultipartConfig_Properties.Title=Multipart Config +WebAppPortComponentRef30_Properties.Title=Por tComponent Ref +WebAppPortName30_Properties.Title=Port Name +WebAppProperty30_Properties.Title=Data Source Property +WebAppResourceCollection30_Properties.Title=Web Resource Collection +WebAppResourceEnvRef30_Properties.Title=Web Resource Env Ref +WebAppResourceRef30_Properties.Title=Web Resource Ref +WebAppSecurityConstraint30_Properties.Title=Web Security Constraint +WebAppServiceRef30_Properties.Title=Service Ref +WebAppServlet30_Properties.Title=Web Servlet +WebAppSessionConfig30_Properties.Title=Web Session Config +WebAppSoapHeader30_Properties.Title=Web SOAP Header +WebAppSoapRole30_Properties.Title=Web SOAP Role + +FileWebApp30_CreateAbsoluteOrdering.WindowTitle=Add Absolute Ordering +FileWebApp30_CreateAbsoluteOrdering.Title=Absolute Ordering + +Web.CreateDataSource.WindowTitle=Add Data Source +Web.CreateDataSource.Title=Data Source + +WebAppDataSource30_CreateProperty.WindowTitle=Add Property +WebAppDataSource30_CreateProperty.Title=Property + +WebAppServiceRef30_CreatePortComponentRef.WindowTitle=Add Port Component Ref +WebAppServiceRef30_CreatePortComponentRef.Title=Port Component Ref + +WebAppServiceRef30_CreateHandler.WindowTitle=Add Handler +WebAppServiceRef30_CreateHandler.Title=Handler + Modified: trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/webapp30.meta =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/webapp30.meta 2010-03-10 15:22:05 UTC (rev 20737) +++ trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/webapp30.meta 2010-03-10 15:23:33 UTC (rev 20738) @@ -19,6 +19,7 @@ <XChildrenEntities> <XChildEntity maxCount="1" name="WebAppFolderAbsoluteOrderings" required="yes"/> <XChildEntity maxCount="1" name="WebAppFolderContextParams" required="yes"/> + <XChildEntity maxCount="1" name="WebAppFolderDataSources30" required="yes"/> <XChildEntity maxCount="1" name="WebAppFolderFilters30" required="yes"/> <XChildEntity maxCount="1" name="WebAppFolderListeners24" required="yes"/> <XChildEntity maxCount="1" name="WebAppFolderServlets30" required="yes"/> @@ -32,7 +33,7 @@ <XChildEntity maxCount="1" name="WebAppFolderSecurityRoles" required="yes"/> <XChildEntity maxCount="1" name="WebAppFolderEnvEntries30" required="yes"/> <XChildEntity maxCount="1" name="WebAppFolderEJB30" required="yes"/> - <XChildEntity maxCount="1" name="WebAppFolderServices" required="yes"/> + <XChildEntity maxCount="1" name="WebAppFolderServices30" required="yes"/> <XChildEntity maxCount="1" name="WebAppFolderResources30" required="yes"/> <XChildEntity maxCount="1" name="WebAppFolderMessageDestinations30" required="yes"/> <XChildEntity maxCount="1" name="WebAppLocaleEncodingMappingList" required="yes"/> @@ -141,6 +142,11 @@ WizardClassName="%Default%" displayName="Context Param..." kind="action" name="CreateContextParam"/> <XActionItem HandlerClassName="%Redirect%" + ICON="action.new.struts.webapp.param" + PROPERTIES="validator.add=true;sourcepath=Data Sources;actionpath=CreateActions/CreateDataSource" + WizardClassName="%Default%" displayName="Data Source..." + kind="action" name="CreateDataSource"/> + <XActionItem HandlerClassName="%Redirect%" ICON="action.new.struts.webapp.filter" PROPERTIES="validator.add=true;sourcepath=Filters;actionpath=CreateActions/CreateFilter" WizardClassName="%Default%" displayName="Filter..." kind="action" name="CreateFilter"/> @@ -226,11 +232,6 @@ WizardClassName="%Default%" displayName="Ejb Local Ref..." kind="action" name="CreateEjbLocalRef"/> <XActionItem HandlerClassName="%Redirect%" - ICON="action.new.struts.webapp.service" - PROPERTIES="validator.add=true;sourcepath=Services;actionpath=CreateActions/CreateServiceRef" - WizardClassName="%Default%" displayName="Service Ref..." - kind="action" name="CreateServiceRef"/> - <XActionItem HandlerClassName="%Redirect%" ICON="action.new.struts.webapp.res_env_ref" PROPERTIES="validator.add=true;sourcepath=Resources;actionpath=CreateActions/CreateResourceEnvRef" WizardClassName="%Default%" displayName="Resource Env Ref..." @@ -250,6 +251,11 @@ PROPERTIES="validator.add=true;sourcepath=Message Destinations;actionpath=CreateActions/CreateServiceMessageDestination" WizardClassName="%Default%" displayName="Message Destination..." kind="action" name="CreateServiceMessageDestination"/> + <XActionItem HandlerClassName="%Redirect%" + ICON="action.new.struts.webapp.service" + PROPERTIES="validator.add=true;sourcepath=Services;actionpath=CreateActions/CreateServiceRef" + WizardClassName="%Default%" displayName="Service Ref..." + kind="action" name="CreateServiceRef"/> <XActionItem HIDE="always" HandlerClassName="%Create%" ICON="action.new.struts.webapp.taglib" PROPERTIES="validator.add=true" @@ -343,6 +349,11 @@ WizardClassName="%Default%" displayName="Context Param..." kind="action" name="CreateContextParam"/> <XActionItem HandlerClassName="%Redirect%" + ICON="action.new.struts.webapp.param" + PROPERTIES="validator.add=true;sourcepath=Data Sources;actionpath=CreateActions/CreateDataSource" + WizardClassName="%Default%" displayName="Data Source..." + kind="action" name="CreateDataSource"/> + <XActionItem HandlerClassName="%Redirect%" ICON="action.new.struts.webapp.filter" PROPERTIES="validator.add=true;sourcepath=Filters;actionpath=CreateActions/CreateFilter" WizardClassName="%Default%" displayName="Filter..." kind="action" name="CreateFilter"/> @@ -551,7 +562,9 @@ </XActionItem> <XDependencies/> </XModelEntity> - <XModelEntity ImplementingClass="%Custom%" XMLSUBPATH="cookie-config" name="WebAppCookieConfig"> + <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jst.web.ui.editors.webapp.form.WebAppFormLayoutData" + XMLSUBPATH="cookie-config" name="WebAppCookieConfig"> <XChildrenEntities/> <XEntityRenderer> <ICONS> @@ -562,11 +575,12 @@ <XModelAttribute default="cookie config" loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttribute PROPERTIES="save=always;id=true" name="name" xmlname="name.#text"/> - <XModelAttribute name="domain" xmlname="domain.#text"/> - <XModelAttribute name="path" xmlname="path.#text"/> - <XModelAttribute name="comment" xmlname="comment.#text"/> - <XModelAttribute name="http-only" xmlname="http-only.#text"> + <XModelAttribute PROPERTIES="save=always;id=true;category=general" + name="name" xmlname="name.#text"/> + <XModelAttribute PROPERTIES="category=general" name="domain" xmlname="domain.#text"/> + <XModelAttribute PROPERTIES="category=general" name="path" xmlname="path.#text"/> + <XModelAttribute PROPERTIES="category=general" name="comment" xmlname="comment.#text"/> + <XModelAttribute PROPERTIES="category=general" name="http-only" xmlname="http-only.#text"> <Constraint loader="ListString"> <value/> <value name="true"/> @@ -574,7 +588,7 @@ </Constraint> <Editor name="ListString"/> </XModelAttribute> - <XModelAttribute name="secure" xmlname="secure.#text"> + <XModelAttribute PROPERTIES="category=general" name="secure" xmlname="secure.#text"> <Constraint loader="ListString"> <value/> <value name="true"/> @@ -582,11 +596,11 @@ </Constraint> <Editor name="ListString"/> </XModelAttribute> - <XModelAttribute name="id" visibility="false" xmlname="id"/> + <XModelAttribute PROPERTIES="category=general" name="max-age" xmlname="max-age.#text"/> + <XModelAttribute PROPERTIES="category=advanced" name="id" xmlname="id"/> <XModelAttribute TRIM="no" name="_comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> </XModelAttribute> - <XModelAttribute name="max-age" xmlname="max-age.#text"/> </XModelAttributes> <XActionItem kind="list"> <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> @@ -610,6 +624,106 @@ </XActionItem> <XDependencies/> </XModelEntity> + <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jst.web.ui.editors.webapp.form.WebAppFormLayoutData;children=%Ordered%" + XMLSUBPATH="data-source" name="WebAppDataSource30"> + <XChildrenEntities> + <XChildEntity name="WebAppProperty30"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.struts.webapp.env_entry" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="data source" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="description" xmlname="description.#text"> + <Editor name="Note"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;save=always;category=general" + name="name" xmlname="name.#text"/> + <XModelAttribute PROPERTIES="category=general" name="class-name" xmlname="class-name.#text"> + <Constraint> + <value name="java.lang.Boolean"/> + <value name="java.lang.String"/> + <value name="java.lang.Integer"/> + <value name="java.lang.Double"/> + <value name="java.lang.Float"/> + </Constraint> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="server-name" xmlname="server-name.#text"/> + <XModelAttribute PROPERTIES="category=general" name="port-number" xmlname="port-number.#text"/> + <XModelAttribute PROPERTIES="category=general" name="database-name" xmlname="database-name.#text"/> + <XModelAttribute PROPERTIES="category=general" name="url" xmlname="url.#text"/> + <XModelAttribute PROPERTIES="category=general" name="user" xmlname="user.#text"/> + <XModelAttribute PROPERTIES="category=general" name="password" xmlname="password.#text"/> + <XModelAttribute PROPERTIES="category=advanced" name="login-timeout" xmlname="login-timeout.#text"/> + <XModelAttribute PROPERTIES="category=advanced" name="transactional" xmlname="transactional.#text"> + <Constraint loader="ListString"> + <value/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced" + name="isolation-level" xmlname="isolation-level.#text"> + <Constraint loader="ListString"> + <value/> + <value name="TRANSACTION_READ_UNCOMMITTED"/> + <value name="TRANSACTION_REPEATABLE_READ"/> + <value name="TRANSACTION_READ_COMMITTED"/> + <value name="TRANSACTION_SERIALIZABLE"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced" + name="initial-pool-size" xmlname="initial-pool-size.#text"/> + <XModelAttribute PROPERTIES="category=advanced" name="max-pool-size" xmlname="max-pool-size.#text"/> + <XModelAttribute PROPERTIES="category=advanced" name="min-pool-size" xmlname="min-pool-size.#text"/> + <XModelAttribute PROPERTIES="category=advanced" name="max-idle-time" xmlname="max-idle-time.#text"/> + <XModelAttribute PROPERTIES="category=advanced" name="max-statements" xmlname="max-statements.#text"/> + <XModelAttribute PROPERTIES="category=advanced" name="id" + visibility="false" xmlname="id"/> + <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="Property..." kind="action" name="CreateProperty"> + <EntityData EntityName="WebAppProperty30"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="value"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.copy" 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%" XMLSUBPATH="ejb-local-ref" name="WebAppEjbLocalRef30"> <XChildrenEntities> <XChildEntity name="WebAppInjectionTarget25"/> @@ -967,6 +1081,57 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%WebAppAuxFolder%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jst.web.ui.editors.webapp.form.WebAppFormLayoutData;children=%Ordered%" name="WebAppFolderDataSources30"> + <XChildrenEntities> + <XChildEntity name="WebAppDataSource30"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.jsf.components" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="data sources" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;" default="Data Sources" + name="name" xmlname="NAME"> + <Editor name="Uneditable"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem ICON="action.empty" displayName="New" group="1" + kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%Create%" + ICON="action.new.struts.webapp.env_entry" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Data Source..." kind="action" name="CreateDataSource"> + <EntityData EntityName="WebAppDataSource30"> + <AttributeData AttributeName="name"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + <XActionItem BaseActionName="Copy" HandlerClassName="%CopyChildren%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%" + ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> + </XActionItem> + <XActionItem kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" + HandlerClassName="%DeleteChildren%" 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> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%WebAppAuxFolder%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jst.web.ui.editors.webapp.form.WebAppFormLayoutData;children=%Ordered%" name="WebAppFolderEJB30"> <XChildrenEntities> <XChildEntity name="WebAppEjbRef30"/> @@ -1328,6 +1493,57 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%WebAppAuxFolder%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jst.web.ui.editors.webapp.form.WebAppFormLayoutData;children=%Ordered%" name="WebAppFolderServices30"> + <XChildrenEntities> + <XChildEntity name="WebAppServiceRef30"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.jsf.components" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="services" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;" default="Services" name="name" xmlname="NAME"> + <Editor name="Uneditable"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem ICON="action.empty" displayName="New" group="1" + kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%Create%" + ICON="action.new.struts.webapp.service" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Service Ref..." kind="action" name="CreateServiceRef"> + <EntityData EntityName="WebAppServiceRef30"> + <AttributeData AttributeName="service-ref-name"/> + <AttributeData AttributeName="service-interface"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + <XActionItem BaseActionName="Copy" HandlerClassName="%CopyChildren%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%" + ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> + </XActionItem> + <XActionItem kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" + HandlerClassName="%DeleteChildren%" 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> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%WebAppAuxFolder%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jst.web.ui.editors.webapp.form.WebAppFormLayoutData;children=%EntityOrdered%" name="WebAppFolderServlets30"> <XChildrenEntities> <XChildEntity name="WebAppServlet30"/> @@ -1391,6 +1607,113 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jst.web.ui.editors.webapp.form.WebAppFormLayoutData;children=%EntityOrdered%" + XMLSUBPATH="handler" name="WebAppHandler30"> + <XChildrenEntities> + <XChildEntity name="WebAppInitParam"/> + <XChildEntity name="WebAppSoapHeader30"/> + <XChildEntity name="WebAppSoapRole30"/> + <XChildEntity name="WebAppPortName30"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.struts.webapp.service" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="handler" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="description" xmlname="description.#text"> + <Editor name="Note"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="display-name" xmlname="display-name.#text"/> + <XModelAttribute PROPERTIES="category=advanced" name="small-icon" xmlname="icon.small-icon.#text"> + <Constraint loader="Tree"> + <value name="WebPageTree"/> + <value name="extensions=gif,jpg"/> + </Constraint> + <Editor name="TreeChooser"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced" name="large-icon" xmlname="icon.large-icon.#text"> + <Constraint loader="Tree"> + <value name="WebPageTree"/> + <value name="extensions=gif,jpg"/> + </Constraint> + <Editor name="TreeChooser"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="save=always;category=general" + name="handler-name" xmlname="handler-name.#text"/> + <XModelAttribute PROPERTIES="save=always;category=general" + name="handler-class" xmlname="handler-class.#text"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced" name="id" + visibility="false" xmlname="id"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%Create%" + ICON="action.new.struts.webapp.param" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Add Init Param..." kind="action" name="CreateInitParam"> + <EntityData EntityName="WebAppInitParam"> + <AttributeData AttributeName="param-name"/> + <AttributeData AttributeName="param-value"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" + ICON="action.new.struts.webapp.param" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Add Soap Header..." kind="action" name="CreateSoapHeader"> + <EntityData EntityName="WebAppSoapHeader30"> + <AttributeData AttributeName="header"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" + ICON="action.new.struts.webapp.param" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Add Soap Role..." kind="action" name="CreateSoapRole"> + <EntityData EntityName="WebAppSoapRole30"> + <AttributeData AttributeName="role"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" + ICON="action.new.struts.webapp.param" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Add Port Name..." kind="action" name="CreatePortName"> + <EntityData EntityName="WebAppPortName30"> + <AttributeData AttributeName="name"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.copy" 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.jst.web.ui.editors.webapp.form.WebAppFormLayoutData" XMLSUBPATH="jsp-property-group" name="WebAppJSPPropertyGroup30"> <XChildrenEntities/> @@ -1733,7 +2056,7 @@ <Constraint loader="ListString"/> <Editor name="WebRoleList"/> </XModelAttribute> - <XModelAttribute name="id" visibility="false" xmlname="id"/> + <XModelAttribute name="id" xmlname="id"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> </XModelAttribute> @@ -1761,6 +2084,184 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jst.web.ui.editors.webapp.form.WebAppFormLayoutData" + XMLSUBPATH="port-component-ref" name="WebAppPortComponentRef30"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.struts.webapp.param" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="port component ref" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;save=always;category=general" + name="service-endpoint-interface" xmlname="service-endpoint-interface.#text"/> + <XModelAttribute PROPERTIES="category=general" name="enable-mtom" xmlname="enable-mtom.#text"> + <Constraint loader="ListString"> + <value/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="mtom-threshold" xmlname="mtom-threshold.#text"/> + <XModelAttribute PROPERTIES="category=general" + name="addressing enabled" xmlname="addressing.enabled.#text"> + <Constraint loader="ListString"> + <value/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" + name="addressing required" xmlname="addressing.required.#text"> + <Constraint loader="ListString"> + <value/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" + name="addressing responses" xmlname="addressing.responses.#text"> + <Constraint loader="ListString"> + <value/> + <value name="ALL"/> + <value name="ANONYMOUS"/> + <value name="NON_ANONYMOUS"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" + name="respect-binding enabled" xmlname="respect-binding.enabled.#text"> + <Constraint loader="ListString"> + <value/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" + name="port-component-link" xmlname="port-component-link.#text"/> + <XModelAttribute PROPERTIES="category=advanced" name="id" xmlname="id"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <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.copy" 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.jst.web.ui.editors.webapp.form.WebAppFormLayoutData" + XMLSUBPATH="port-name" name="WebAppPortName30"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.struts.webapp.param" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="port name" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;save=always;category=general" + name="name" xmlname="#text"/> + <XModelAttribute name="id" xmlname="id"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <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.copy" 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.jst.web.ui.editors.webapp.form.WebAppFormLayoutData" + XMLSUBPATH="property" name="WebAppProperty30"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.struts.webapp.param" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="property" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;save=always;category=general" + name="name" xmlname="name.#text"/> + <XModelAttribute PROPERTIES="save=always;category=general" + name="value" xmlname="value.#text"> + <Editor name="Note"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced" name="id" xmlname="id"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <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.copy" 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="children=%Ordered%" XMLSUBPATH="web-resource-collection" name="WebAppResourceCollection30"> <XChildrenEntities/> <XEntityRenderer> @@ -1990,7 +2491,7 @@ <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="category=general" name="display-name" xmlname="display-name.#text"/> - <XModelAttribute name="id" visibility="false" xmlname="id"/> + <XModelAttribute name="id" xmlname="id"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> </XModelAttribute> @@ -2046,6 +2547,106 @@ </XActionItem> <XDependencies/> </XModelEntity> + <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jst.web.ui.editors.webapp.form.WebAppFormLayoutData;children=%EntityOrdered%" + XMLSUBPATH="service-ref" name="WebAppServiceRef30"> + <XChildrenEntities> + <XChildEntity name="WebAppPortComponentRef30"/> + <XChildEntity name="WebAppHandler30"/> + <XChildEntity name="WebAppInjectionTarget25"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.struts.webapp.service" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="service reference" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="description" xmlname="description.#text"> + <Editor name="Note"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="display-name" xmlname="display-name.#text"/> + <XModelAttribute PROPERTIES="category=advanced" name="small-icon" xmlname="icon.small-icon.#text"> + <Constraint loader="Tree"> + <value name="WebPageTree"/> + <value name="extensions=gif,jpg"/> + </Constraint> + <Editor name="TreeChooser"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced" name="large-icon" xmlname="icon.large-icon.#text"> + <Constraint loader="Tree"> + <value name="WebPageTree"/> + <value name="extensions=gif,jpg"/> + </Constraint> + <Editor name="TreeChooser"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="save=always;category=general;id=true" + name="service-ref-name" xmlname="service-ref-name.#text"/> + <XModelAttribute PROPERTIES="save=always;category=general" + name="service-interface" xmlname="service-interface.#text"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="wsdl-file" xmlname="wsdl-file.#text"/> + <XModelAttribute PROPERTIES="category=general" + name="jaxrpc-mapping-file" xmlname="jaxrpc-mapping-file.#text"/> + <XModelAttribute name="service-qname" xmlname="service-qname.#text"/> + <XModelAttribute PROPERTIES="category=general" name="mapped-name" xmlname="mapped-name.#text"/> + <XModelAttribute PROPERTIES="category=general" name="lookup-name" xmlname="lookup-name.#text"/> + <XModelAttribute PROPERTIES="category=advanced" name="id" xmlname="id"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem ICON="action.empty" displayName="New" group="1" + kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Port Component Ref..." kind="action" name="CreatePortComponentRef"> + <EntityData EntityName="WebAppPortComponentRef30"> + <AttributeData AttributeName="service-endpoint-interface"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Handler..." kind="action" name="CreateHandler"> + <EntityData EntityName="WebAppHandler30"> + <AttributeData AttributeName="handler-name"/> + <AttributeData AttributeName="handler-class"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Injection Target..." kind="action" name="CreateInjectionTarget"> + <EntityData EntityName="WebAppInjectionTarget25"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="class"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.copy" 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="org.jboss.tools.jst.web.webapp.model.WebAppServletImpl" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jst.web.ui.editors.webapp.form.WebAppFormLayoutData" @@ -2182,8 +2783,8 @@ </XActionItem> <XDependencies/> </XModelEntity> - <XModelEntity - ImplementingClass="org.jboss.tools.jst.web.webapp.model.WebAppSessionConfigImpl" + <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jst.web.ui.editors.webapp.form.WebAppFormLayoutData;children=%Ordered%" XMLSUBPATH="session-config" name="WebAppSessionConfig30"> <XChildrenEntities> <XChildEntity name="WebAppCookieConfig"/> @@ -2194,13 +2795,14 @@ </ICONS> </XEntityRenderer> <XModelAttributes> - <XModelAttribute name="session-timeout" xmlname="session-timeout.#text"> + <XModelAttribute default="session-config" name="name" visibility="false"/> + <XModelAttribute PROPERTIES="category=general" name="session-timeout" xmlname="session-timeout.#text"> <Constraint loader="Int"> <value name="mandatory=false"/> </Constraint> <Editor name="Int"/> </XModelAttribute> - <XModelAttribute name="tracking-modes" xmlname="tracking-modes"> + <XModelAttribute PROPERTIES="category=general" name="tracking-modes" xmlname="tracking-modes"> <Constraint loader="ListAdd"> <value name="COOKIE"/> <value name="SSL"/> @@ -2208,12 +2810,22 @@ </Constraint> <Editor name="ListAdd"/> </XModelAttribute> - <XModelAttribute name="id" visibility="false" xmlname="id"/> + <XModelAttribute PROPERTIES="category=advanced" name="id" xmlname="id"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> </XModelAttribute> </XModelAttributes> <XActionItem kind="list"> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%Create%" + ICON="action.new.struts.webapp.param" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Add Cookie Config..." kind="action" name="CreateCookieConfig"> + <EntityData EntityName="WebAppCookieConfig"> + <AttributeData AttributeName="name"/> + </EntityData> + </XActionItem> + </XActionItem> <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> @@ -2232,6 +2844,90 @@ </XActionItem> <XDependencies/> </XModelEntity> + <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jst.web.ui.editors.webapp.form.WebAppFormLayoutData" + XMLSUBPATH="soap-header" name="WebAppSoapHeader30"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.struts.webapp.param" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="soap header" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;save=always;category=general" + name="header" xmlname="#text"/> + <XModelAttribute name="id" xmlname="id"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <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.copy" 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.jst.web.ui.editors.webapp.form.WebAppFormLayoutData" + XMLSUBPATH="soap-role" name="WebAppSoapRole30"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.struts.webapp.param" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="soap role" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;save=always;category=general" + name="role" xmlname="#text"/> + <XModelAttribute name="id" xmlname="id"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <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.copy" 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="FileFolder"> <XChildrenEntities> <XChildEntity name="FileWebApp30"/> Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/FileWebAppLoader.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/FileWebAppLoader.java 2010-03-10 15:22:05 UTC (rev 20737) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/FileWebAppLoader.java 2010-03-10 15:23:33 UTC (rev 20738) @@ -161,6 +161,24 @@ for (String a: attrs) if(o.getModelEntity().getAttribute(a) != null) { moveChild(element, a, afterName); } + } else if(entity.startsWith("WebAppDataSource")) { //$NON-NLS-1$ + boolean b = super.saveChildren(element, o); + String afterName = null; + XAttribute[] as = o.getModelEntity().getAttributes(); + boolean f = false; + for (int i = 0; i < as.length; i++) { + String n = as[i].getName(); + if(!f && "login-timeout".equals(n)) f = true; //$NON-NLS-1$ + if(f && XMLUtilities.getUniqueChild(element, n) != null) { + afterName = n; + break; + } + if("max-statements".equals(n)) { //$NON-NLS-1$ + break; + } + } + if(afterName != null) moveChild(element, "property", afterName); //$NON-NLS-1$ + return b; } else { boolean b = super.saveChildren(element, o); if(o.getModelEntity().getAttribute("mapped-name") != null) { //$NON-NLS-1$