You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ne...@apache.org on 2021/11/03 13:36:58 UTC
[netbeans] branch release126 updated (8388dd1 -> 22aebab)
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a change to branch release126
in repository https://gitbox.apache.org/repos/asf/netbeans.git.
from 8388dd1 Merge pull request #3267 from apache/delivery
add 012e2ea [NETBEANS-6054] PHP Template missing Namespace option
add 30aa6f1 Merge pull request #3280 from junichi11/netbeans-6054-php-template-namespace
add 273353e Fix RAT and (some) verify-all-libs-and-licenses errors and warnings
add 378b3ee Merge pull request #3276 from matthiasblaesing/fix_rat
add fc57ff6 [NETBEANS-4978] Avoid inserting use statements to an incorrect position
add 9399810 Merge pull request #3279 from junichi11/netbeans-4978-wrong-insert-using-fix-import
add 7d1b9b5 Payara Server UI disabled on the failed startup
add 1903a1a Merge pull request #3273 from jGauravGupta/FISH-1425-2
add fd437b1 CheckRegexp hint causes all lines with regexp shown with a warning
add b64d24e Merge pull request #3287 from matthiasblaesing/reduce_level_regexp
add 8da27b9 [NETBEANS-5734] Add details for Glassfish 6.2.1 server and improve version detection
add 699712e Merge pull request #3288 from matthiasblaesing/NETBEANS-5734
add 741c624 [NETBEANS-6115] UTF-8 input is broken in Maven project.
add 4ff3390 Merge pull request #3289 from mbien/maven_utf
add 6e4a507 [NETBEANS-6068] Add back SOURCES_TYPE_JAVA into GroovySources::getGroovySourceGroups
add 2b43656 Merge pull request #3292 from neilcsmith-net/netbeans-6068
add 2dcead8 attempt to make JackpotTrees more robust.
add e6bef73 Merge pull request #3283 from mbien/happytrees
add 46b0623 [NETBEANS-6114] Restore automatic constructor completion functionality.
add ca388d6 Merge pull request #3290 from mbien/constructor_completion
add 6b2e5c2 [NETBEANS-5962] Remove default bgcolor for multiline Strings - inherited and illegible on various editor themes.
add ee088f9 Merge pull request #3297 from neilcsmith-net/netbeans-5962
new 22aebab Merge pull request #3281 from apache/delivery
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
... => j2ee.jboss4-external-resources-license.txt} | 0
....weblogic9-generated-schema-classes-license.txt | 421 +++++++++++-
...9-generated-schema-classes-netbeans-license.txt | 141 ----
.../com.oracle.js.parser-ba7a8bc42268-license.txt | 748 +++++++++------------
..._1.0.0.build220_r167_v20150618_1733-license.txt | 2 +-
...svnkit_1.8.12.r10533_v20160129_0158-license.txt | 58 +-
.../external/sqljet-1.1.10-license.txt | 10 +-
...c.wsitmodelext-glassfish-resources-license.txt} | 6 +
...ebsvc.wsitmodelext-oasis-resources-license.txt} | 6 +
... websvc.wsitmodelext-w3c-resources-license.txt} | 6 +
.../modules/glassfish/common/Bundle.properties | 1 +
.../modules/glassfish/common/ServerDetails.java | 14 +
.../netbeans/modules/glassfish/spi/UtilsTest.java | 1 +
.../glassfish.tooling/nbproject/project.properties | 2 +-
.../glassfish/tooling/data/GlassFishVersion.java | 90 +--
.../server/config/ConfigBuilderProvider.java | 11 +-
.../tooling/server/config/GlassFishV6_2_1.xml | 105 +++
.../tooling/server/config/JavaSEPlatform.java | 25 +-
.../netbeans/modules/payara/common/StartTask.java | 7 +-
.../modules/groovy/support/api/GroovySources.java | 2 +
.../codetemplates/CodeTemplateInsertHandler.java | 8 +-
ide/xml.retriever/licenseinfo.xml | 28 +
.../modules/java/editor/resources/fontsColors.xml | 2 +-
.../modules/java/hints/jdk/CheckRegex.java | 3 +-
.../modules/java/hints/jdk/CheckRegexTest.java | 4 +-
.../maven/execute/CommandLineOutputHandler.java | 24 +-
.../modules/java/hints/spiimpl/JackpotTrees.java | 91 +--
.../modules/java/hints/spiimpl/Utilities.java | 13 +-
.../jnlp/external/jnlp-definitions-7.0-license.txt | 748 +++++++++------------
.../modules/php/editor/actions/FixUsesAction.java | 2 +-
.../php/editor/actions/FixUsesPerformer.java | 86 ++-
.../php/editor/actions/UsedNamesCollector.java | 61 +-
.../modules/php/editor/model/ModelUtils.java | 99 +++
.../test/unit/data/testfiles/actions/nb4978_01.php | 39 ++
.../data/testfiles/actions/nb4978_01.php.usedNames | 4 +
.../test/unit/data/testfiles/actions/nb4978_02.php | 37 +
.../data/testfiles/actions/nb4978_02.php.usedNames | 4 +
.../test/unit/data/testfiles/actions/nb4978_03.php | 43 ++
.../data/testfiles/actions/nb4978_03.php.usedNames | 4 +
.../test/unit/data/testfiles/actions/nb4978_04.php | 45 ++
.../data/testfiles/actions/nb4978_04.php.usedNames | 4 +
.../test/unit/data/testfiles/actions/nb4978_05.php | 44 ++
.../data/testfiles/actions/nb4978_05.php.usedNames | 4 +
.../test/unit/data/testfiles/actions/nb4978_06.php | 44 ++
.../data/testfiles/actions/nb4978_06.php.usedNames | 4 +
.../test/unit/data/testfiles/actions/nb4978_07.php | 45 ++
.../data/testfiles/actions/nb4978_07.php.usedNames | 4 +
.../test/unit/data/testfiles/actions/nb4978_08.php | 50 ++
.../testfiles/actions/nb4978_08.php.usedNames} | 0
.../actions/testNB4978/01/testNB4978_01.php | 39 ++
.../testNB4978/01/testNB4978_01.php.fixUses | 41 ++
.../actions/testNB4978/02/testNB4978_02.php | 37 +
.../testNB4978/02/testNB4978_02.php.fixUses | 39 ++
.../actions/testNB4978/03/testNB4978_03.php | 43 ++
.../testNB4978/03/testNB4978_03.php.fixUses | 45 ++
.../actions/testNB4978/04/testNB4978_04.php | 45 ++
.../testNB4978/04/testNB4978_04.php.fixUses | 47 ++
.../actions/testNB4978/05/testNB4978_05.php | 44 ++
.../testNB4978/05/testNB4978_05.php.fixUses | 46 ++
.../actions/testNB4978/06/testNB4978_06.php | 44 ++
.../testNB4978/06/testNB4978_06.php.fixUses | 46 ++
.../actions/testNB4978/07/testNB4978_07.php | 45 ++
.../testNB4978/07/testNB4978_07.php.fixUses | 47 ++
.../php/editor/actions/FixUsesPerformerTest.java | 42 ++
.../php/editor/actions/UsedNamesCollectorTest.java | 32 +
.../modules/php/project/resources/layer.xml | 6 +-
.../NewFileWizardIteratorWithNamespace.java | 92 +++
67 files changed, 2826 insertions(+), 1154 deletions(-)
rename contrib/j2ee.jboss4/external/{j2ee.jboss4-external-resources.txt => j2ee.jboss4-external-resources-license.txt} (100%)
copy nbbuild/installer/jnlp/external/jnlp-definitions-7.0-license.txt => contrib/j2ee.weblogic9/external/j2ee.weblogic9-generated-schema-classes-license.txt (51%)
delete mode 100644 contrib/j2ee.weblogic9/external/j2ee.weblogic9-generated-schema-classes-netbeans-license.txt
rename contrib/websvc.wsitmodelext/external/{glassfish-license.txt => websvc.wsitmodelext-glassfish-resources-license.txt} (99%)
rename contrib/websvc.wsitmodelext/external/{oasis-license.txt => websvc.wsitmodelext-oasis-resources-license.txt} (95%)
rename contrib/websvc.wsitmodelext/external/{w3c_plus-license.txt => websvc.wsitmodelext-w3c-resources-license.txt} (97%)
create mode 100644 enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_2_1.xml
create mode 100644 ide/xml.retriever/licenseinfo.xml
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/nb4978_01.php
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/nb4978_01.php.usedNames
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/nb4978_02.php
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/nb4978_02.php.usedNames
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/nb4978_03.php
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/nb4978_03.php.usedNames
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/nb4978_04.php
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/nb4978_04.php.usedNames
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/nb4978_05.php
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/nb4978_05.php.usedNames
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/nb4978_06.php
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/nb4978_06.php.usedNames
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/nb4978_07.php
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/nb4978_07.php.usedNames
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/nb4978_08.php
copy php/{php.smarty/src/org/netbeans/modules/php/smarty/resources/TplTemplate.tpl => php.editor/test/unit/data/testfiles/actions/nb4978_08.php.usedNames} (100%)
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testNB4978/01/testNB4978_01.php
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testNB4978/01/testNB4978_01.php.fixUses
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testNB4978/02/testNB4978_02.php
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testNB4978/02/testNB4978_02.php.fixUses
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testNB4978/03/testNB4978_03.php
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testNB4978/03/testNB4978_03.php.fixUses
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testNB4978/04/testNB4978_04.php
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testNB4978/04/testNB4978_04.php.fixUses
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testNB4978/05/testNB4978_05.php
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testNB4978/05/testNB4978_05.php.fixUses
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testNB4978/06/testNB4978_06.php
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testNB4978/06/testNB4978_06.php.fixUses
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testNB4978/07/testNB4978_07.php
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testNB4978/07/testNB4978_07.php.fixUses
create mode 100644 php/php.project/src/org/netbeans/modules/php/project/ui/wizards/NewFileWizardIteratorWithNamespace.java
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] 01/01: Merge pull request #3281 from apache/delivery
Posted by ne...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch release126
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 22aebab0c6dc643e861a7af3d71aea7b7644e4bd
Merge: 8388dd1 ee088f9
Author: Neil C Smith <ne...@apache.org>
AuthorDate: Wed Nov 3 13:36:36 2021 +0000
Merge pull request #3281 from apache/delivery
Merge delivery into release126 for 12.6-rc2
... => j2ee.jboss4-external-resources-license.txt} | 0
....weblogic9-generated-schema-classes-license.txt | 421 +++++++++++-
...9-generated-schema-classes-netbeans-license.txt | 141 ----
.../com.oracle.js.parser-ba7a8bc42268-license.txt | 748 +++++++++------------
..._1.0.0.build220_r167_v20150618_1733-license.txt | 2 +-
...svnkit_1.8.12.r10533_v20160129_0158-license.txt | 58 +-
.../external/sqljet-1.1.10-license.txt | 10 +-
...c.wsitmodelext-glassfish-resources-license.txt} | 6 +
...ebsvc.wsitmodelext-oasis-resources-license.txt} | 6 +
... websvc.wsitmodelext-w3c-resources-license.txt} | 6 +
.../modules/glassfish/common/Bundle.properties | 1 +
.../modules/glassfish/common/ServerDetails.java | 14 +
.../netbeans/modules/glassfish/spi/UtilsTest.java | 1 +
.../glassfish.tooling/nbproject/project.properties | 2 +-
.../glassfish/tooling/data/GlassFishVersion.java | 90 +--
.../server/config/ConfigBuilderProvider.java | 11 +-
.../tooling/server/config/GlassFishV6_2_1.xml | 105 +++
.../tooling/server/config/JavaSEPlatform.java | 25 +-
.../netbeans/modules/payara/common/StartTask.java | 7 +-
.../modules/groovy/support/api/GroovySources.java | 2 +
.../codetemplates/CodeTemplateInsertHandler.java | 8 +-
ide/xml.retriever/licenseinfo.xml | 28 +
.../modules/java/editor/resources/fontsColors.xml | 2 +-
.../modules/java/hints/jdk/CheckRegex.java | 3 +-
.../modules/java/hints/jdk/CheckRegexTest.java | 4 +-
.../maven/execute/CommandLineOutputHandler.java | 24 +-
.../modules/java/hints/spiimpl/JackpotTrees.java | 91 +--
.../modules/java/hints/spiimpl/Utilities.java | 13 +-
.../jnlp/external/jnlp-definitions-7.0-license.txt | 748 +++++++++------------
.../modules/php/editor/actions/FixUsesAction.java | 2 +-
.../php/editor/actions/FixUsesPerformer.java | 86 ++-
.../php/editor/actions/UsedNamesCollector.java | 61 +-
.../modules/php/editor/model/ModelUtils.java | 99 +++
.../test/unit/data/testfiles/actions/nb4978_01.php | 39 ++
.../data/testfiles/actions/nb4978_01.php.usedNames | 4 +
.../test/unit/data/testfiles/actions/nb4978_02.php | 37 +
.../data/testfiles/actions/nb4978_02.php.usedNames | 4 +
.../test/unit/data/testfiles/actions/nb4978_03.php | 43 ++
.../data/testfiles/actions/nb4978_03.php.usedNames | 4 +
.../test/unit/data/testfiles/actions/nb4978_04.php | 45 ++
.../data/testfiles/actions/nb4978_04.php.usedNames | 4 +
.../test/unit/data/testfiles/actions/nb4978_05.php | 44 ++
.../data/testfiles/actions/nb4978_05.php.usedNames | 4 +
.../test/unit/data/testfiles/actions/nb4978_06.php | 44 ++
.../data/testfiles/actions/nb4978_06.php.usedNames | 4 +
.../test/unit/data/testfiles/actions/nb4978_07.php | 45 ++
.../data/testfiles/actions/nb4978_07.php.usedNames | 4 +
.../test/unit/data/testfiles/actions/nb4978_08.php | 50 ++
.../data/testfiles/actions/nb4978_08.php.usedNames | 1 +
.../actions/testNB4978/01/testNB4978_01.php | 39 ++
.../testNB4978/01/testNB4978_01.php.fixUses | 41 ++
.../actions/testNB4978/02/testNB4978_02.php | 37 +
.../testNB4978/02/testNB4978_02.php.fixUses | 39 ++
.../actions/testNB4978/03/testNB4978_03.php | 43 ++
.../testNB4978/03/testNB4978_03.php.fixUses | 45 ++
.../actions/testNB4978/04/testNB4978_04.php | 45 ++
.../testNB4978/04/testNB4978_04.php.fixUses | 47 ++
.../actions/testNB4978/05/testNB4978_05.php | 44 ++
.../testNB4978/05/testNB4978_05.php.fixUses | 46 ++
.../actions/testNB4978/06/testNB4978_06.php | 44 ++
.../testNB4978/06/testNB4978_06.php.fixUses | 46 ++
.../actions/testNB4978/07/testNB4978_07.php | 45 ++
.../testNB4978/07/testNB4978_07.php.fixUses | 47 ++
.../php/editor/actions/FixUsesPerformerTest.java | 42 ++
.../php/editor/actions/UsedNamesCollectorTest.java | 32 +
.../modules/php/project/resources/layer.xml | 6 +-
.../NewFileWizardIteratorWithNamespace.java | 92 +++
67 files changed, 2827 insertions(+), 1154 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists