date:20230213

[netbeans] branch master updated: Corrected a typo in the php parser tests

2023-02-13 Thread junichi11

This is an automated email from the ASF dual-hosted git repository.

junichi11 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git


The following commit(s) were added to refs/heads/master by this push:
 new 1c64bc5880 Corrected a typo in the php parser tests
 new 52975795ec Merge pull request #5476 from troizet/fix_php_parser_tests
1c64bc5880 is described below

commit 1c64bc5880f27de272963d40c80feca6f3601a80
Author: Alexey Borokhvostov 
AuthorDate: Sun Feb 12 14:42:54 2023 +0700

Corrected a typo in the php parser tests
---
 .../treatNamespacedNamesAsSingleToken_02a.pass | 32 +--
 .../treatNamespacedNamesAsSingleToken_02b.pass | 36 +++---
 .../treatNamespacedNamesAsSingleToken_02a.php  |  2 +-
 .../treatNamespacedNamesAsSingleToken_02b.php  |  2 +-
 4 files changed, 36 insertions(+), 36 deletions(-)

diff --git 
a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php80/treatNamespacedNamesAsSingleToken_02a.pass
 
b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php80/treatNamespacedNamesAsSingleToken_02a.pass
index 6969358281..4483160105 100644
--- 
a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php80/treatNamespacedNamesAsSingleToken_02a.pass
+++ 
b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php80/treatNamespacedNamesAsSingleToken_02a.pass
@@ -615,26 +615,26 @@
 
 namespace
 
-
-ineterface
+
+interface
 
-
+
 ;
 
-
+
 namespace
 
-
+
 enum
 
-
+
 ;
 
-
+
 
 
 
-
+
 
 
 
@@ -1117,18 +1117,18 @@
 
 
 
-
-
-
+
+
+
 
-
+
 
 
-
-
-
+
+
+
 
-
+
 
 
 
diff --git 
a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php80/treatNamespacedNamesAsSingleToken_02b.pass
 
b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php80/treatNamespacedNamesAsSingleToken_02b.pass
index 831ac128a0..fd3c2c6af5 100644
--- 
a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php80/treatNamespacedNamesAsSingleToken_02b.pass
+++ 
b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php80/treatNamespacedNamesAsSingleToken_02b.pass
@@ -819,32 +819,32 @@
 
 namespace
 
-
-ineterface
+
+interface
 
-
+
 {
 
-
+
 }
 
-
+
 namespace
 
-
+
 enum
 
-
+
 {
 
-
+
 }
 
-
+
 
 
 
-
+
 
 
 
@@ -1327,18 +1327,18 @@
 
 
 
-
-
-
+
+
+
 
-
+
 
 
-
-
-
+
+
+
 
-
+
 
 
 
diff --git 
a/php/php.editor/test/unit/data/testfiles/parser/php80/treatNamespacedNamesAsSingleToken_02a.php
 
b/php/php.editor/test/unit/data/testfiles/parser/php80/treatNamespacedNamesAsSingleToken_02a.php
index 22a51e9e66..d62a8d5469 100644
--- 
a/php/php.editor/test/unit/data/testfiles/parser/php80/treatNamespacedNamesAsSingleToken_02a.php
+++ 
b/php/php.editor/test/unit/data/testfiles/parser/php80/treatNamespacedNamesAsSingleToken_02a.php
@@ -87,5 +87,5 @@ namespace callable;
 namespace extends;
 namespace implements;
 namespace trait;
-namespace ineterface;
+namespace interface;
 namespace enum;
diff --git 
a/php/php.editor/test/unit/data/testfiles/parser/php80/treatNamespacedNamesAsSingleToken_02b.php

[netbeans] branch master updated: Add support for Glassfish 7.0.1 (#5466)

2023-02-13 Thread pepness

This is an automated email from the ASF dual-hosted git repository.

pepness pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git


The following commit(s) were added to refs/heads/master by this push:
 new e13155a071 Add support for Glassfish 7.0.1 (#5466)
e13155a071 is described below

commit e13155a071bb061e94c9e2eee4f72b232236ee8f
Author: José Contreras 
AuthorDate: Mon Feb 13 13:45:17 2023 -0600

Add support for Glassfish 7.0.1 (#5466)

- Add missing validations for servlet 5 and 6
- Add missing glassfish 4 objects in ASDDVersion class
- Remove ancient comment, there is already logic to support lookup keys
  and deployers for glassfish version 3 and upward
---
 .../modules/glassfish/common/Bundle.properties |  1 +
 .../modules/glassfish/common/ServerDetails.java| 18 ++-
 .../eecommon/api/config/J2eeModuleHelper.java  | 26 ++
 .../eecommon/api/config/ServletVersion.java|  9 
 .../glassfish/javaee/Hk2DeploymentFactory.java |  2 +-
 .../glassfish/javaee/Hk2JavaEEPlatformFactory.java | 17 +++
 .../glassfish/tooling/data/GlassFishVersion.java   | 12 -
 .../server/config/ConfigBuilderProvider.java   |  8 +++-
 .../tooling/data/GlassFishVersionTest.java |  7 ++-
 .../modules/j2ee/sun/dd/api/ASDDVersion.java   | 56 +-
 10 files changed, 136 insertions(+), 20 deletions(-)

diff --git 
a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties
 
b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties
index 194f03b27b..cf864a7f6e 100644
--- 
a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties
+++ 
b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties
@@ -167,6 +167,7 @@ STR_623_SERVER_NAME=GlassFish Server 6.2.3
 STR_624_SERVER_NAME=GlassFish Server 6.2.4
 STR_625_SERVER_NAME=GlassFish Server 6.2.5
 STR_700_SERVER_NAME=GlassFish Server 7.0.0
+STR_701_SERVER_NAME=GlassFish Server 7.0.1
 
 # CommonServerSupport.java
 MSG_FLAKEY_NETWORK=Network communication problemCould not establish 
\
diff --git 
a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java
 
b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java
index dc23aa60b7..1a153bfe46 100644
--- 
a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java
+++ 
b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java
@@ -298,8 +298,19 @@ public enum ServerDetails {
 GLASSFISH_SERVER_7_0_0(NbBundle.getMessage(ServerDetails.class, 
"STR_700_SERVER_NAME", new Object[]{}), // NOI18N
 "deployer:gfv700ee10", // NOI18N
 700,
-
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.0-M4/glassfish-7.0.0-M4.zip;,
 // NOI18N
-
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.0-M4/glassfish-7.0.0-M4.zip;,
 // NOI18N
+
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.0/glassfish-7.0.0.zip;,
 // NOI18N
+
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.0/glassfish-7.0.0.zip;,
 // NOI18N
+"http://www.eclipse.org/legal/epl-2.0; //NOI18N
+),
+
+/**
+ * details for an instance of GlassFish Server 7.0.1
+ */
+GLASSFISH_SERVER_7_0_1(NbBundle.getMessage(ServerDetails.class, 
"STR_701_SERVER_NAME", new Object[]{}), // NOI18N
+"deployer:gfv700ee10", // NOI18N
+700,
+
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.1/glassfish-7.0.1.zip;,
 // NOI18N
+
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.1/glassfish-7.0.1.zip;,
 // NOI18N
 "http://www.eclipse.org/legal/epl-2.0; //NOI18N
 );
 
@@ -312,6 +323,7 @@ public enum ServerDetails {
 public static WizardDescriptor.InstantiatingIterator
 getInstantiatingIterator() {
 return new ServerWizardIterator(new ServerDetails[]{
+GLASSFISH_SERVER_7_0_1,
 GLASSFISH_SERVER_7_0_0,
 GLASSFISH_SERVER_6_2_5,
 GLASSFISH_SERVER_6_2_4,
@@ -336,6 +348,7 @@ public enum ServerDetails {
 GLASSFISH_SERVER_3_0_1,
 GLASSFISH_SERVER_3},
 new ServerDetails[]{
+GLASSFISH_SERVER_7_0_1,
 GLASSFISH_SERVER_7_0_0,
 GLASSFISH_SERVER_6_2_5,
 GLASSFISH_SERVER_6_2_4,
@@ -396,6 +409,7 @@ public enum ServerDetails {
 case GF_6_2_4:   return GLASSFISH_SERVER_6_2_4.getVersion();
 case GF_6_2_5:   return GLASSFISH_SERVER_6_2_5.getVersion();
 case GF_7_0_0:   return

[netbeans] branch master updated: Corrected a typo in the php parser tests

[netbeans] branch master updated: Add support for Glassfish 7.0.1 (#5466)

2 matches

Site Navigation

Mail list logo

Footer information