This is an automated email from the ASF dual-hosted git repository. mbien pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 4c43851e725852253184c90622d34c0463257a41 Merge: f586ed1242 bd36343594 Author: Michael Bien <mbie...@gmail.com> AuthorDate: Sun Feb 11 11:15:19 2024 +0100 Merge pull request #6987 from mbien/no-struts Remove struts 1 support. .github/workflows/main.yml | 4 - enterprise/j2ee.common/nbproject/project.xml | 1 - .../org/netbeans/modules/web/jsf/JSFCatalog.java | 1 - .../modules/web/jsf/JSFConfigDataObject.java | 1 - .../modules/web/jsf/JSFConfigLoaderBeanInfo.java | 2 +- .../netbeans/modules/web/jsf/JSFConfigNode.java | 1 - .../web/jsf/editor/JSFConfigHyperlinkProvider.java | 1 - .../web/NewWebProjectJSFFrameworkStepOperator.java | 16 - .../NewWebProjectStrutsFrameworkStepOperator.java | 252 - .../src/org/netbeans/test/web/WebProjectSuite.java | 1 - .../test/web/WebStrutsProjectValidation.java | 111 - enterprise/web.struts/build.xml | 48 - .../web.struts/external/antlr-2.7.2-license.txt | 23 - enterprise/web.struts/external/binaries-list | 45 - .../web.struts/external/bsf-2.3.0-license.txt | 208 - .../external/commons-beanutils-1.8.0-license.txt | 208 - .../external/commons-beanutils-1.8.0-notice.txt | 2 - .../external/commons-chain-1.2-license.txt | 208 - .../external/commons-chain-1.2-notice.txt | 2 - .../external/commons-digester-1.8-license.txt | 208 - .../external/commons-digester-1.8-notice.txt | 2 - .../external/commons-fileupload-1.1.1-license.txt | 208 - .../web.struts/external/commons-io-1.1-license.txt | 208 - .../external/commons-logging-1.0.4-license.txt | 208 - .../external/commons-validator-1.3.1-license.txt | 208 - .../external/commons-validator-1.3.1-notice.txt | 2 - .../generated-struts-1.3.10-javadoc-license.txt | 209 - .../web.struts/external/jstl-1.0.2-license.txt | 405 - .../web.struts/external/oro-2.0.8-license.txt | 57 - .../web.struts/external/standard-1.0.6-license.txt | 208 - .../external/struts-core-1.3.10-license.txt | 209 - .../external/struts-core-1.3.10-notice.txt | 2 - .../external/struts-el-1.3.10-license.txt | 209 - .../external/struts-el-1.3.10-notice.txt | 2 - .../external/struts-extras-1.3.10-license.txt | 208 - .../external/struts-extras-1.3.10-notice.txt | 2 - .../external/struts-faces-1.3.10-license.txt | 209 - .../external/struts-faces-1.3.10-notice.txt | 2 - .../struts-mailreader-dao-1.3.10-license.txt | 209 - .../struts-mailreader-dao-1.3.10-notice.txt | 2 - .../external/struts-scripting-1.3.10-license.txt | 209 - .../external/struts-scripting-1.3.10-notice.txt | 2 - .../external/struts-taglib-1.3.10-license.txt | 209 - .../external/struts-taglib-1.3.10-notice.txt | 2 - .../external/struts-tiles-1.3.10-license.txt | 209 - .../external/struts-tiles-1.3.10-notice.txt | 2 - enterprise/web.struts/licenseinfo.xml | 70 - enterprise/web.struts/manifest.mf | 6 - enterprise/web.struts/nbproject/project.properties | 85 - enterprise/web.struts/nbproject/project.xml | 450 - .../netbeans/modules/web/struts/Bundle.properties | 49 - .../netbeans/modules/web/struts/SAXParseError.java | 41 - .../netbeans/modules/web/struts/StrutsCatalog.java | 211 - .../modules/web/struts/StrutsConfigDataObject.java | 360 - .../web/struts/StrutsConfigEditorSupport.java | 350 - .../modules/web/struts/StrutsConfigLoader.java | 62 - .../web/struts/StrutsConfigLoaderBeanInfo.java | 52 - .../modules/web/struts/StrutsConfigNode.java | 44 - .../modules/web/struts/StrutsConfigUtilities.java | 474 - .../web/struts/StrutsFrameworkProvider.java | 435 - .../modules/web/struts/StrutsUtilities.java | 111 - .../web/struts/config/model/package-info.java | 33 - .../modules/web/struts/dialogs/AddActionPanel.form | 475 - .../modules/web/struts/dialogs/AddActionPanel.java | 530 -- .../modules/web/struts/dialogs/AddDialog.java | 168 - .../struts/dialogs/AddExceptionDialogPanel.form | 477 - .../struts/dialogs/AddExceptionDialogPanel.java | 475 - .../web/struts/dialogs/AddFIActionPanel.form | 296 - .../web/struts/dialogs/AddFIActionPanel.java | 304 - .../web/struts/dialogs/AddFormBeanPanel.form | 218 - .../web/struts/dialogs/AddFormBeanPanel.java | 244 - .../web/struts/dialogs/AddFormPropertyPanel.form | 339 - .../web/struts/dialogs/AddFormPropertyPanel.java | 353 - .../web/struts/dialogs/AddForwardDialogPanel.form | 330 - .../web/struts/dialogs/AddForwardDialogPanel.java | 342 - .../modules/web/struts/dialogs/BrowseFolders.form | 64 - .../modules/web/struts/dialogs/BrowseFolders.java | 342 - .../modules/web/struts/dialogs/Bundle.properties | 333 - .../web/struts/dialogs/ValidatingPanel.java | 46 - .../modules/web/struts/editor/Bundle.properties | 38 - .../editor/StrutsConfigHyperlinkProvider.java | 433 - .../web/struts/editor/StrutsEditorUtilities.java | 415 - .../web/struts/editor/StrutsPopupAction.java | 408 - .../modules/web/struts/resources/Bundle.properties | 33 - .../struts/resources/MessageResources.properties | 46 - .../modules/web/struts/resources/StrutsAction.html | 28 - .../modules/web/struts/resources/StrutsCatalog.png | Bin 870 -> 0 bytes .../web/struts/resources/StrutsConfigIcon.png | Bin 629 -> 0 bytes .../web/struts/resources/StrutsFormBean.html | 28 - .../modules/web/struts/resources/layer.xml | 199 - .../modules/web/struts/resources/struts-bean.tld | 1153 --- .../modules/web/struts/resources/struts-config.xml | 89 - .../web/struts/resources/struts-config_1_0.dtd | 424 - .../web/struts/resources/struts-config_1_1.dtd | 712 -- .../web/struts/resources/struts-config_1_2.dtd | 702 -- .../web/struts/resources/struts-config_1_2.mdd | 247 - .../struts/resources/struts-config_1_3-custom.dtd | 682 -- .../web/struts/resources/struts-config_1_3.dtd | 726 -- .../modules/web/struts/resources/struts-html.tld | 9283 -------------------- .../modules/web/struts/resources/struts-logic.tld | 1891 ---- .../modules/web/struts/resources/struts-nested.tld | 5051 ----------- .../modules/web/struts/resources/struts-tiles.tld | 916 -- .../modules/web/struts/resources/struts.xml | 71 - .../resources/templates/DispatchAction.template | 72 - .../templates/LookupDispatchAction.template | 103 - .../templates/MappingDispatchAction.template | 57 - .../resources/templates/StrutsAction.template | 63 - .../resources/templates/StrutsActionForm.template | 96 - .../web/struts/resources/tiles-config_1_1.dtd | 299 - .../web/struts/resources/tiles-config_1_3.dtd | 299 - .../modules/web/struts/resources/tiles-defs.xml | 63 - .../modules/web/struts/resources/validation.xml | 95 - .../web/struts/resources/validator-rules.xml | 418 - .../modules/web/struts/resources/validator_1_0.dtd | 262 - .../web/struts/resources/validator_1_0_1.dtd | 261 - .../modules/web/struts/resources/validator_1_1.dtd | 308 - .../web/struts/resources/validator_1_1_3.dtd | 328 - .../web/struts/resources/validator_1_2_0.dtd | 249 - .../web/struts/resources/validator_1_3_0.dtd | 249 - .../modules/web/struts/resources/welcome.jsp | 49 - .../modules/web/struts/ui/Bundle.properties | 45 - .../web/struts/ui/StrutsConfigurationPanel.java | 144 - .../struts/ui/StrutsConfigurationPanelVisual.form | 199 - .../struts/ui/StrutsConfigurationPanelVisual.java | 304 - .../modules/web/struts/wizards/ActionIterator.java | 289 - .../modules/web/struts/wizards/ActionPanel.java | 108 - .../modules/web/struts/wizards/ActionPanel1.java | 99 - .../web/struts/wizards/ActionPanel1Visual.form | 409 - .../web/struts/wizards/ActionPanel1Visual.java | 491 -- .../web/struts/wizards/ActionPanelVisual.form | 133 - .../web/struts/wizards/ActionPanelVisual.java | 256 - .../modules/web/struts/wizards/Bundle.properties | 141 - .../struts/wizards/FinishableProxyWizardPanel.java | 74 - .../web/struts/wizards/FormBeanIterator.java | 259 - .../web/struts/wizards/FormBeanNewPanel.java | 111 - .../web/struts/wizards/FormBeanNewPanelVisual.form | 106 - .../web/struts/wizards/FormBeanNewPanelVisual.java | 156 - .../wizards/FormBeanPropertiesPanelVisual.form | 112 - .../wizards/FormBeanPropertiesPanelVisual.java | 308 - .../web/struts/wizards/FormBeanProperty.java | 46 - .../web/struts/wizards/WizardProperties.java | 35 - .../netbeans/modules/web/struts/EndToEndTest.java | 544 -- .../modules/web/struts/EndToEndTest.properties | 164 - .../web.struts/test/unit/data/struts-config.xml | 41 - .../struts/editor/StrutsEditorUtilitiesTest.java | 188 - .../nbcode/nbproject/platform.properties | 1 - .../qa-functional/src/projects/LibrariesTest.java | 11 - .../nbbuild/extlibs/ignored-binary-overlaps | 4 - .../org/netbeans/nbbuild/extlibs/ignored-overlaps | 6 - nbbuild/cluster.properties | 1 - 150 files changed, 1 insertion(+), 44544 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists