[jbosstools-commits] JBoss Tools SVN: r20709 - in trunk/jst/plugins/org.jboss.tools.jst.web.ui: src/org/jboss/tools/jst/web/ui and 1 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Tue Mar 9 12:31:05 EST 2010
Author: scabanovich
Date: 2010-03-09 12:31:04 -0500 (Tue, 09 Mar 2010)
New Revision: 20709
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/Messages.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppFileFormLayoutData.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppFilterFormLayoutData.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppFoldersFormLayoutData.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppFormLayoutData.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppJspConfigFormLayoutData.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppSecurityConstraintFormLayoutData.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppServletFormLayoutData.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/messages.properties
Log:
https://jira.jboss.org/jira/browse/JBIDE-5975
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2010-03-09 17:30:08 UTC (rev 20708)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2010-03-09 17:31:04 UTC (rev 20709)
@@ -33,7 +33,7 @@
<xmlEditor
class="org.jboss.tools.jst.web.ui.editors.WebCompoundEditor"
contributorClass="org.jboss.tools.common.model.ui.texteditors.MultiPageContributor"
- entities="FileWebApp,FileWebApp24,FileWebApp25"
+ entities="FileWebApp,FileWebApp24,FileWebApp25,FileWebApp30"
icon="$nl$/images/xstudio/editors/webapp_file.gif"
name="%editors.web.name">
</xmlEditor>
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/Messages.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/Messages.java 2010-03-09 17:30:08 UTC (rev 20708)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/Messages.java 2010-03-09 17:31:04 UTC (rev 20709)
@@ -46,6 +46,7 @@
public static String WebAppFileFormLayoutData_WebDesc23;
public static String WebAppFileFormLayoutData_WebDesc24;
public static String WebAppFileFormLayoutData_WebDesc25;
+ public static String WebAppFileFormLayoutData_WebDesc30;
public static String WebAppFoldersFormLayoutData_ErrorPages;
public static String WebAppFoldersFormLayoutData_WebAppErrorPage;
public static String WebAppFoldersFormLayoutData_ResourceEnvRefs;
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppFileFormLayoutData.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppFileFormLayoutData.java 2010-03-09 17:30:08 UTC (rev 20708)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppFileFormLayoutData.java 2010-03-09 17:31:04 UTC (rev 20709)
@@ -19,6 +19,7 @@
static String FILE_23_ENTITY = "FileWebApp"; //$NON-NLS-1$
static String FILE_24_ENTITY = "FileWebApp24"; //$NON-NLS-1$
static String FILE_25_ENTITY = "FileWebApp25"; //$NON-NLS-1$
+ static String FILE_30_ENTITY = "FileWebApp30"; //$NON-NLS-1$
static IFormData CONTEXT_PARAM_FOLDER_DEFINITION = new FormData(
Messages.WebAppFileFormLayoutData_ContextParams,
@@ -57,6 +58,10 @@
FILE_25_ENTITY, new String[]{null}, createFileDefinitions(Messages.WebAppFileFormLayoutData_WebDesc25, FILE_25_ENTITY)
);
+ public static IFormData FILE_WEB_APP_30_DEFINITION = new FormData(
+ FILE_30_ENTITY, new String[]{null}, createFileDefinitions(Messages.WebAppFileFormLayoutData_WebDesc30, FILE_30_ENTITY)
+ );
+
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppFilterFormLayoutData.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppFilterFormLayoutData.java 2010-03-09 17:30:08 UTC (rev 20708)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppFilterFormLayoutData.java 2010-03-09 17:31:04 UTC (rev 20709)
@@ -12,9 +12,9 @@
import org.jboss.tools.common.model.ui.forms.*;
import org.jboss.tools.jst.web.messages.xpl.WebUIMessages;
+import org.jboss.tools.jst.web.model.helpers.WebAppHelper;
public class WebAppFilterFormLayoutData {
- static String FILTER_ENTITY = "WebAppFilter"; //$NON-NLS-1$
static String INIT_PARAM_ENTITY = "WebAppInitParam"; //$NON-NLS-1$
static IFormData INIT_PARAM_LIST_DEFINITION = new FormData(
@@ -29,17 +29,34 @@
new FormData(
WebUIMessages.FILTER,
WebAppJspConfigFormLayoutData.EMPTY_DESCRIPTION,
- FormLayoutDataUtil.createGeneralFormAttributeData(FILTER_ENTITY)
+ FormLayoutDataUtil.createGeneralFormAttributeData(WebAppHelper.FILTER_ENTITY)
),
INIT_PARAM_LIST_DEFINITION,
new FormData(
WebUIMessages.ADVANCED,
WebAppJspConfigFormLayoutData.EMPTY_DESCRIPTION,
- FormLayoutDataUtil.createAdvancedFormAttributeData(FILTER_ENTITY)
+ FormLayoutDataUtil.createAdvancedFormAttributeData(WebAppHelper.FILTER_ENTITY)
),
};
+ private final static IFormData[] FILTER_30_DEFINITIONS = new IFormData[] {
+ new FormData(
+ WebUIMessages.FILTER,
+ WebAppJspConfigFormLayoutData.EMPTY_DESCRIPTION,
+ FormLayoutDataUtil.createGeneralFormAttributeData(WebAppHelper.FILTER_30_ENTITY)
+ ),
+ INIT_PARAM_LIST_DEFINITION,
+ new FormData(
+ WebUIMessages.ADVANCED,
+ WebAppJspConfigFormLayoutData.EMPTY_DESCRIPTION,
+ FormLayoutDataUtil.createAdvancedFormAttributeData(WebAppHelper.FILTER_30_ENTITY)
+ ),
+ };
+
final static IFormData FILTER_FORM_DEFINITION = new FormData(
- FILTER_ENTITY, new String[]{null}, FILTER_DEFINITIONS);
+ WebAppHelper.FILTER_ENTITY, new String[]{null}, FILTER_DEFINITIONS);
+ final static IFormData FILTER_30_FORM_DEFINITION = new FormData(
+ WebAppHelper.FILTER_30_ENTITY, new String[]{null}, FILTER_30_DEFINITIONS);
+
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppFoldersFormLayoutData.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppFoldersFormLayoutData.java 2010-03-09 17:30:08 UTC (rev 20708)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppFoldersFormLayoutData.java 2010-03-09 17:31:04 UTC (rev 20709)
@@ -20,21 +20,28 @@
static String CONTEXT_PARAM_ENTITY = WebAppHelper.CONTEXT_PARAM_ENTITY;
static String FILTER_FOLDER_ENTITY = "WebAppFolderFilters"; //$NON-NLS-1$
static String FILTER_FOLDER_24_ENTITY = "WebAppFolderFilters24"; //$NON-NLS-1$
+ static String FILTER_FOLDER_30_ENTITY = "WebAppFolderFilters30"; //$NON-NLS-1$
static String LIFECYCLE_FOLDER_24_ENTITY = "WebAppFolderLifecycles25"; //$NON-NLS-1$
static String PERSISTENCE_FOLDER_24_ENTITY = "WebAppFolderPersistence25"; //$NON-NLS-1$
static String LISTENER_FOLDER_ENTITY = "WebAppFolderListeners"; //$NON-NLS-1$
static String LISTENER_FOLDER_24_ENTITY = "WebAppFolderListeners24"; //$NON-NLS-1$
static String SERVLET_FOLDER_ENTITY = "WebAppFolderServlets"; //$NON-NLS-1$
+ static String SERVLET_FOLDER_30_ENTITY = "WebAppFolderServlets30"; //$NON-NLS-1$
static String MIME_FOLDER_ENTITY = "WebAppFolderMimeMappings"; //$NON-NLS-1$
static String ERROR_FOLDER_ENTITY = "WebAppFolderErrorPages"; //$NON-NLS-1$
static String TAGLIB_FOLDER_ENTITY = "WebAppFolderTaglibs"; //$NON-NLS-1$
static String RESOURCE_FOLDER_ENTITY = "WebAppFolderResources"; //$NON-NLS-1$
+ static String RESOURCE_FOLDER_30_ENTITY = "WebAppFolderResources30"; //$NON-NLS-1$
static String SECURITY_FOLDER_ENTITY = "WebAppFolderSecurityConstraints"; //$NON-NLS-1$
+ static String SECURITY_FOLDER_30_ENTITY = "WebAppFolderSecurityConstraints30"; //$NON-NLS-1$
static String ROLE_FOLDER_ENTITY = "WebAppFolderSecurityRoles"; //$NON-NLS-1$
static String ENV_FOLDER_ENTITY = "WebAppFolderEnvEntries"; //$NON-NLS-1$
+ static String ENV_FOLDER_30_ENTITY = "WebAppFolderEnvEntries30"; //$NON-NLS-1$
static String EJB_FOLDER_ENTITY = "WebAppFolderEJB"; //$NON-NLS-1$
+ static String EJB_FOLDER_30_ENTITY = "WebAppFolderEJB30"; //$NON-NLS-1$
static String SERVICE_FOLDER_ENTITY = "WebAppFolderServices"; //$NON-NLS-1$
static String MESSAGE_FOLDER_ENTITY = "WebAppFolderMessageDestinations"; //$NON-NLS-1$
+ static String MESSAGE_FOLDER_30_ENTITY = "WebAppFolderMessageDestinations30"; //$NON-NLS-1$
static IFormData CONTEXT_PARAM_LIST_DEFINITION = new FormData(
@@ -53,7 +60,7 @@
Messages.WebAppFoldersFormLayoutData_Filters,
EMPTY_DESCRIPTION,
new FormAttributeData[]{new FormAttributeData("filter-name", 100)}, //$NON-NLS-1$
- new String[]{WebAppHelper.FILTER_ENTITY},
+ new String[]{WebAppHelper.FILTER_ENTITY, WebAppHelper.FILTER_30_ENTITY},
FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateFilter") //$NON-NLS-1$
);
@@ -99,6 +106,11 @@
FILTER_MAPPING_24_LIST_DEFINITION
};
+ static IFormData[] FILTER_FOLDER_30_DEFINITIONS = new IFormData[]{
+ FILTER_LIST_DEFINITION,
+ FILTER_MAPPING_24_LIST_DEFINITION
+ };
+
static IFormData[] LIFECYCLE_FOLDER_24_DEFINITIONS = new IFormData[]{
LIFECYCLE_LIST_DEFINITION,
};
@@ -135,7 +147,7 @@
Messages.WebAppFoldersFormLayoutData_Servlets,
EMPTY_DESCRIPTION,
new FormAttributeData[]{new FormAttributeData("servlet-name", 30), new FormAttributeData("servlet-class", 70)}, //$NON-NLS-1$ //$NON-NLS-2$
- new String[]{WebAppHelper.SERVLET_ENTITY},
+ new String[]{WebAppHelper.SERVLET_ENTITY, WebAppHelper.SERVLET_30_ENTITY},
FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateServlet") //$NON-NLS-1$
);
@@ -185,7 +197,7 @@
Messages.WebAppFoldersFormLayoutData_ResourceEnvRefs,
EMPTY_DESCRIPTION,
new FormAttributeData[]{new FormAttributeData("resource-env-ref-name", 30), new FormAttributeData("resource-env-ref-type", 70)}, //$NON-NLS-1$ //$NON-NLS-2$
- new String[]{"WebAppResourceEnvRef"}, //$NON-NLS-1$
+ new String[]{"WebAppResourceEnvRef", "WebAppResourceEnvRef30"}, //$NON-NLS-1$ //$NON-NLS-2$
FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateResourceEnvRef") //$NON-NLS-1$
);
@@ -193,7 +205,7 @@
Messages.WebAppFoldersFormLayoutData_ResourceRefs,
EMPTY_DESCRIPTION,
new FormAttributeData[]{new FormAttributeData("res-ref-name", 30), new FormAttributeData("res-type", 70)}, //$NON-NLS-1$ //$NON-NLS-2$
- new String[]{"WebAppResourceRef"}, //$NON-NLS-1$
+ new String[]{"WebAppResourceRef", "WebAppResourceRef30"}, //$NON-NLS-1$ //$NON-NLS-2$
FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateResourceRef") //$NON-NLS-1$
);
@@ -206,7 +218,7 @@
Messages.WebAppFoldersFormLayoutData_SecurityConstraints,
EMPTY_DESCRIPTION,
new FormAttributeData[]{new FormAttributeData("display-name", 100)}, //$NON-NLS-1$
- new String[]{"WebAppSecurityConstraint"}, //$NON-NLS-1$
+ new String[]{"WebAppSecurityConstraint", "WebAppSecurityConstraint30"}, //$NON-NLS-1$ //$NON-NLS-2$
FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateSecurityConstraint") //$NON-NLS-1$
);
@@ -230,7 +242,7 @@
Messages.WebAppFoldersFormLayoutData_EnvEntries,
EMPTY_DESCRIPTION,
new FormAttributeData[]{new FormAttributeData("env-entry-name", 50), new FormAttributeData("env-entry-type", 50)}, //$NON-NLS-1$ //$NON-NLS-2$
- new String[]{"WebAppEnvEntry"}, //$NON-NLS-1$
+ new String[]{"WebAppEnvEntry", "WebAppEnvEntry30"}, //$NON-NLS-1$ //$NON-NLS-2$
FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateEnvEntry") //$NON-NLS-1$
);
@@ -242,7 +254,7 @@
Messages.WebAppFoldersFormLayoutData_EjbRefList,
EMPTY_DESCRIPTION,
new FormAttributeData[]{new FormAttributeData("ejb-ref-name", 50), new FormAttributeData("ejb-ref-type", 50)}, //$NON-NLS-1$ //$NON-NLS-2$
- new String[]{"WebAppEjbRef"}, //$NON-NLS-1$
+ new String[]{"WebAppEjbRef", "WebAppEjbRef30"}, //$NON-NLS-1$ //$NON-NLS-2$
FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateEjbRef") //$NON-NLS-1$
);
@@ -250,7 +262,7 @@
Messages.WebAppFoldersFormLayoutData_EjbLocalRefList,
EMPTY_DESCRIPTION,
new FormAttributeData[]{new FormAttributeData("ejb-ref-name", 50), new FormAttributeData("ejb-ref-type", 50)}, //$NON-NLS-1$ //$NON-NLS-2$
- new String[]{"WebAppEjbLocalRef"}, //$NON-NLS-1$
+ new String[]{"WebAppEjbLocalRef", "WebAppEjbLocalRef30"}, //$NON-NLS-1$ //$NON-NLS-2$
FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateEjbLocalRef") //$NON-NLS-1$
);
@@ -275,7 +287,7 @@
Messages.WebAppFoldersFormLayoutData_MessageDestinationRefList,
EMPTY_DESCRIPTION,
new FormAttributeData[]{new FormAttributeData("message-destination-ref-name", 100)}, //$NON-NLS-1$
- new String[]{"WebAppMessageDestinationRef"}, //$NON-NLS-1$
+ new String[]{"WebAppMessageDestinationRef", "WebAppMessageDestinationRef30"}, //$NON-NLS-1$ //$NON-NLS-2$
FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateServiceMessageDestinationRef") //$NON-NLS-1$
);
@@ -283,7 +295,7 @@
Messages.WebAppFoldersFormLayoutData_MessageDestinationList,
EMPTY_DESCRIPTION,
new FormAttributeData[]{new FormAttributeData("message-destination-name", 100)}, //$NON-NLS-1$
- new String[]{"WebAppMessageDestination"}, //$NON-NLS-1$
+ new String[]{"WebAppMessageDestination", "WebAppMessageDestination30"}, //$NON-NLS-1$ //$NON-NLS-2$
FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateServiceMessageDestination") //$NON-NLS-1$
);
@@ -301,6 +313,9 @@
final static IFormData FILTER_FOLDER_24_DEFINITION = new FormData(
FILTER_FOLDER_24_ENTITY, new String[]{null}, FILTER_FOLDER_24_DEFINITIONS);
+ final static IFormData FILTER_FOLDER_30_DEFINITION = new FormData(
+ FILTER_FOLDER_30_ENTITY, new String[]{null}, FILTER_FOLDER_30_DEFINITIONS);
+
final static IFormData LIFECYCLE_FOLDER_24_DEFINITION = new FormData(
LIFECYCLE_FOLDER_24_ENTITY, new String[]{null}, LIFECYCLE_FOLDER_24_DEFINITIONS);
@@ -316,6 +331,9 @@
final static IFormData SERVLET_FOLDER_DEFINITION = new FormData(
SERVLET_FOLDER_ENTITY, new String[]{null}, SERVLET_FOLDER_DEFINITIONS);
+ final static IFormData SERVLET_FOLDER_30_DEFINITION = new FormData(
+ SERVLET_FOLDER_30_ENTITY, new String[]{null}, SERVLET_FOLDER_DEFINITIONS);
+
final static IFormData MIME_FOLDER_DEFINITION = new FormData(
MIME_FOLDER_ENTITY, new String[]{null}, MIME_FOLDER_DEFINITIONS);
@@ -328,22 +346,37 @@
final static IFormData RESOURCE_FOLDER_DEFINITION = new FormData(
RESOURCE_FOLDER_ENTITY, new String[]{null}, RESOURCE_FOLDER_DEFINITIONS);
+ final static IFormData RESOURCE_FOLDER_30_DEFINITION = new FormData(
+ RESOURCE_FOLDER_30_ENTITY, new String[]{null}, RESOURCE_FOLDER_DEFINITIONS);
+
final static IFormData SECURITY_FOLDER_DEFINITION = new FormData(
SECURITY_FOLDER_ENTITY, new String[]{null}, SECURITY_FOLDER_DEFINITIONS);
+ final static IFormData SECURITY_FOLDER_30_DEFINITION = new FormData(
+ SECURITY_FOLDER_30_ENTITY, new String[]{null}, SECURITY_FOLDER_DEFINITIONS);
+
final static IFormData ROLE_FOLDER_DEFINITION = new FormData(
ROLE_FOLDER_ENTITY, new String[]{null}, ROLE_FOLDER_DEFINITIONS);
final static IFormData ENV_FOLDER_DEFINITION = new FormData(
ENV_FOLDER_ENTITY, new String[]{null}, ENV_FOLDER_DEFINITIONS);
+ final static IFormData ENV_FOLDER_30_DEFINITION = new FormData(
+ ENV_FOLDER_30_ENTITY, new String[]{null}, ENV_FOLDER_DEFINITIONS);
+
final static IFormData EJB_FOLDER_DEFINITION = new FormData(
EJB_FOLDER_ENTITY, new String[]{null}, EJB_FOLDER_DEFINITIONS);
+ final static IFormData EJB_FOLDER_30_DEFINITION = new FormData(
+ EJB_FOLDER_30_ENTITY, new String[]{null}, EJB_FOLDER_DEFINITIONS);
+
final static IFormData SERVICE_FOLDER_DEFINITION = new FormData(
SERVICE_FOLDER_ENTITY, new String[]{null}, SERVICE_FOLDER_DEFINITIONS);
final static IFormData MESSAGE_FOLDER_DEFINITION = new FormData(
MESSAGE_FOLDER_ENTITY, new String[]{null}, MESSAGE_FOLDER_DEFINITIONS);
+ final static IFormData MESSAGE_FOLDER_30_DEFINITION = new FormData(
+ MESSAGE_FOLDER_30_ENTITY, new String[]{null}, MESSAGE_FOLDER_DEFINITIONS);
+
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppFormLayoutData.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppFormLayoutData.java 2010-03-09 17:30:08 UTC (rev 20708)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppFormLayoutData.java 2010-03-09 17:31:04 UTC (rev 20709)
@@ -21,35 +21,48 @@
private final static IFormData[] FORM_LAYOUT_DEFINITIONS = new IFormData[] {
WebAppFilterFormLayoutData.FILTER_FORM_DEFINITION,
+ WebAppFilterFormLayoutData.FILTER_30_FORM_DEFINITION,
WebAppServletFormLayoutData.SERVLET_FORM_DEFINITION,
+ WebAppServletFormLayoutData.SERVLET_30_FORM_DEFINITION,
WebAppWelcomeFormLayoutData.WELCOME_LIST_FORM_DEFINITION,
WebAppAuthConstraintFormLayoutData.AUTH_CONSTRAINT_FORM_DEFINITION,
WebAppSecurityConstraintFormLayoutData.SECURITY_CONSTRAINT_FORM_DEFINITION,
+ WebAppSecurityConstraintFormLayoutData.SECURITY_CONSTRAINT_30_FORM_DEFINITION,
WebAppLocaleEncodingFormLayoutData.LOCALE_ENC_MAPPING_FORM_DEFINITION,
WebAppJspConfigFormLayoutData.JSP_CONFIG_FORM_DEFINITION,
+ WebAppJspConfigFormLayoutData.JSP_CONFIG_30_FORM_DEFINITION,
WebAppJspConfigFormLayoutData.PROPERTY_GROUP_FORM_DEFINITION,
+ WebAppJspConfigFormLayoutData.PROPERTY_GROUP_30_FORM_DEFINITION,
WebAppFoldersFormLayoutData.CONTEXT_PARAM_FOLDER_DEFINITION,
WebAppFoldersFormLayoutData.FILTER_FOLDER_DEFINITION,
WebAppFoldersFormLayoutData.FILTER_FOLDER_24_DEFINITION,
+ WebAppFoldersFormLayoutData.FILTER_FOLDER_30_DEFINITION,
WebAppFoldersFormLayoutData.LISTENER_FOLDER_DEFINITION,
WebAppFoldersFormLayoutData.LISTENER_FOLDER_24_DEFINITION,
WebAppFoldersFormLayoutData.LIFECYCLE_FOLDER_24_DEFINITION,
WebAppFoldersFormLayoutData.PERSISTENCE_FOLDER_24_DEFINITION,
WebAppFoldersFormLayoutData.SERVLET_FOLDER_DEFINITION,
+ WebAppFoldersFormLayoutData.SERVLET_FOLDER_30_DEFINITION,
WebAppFoldersFormLayoutData.MIME_FOLDER_DEFINITION,
WebAppFoldersFormLayoutData.ERROR_FOLDER_DEFINITION,
WebAppFoldersFormLayoutData.TAGLIB_FOLDER_DEFINITION,
WebAppFoldersFormLayoutData.RESOURCE_FOLDER_DEFINITION,
+ WebAppFoldersFormLayoutData.RESOURCE_FOLDER_30_DEFINITION,
WebAppFoldersFormLayoutData.SECURITY_FOLDER_DEFINITION,
+ WebAppFoldersFormLayoutData.SECURITY_FOLDER_30_DEFINITION,
WebAppFoldersFormLayoutData.ROLE_FOLDER_DEFINITION,
WebAppFoldersFormLayoutData.ENV_FOLDER_DEFINITION,
+ WebAppFoldersFormLayoutData.ENV_FOLDER_30_DEFINITION,
WebAppFoldersFormLayoutData.EJB_FOLDER_DEFINITION,
+ WebAppFoldersFormLayoutData.EJB_FOLDER_30_DEFINITION,
WebAppFoldersFormLayoutData.SERVICE_FOLDER_DEFINITION,
WebAppFoldersFormLayoutData.MESSAGE_FOLDER_DEFINITION,
+ WebAppFoldersFormLayoutData.MESSAGE_FOLDER_30_DEFINITION,
WebAppFileFormLayoutData.FILE_WEB_APP_23_DEFINITION,
WebAppFileFormLayoutData.FILE_WEB_APP_24_DEFINITION,
WebAppFileFormLayoutData.FILE_WEB_APP_25_DEFINITION,
+ WebAppFileFormLayoutData.FILE_WEB_APP_30_DEFINITION,
};
private static Map FORM_LAYOUT_DEFINITION_MAP = Collections.unmodifiableMap(new ArrayToMap(FORM_LAYOUT_DEFINITIONS));
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppJspConfigFormLayoutData.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppJspConfigFormLayoutData.java 2010-03-09 17:30:08 UTC (rev 20708)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppJspConfigFormLayoutData.java 2010-03-09 17:31:04 UTC (rev 20709)
@@ -17,8 +17,10 @@
public class WebAppJspConfigFormLayoutData {
static String EMPTY_DESCRIPTION = ""; //$NON-NLS-1$
static String JSP_CONFIG_ENTITY = "WebAppJspConfig"; //$NON-NLS-1$
+ static String JSP_CONFIG_30_ENTITY = "WebAppJspConfig30"; //$NON-NLS-1$
static String TAGLIB_ENTITY = WebAppHelper.TAGLIB_ENTITY;
static String PROPERTY_GROUP_ENTITY = "WebAppJSPPropertyGroup"; //$NON-NLS-1$
+ static String PROPERTY_GROUP_30_ENTITY = "WebAppJSPPropertyGroup30"; //$NON-NLS-1$
static IFormData TAGLIB_LIST_DEFINITION = new FormData(
WebUIMessages.TAGLIBS,
@@ -32,7 +34,7 @@
WebUIMessages.PROPERTY_GROUPS,
EMPTY_DESCRIPTION,
new FormAttributeData[]{new FormAttributeData("url-pattern", 100)}, //$NON-NLS-1$
- new String[]{PROPERTY_GROUP_ENTITY},
+ new String[]{PROPERTY_GROUP_ENTITY, PROPERTY_GROUP_30_ENTITY},
FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreatePropertyGroup") //$NON-NLS-1$
);
@@ -54,9 +56,29 @@
),
};
+ private final static IFormData[] PROPERTY_GROUP_30_DEFINITIONS = new IFormData[] {
+ new FormData(
+ WebUIMessages.PROPERTY_GROUP,
+ EMPTY_DESCRIPTION,
+ FormLayoutDataUtil.createGeneralFormAttributeData(PROPERTY_GROUP_30_ENTITY)
+ ),
+ new FormData(
+ WebUIMessages.ADVANCED,
+ EMPTY_DESCRIPTION,
+ FormLayoutDataUtil.createAdvancedFormAttributeData(PROPERTY_GROUP_30_ENTITY)
+ ),
+ };
+
final static IFormData JSP_CONFIG_FORM_DEFINITION = new FormData(
JSP_CONFIG_ENTITY, new String[]{null}, JSP_CONFIG_DEFINITIONS);
+ final static IFormData JSP_CONFIG_30_FORM_DEFINITION = new FormData(
+ JSP_CONFIG_30_ENTITY, new String[]{null}, JSP_CONFIG_DEFINITIONS);
+
final static IFormData PROPERTY_GROUP_FORM_DEFINITION = new FormData(
PROPERTY_GROUP_ENTITY, new String[]{null}, PROPERTY_GROUP_DEFINITIONS);
+
+ final static IFormData PROPERTY_GROUP_30_FORM_DEFINITION = new FormData(
+ PROPERTY_GROUP_30_ENTITY, new String[]{null}, PROPERTY_GROUP_30_DEFINITIONS);
+
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppSecurityConstraintFormLayoutData.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppSecurityConstraintFormLayoutData.java 2010-03-09 17:30:08 UTC (rev 20708)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppSecurityConstraintFormLayoutData.java 2010-03-09 17:31:04 UTC (rev 20709)
@@ -15,13 +15,15 @@
public class WebAppSecurityConstraintFormLayoutData {
static String SECURITY_CONSTRAINT_ENTITY = "WebAppSecurityConstraint"; //$NON-NLS-1$
+ static String SECURITY_CONSTRAINT_30_ENTITY = "WebAppSecurityConstraint30"; //$NON-NLS-1$
static String RESOURCE_COLLECTION_ENTITY = "WebAppResourceCollection"; //$NON-NLS-1$
+ static String RESOURCE_COLLECTION_30_ENTITY = "WebAppResourceCollection30"; //$NON-NLS-1$
static IFormData RESOURCE_COLLECTION_LIST_DEFINITION = new FormData(
WebUIMessages.RESOURCE_COLLECTIONS,
WebAppJspConfigFormLayoutData.EMPTY_DESCRIPTION,
new FormAttributeData[]{new FormAttributeData("web-resource-name", 100)}, //$NON-NLS-1$
- new String[]{RESOURCE_COLLECTION_ENTITY},
+ new String[]{RESOURCE_COLLECTION_ENTITY, RESOURCE_COLLECTION_30_ENTITY},
FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateResourceCollection") //$NON-NLS-1$
);
@@ -36,4 +38,7 @@
final static IFormData SECURITY_CONSTRAINT_FORM_DEFINITION = new FormData(
SECURITY_CONSTRAINT_ENTITY, new String[]{null}, SECURITY_CONSTRAINT_DEFINITIONS);
+
+ final static IFormData SECURITY_CONSTRAINT_30_FORM_DEFINITION = new FormData(
+ SECURITY_CONSTRAINT_30_ENTITY, new String[]{null}, SECURITY_CONSTRAINT_DEFINITIONS);
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppServletFormLayoutData.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppServletFormLayoutData.java 2010-03-09 17:30:08 UTC (rev 20708)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppServletFormLayoutData.java 2010-03-09 17:31:04 UTC (rev 20709)
@@ -26,21 +26,26 @@
FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateSecurityRoleRef") //$NON-NLS-1$
);
- private final static IFormData[] SERVLET_DEFINITIONS = new IFormData[] {
+ private final static IFormData[] creareServletDefinitions(String entity) {
+ return new IFormData[] {
new FormData(
WebUIMessages.SERVLET,
WebAppJspConfigFormLayoutData.EMPTY_DESCRIPTION,
- FormLayoutDataUtil.createGeneralFormAttributeData(SERVLET_ENTITY)
+ FormLayoutDataUtil.createGeneralFormAttributeData(entity)
),
WebAppFilterFormLayoutData.INIT_PARAM_LIST_DEFINITION,
SECURITY_ROLE_REF_LIST_DEFINITION,
new FormData(
WebUIMessages.ADVANCED,
WebAppJspConfigFormLayoutData.EMPTY_DESCRIPTION,
- FormLayoutDataUtil.createAdvancedFormAttributeData(SERVLET_ENTITY)
+ FormLayoutDataUtil.createAdvancedFormAttributeData(entity)
),
- };
+ };
+ }
final static IFormData SERVLET_FORM_DEFINITION = new FormData(
- SERVLET_ENTITY, new String[]{null}, SERVLET_DEFINITIONS);
+ SERVLET_ENTITY, new String[]{null}, creareServletDefinitions(SERVLET_ENTITY));
+
+ final static IFormData SERVLET_30_FORM_DEFINITION = new FormData(
+ WebAppHelper.SERVLET_30_ENTITY, new String[]{null}, creareServletDefinitions(WebAppHelper.SERVLET_30_ENTITY));
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/messages.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/messages.properties 2010-03-09 17:30:08 UTC (rev 20708)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/messages.properties 2010-03-09 17:31:04 UTC (rev 20709)
@@ -40,6 +40,7 @@
WebAppFileFormLayoutData_WebDesc23=Web Descriptor 2.3
WebAppFileFormLayoutData_WebDesc24=Web Descriptor 2.4
WebAppFileFormLayoutData_WebDesc25=Web Descriptor 2.5
+WebAppFileFormLayoutData_WebDesc30=Web Descriptor 3.0
WebAppFoldersFormLayoutData_ContextParams=Context Params
WebAppFoldersFormLayoutData_Filters=Filters
WebAppFoldersFormLayoutData_LifecycleCallbacks=Lifecycle Callbacks
More information about the jbosstools-commits
mailing list