[netbeans] branch master updated: Update JavaFX archetypes for recent JavaFX/maven PRs #2036, #2037
This is an automated email from the ASF dual-hosted git repository.
jtulach 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 5b48f1c Update JavaFX archetypes for recent JavaFX/maven PRs
#2036,#2037
new daf1b7e Merge pull request #2057 from errael/UpdateJavaFXArchetypes
5b48f1c is described below
commit 5b48f1c48a03bde3a64b197d7619213b782b50cb
Author: Ernie Rael
AuthorDate: Tue Mar 31 21:01:45 2020 +0100
Update JavaFX archetypes for recent JavaFX/maven PRs #2036,#2037
---
.../org/netbeans/modules/maven/newproject/MavenWizardIterator.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
a/java/maven/src/org/netbeans/modules/maven/newproject/MavenWizardIterator.java
b/java/maven/src/org/netbeans/modules/maven/newproject/MavenWizardIterator.java
index 0527b94..a940cfc 100644
---
a/java/maven/src/org/netbeans/modules/maven/newproject/MavenWizardIterator.java
+++
b/java/maven/src/org/netbeans/modules/maven/newproject/MavenWizardIterator.java
@@ -93,13 +93,13 @@ public class MavenWizardIterator implements
WizardDescriptor.BackgroundInstantia
@TemplateRegistration(folder=ArchetypeWizards.TEMPLATE_FOLDER, position =
925, displayName = "#LBL_Maven_FXML_Archetype", iconBase =
"org/netbeans/modules/maven/resources/jaricon.png", description = "javafx.html")
@Messages("LBL_Maven_FXML_Archetype=FXML JavaFX Maven Archetype (Gluon)")
public static WizardDescriptor.InstantiatingIterator openJFXFML() {
- return definedFXArchetype("com.raelity.jfx",
"javafx-archetype-fxml-netbeans", "0.0.1", LBL_Maven_FXML_Archetype());
+ return definedFXArchetype("com.raelity.jfx",
"javafx-archetype-fxml-netbeans", "0.0.3", LBL_Maven_FXML_Archetype());
}
@TemplateRegistration(folder=ArchetypeWizards.TEMPLATE_FOLDER, position =
926, displayName = "#LBL_Maven_Simple_Archetype", iconBase =
"org/netbeans/modules/maven/resources/jaricon.png", description = "javafx.html")
@Messages("LBL_Maven_Simple_Archetype=Simple JavaFX Maven Archetype
(Gluon)")
public static WizardDescriptor.InstantiatingIterator openJFXSimple() {
- return definedFXArchetype("com.raelity.jfx",
"javafx-archetype-simple-netbeans", "0.0.1", LBL_Maven_Simple_Archetype());
+ return definedFXArchetype("com.raelity.jfx",
"javafx-archetype-simple-netbeans", "0.0.3", LBL_Maven_Simple_Archetype());
}
private static WizardDescriptor.InstantiatingIterator
definedFXArchetype(String g, String a, String v, String name) {
@@ -107,6 +107,7 @@ public class MavenWizardIterator implements
WizardDescriptor.BackgroundInstantia
if (System.getProperty("java.version").startsWith("1.8")) {
props.put("javafx-version", "1.8");
}
+props.put("add-debug-configuration", "Y");
return ArchetypeWizards.definedArchetype(g, a, v, null, name, props);
}
-
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
[jira] [Created] (NETBEANS-4095) NPE saving Java file with type error in for-each
Eirik Bakke created NETBEANS-4095:
-
Summary: NPE saving Java file with type error in for-each
Key: NETBEANS-4095
URL: https://issues.apache.org/jira/browse/NETBEANS-4095
Project: NetBeans
Issue Type: Bug
Components: java - Source
Affects Versions: 11.3
Environment: Java 14, NetBeans with nbjavac plugin installed
Reporter: Eirik Bakke
If, during editing, a for-each loop appears with an incorrect pair of types, an
error dialog shows up showing a NullPointerException every time the Java source
file is saved, interrupting the user. A minimized example exhibiting this
behavior is as follows:
{code:java}
public final class CausesVisitIterableForeachLoopNPE {
public static final void main(String args[]) {
final Map someMap = null;
for (Object someVar : someMap) { }
}
}
{code}
This example causes the IDE to throw the following exception:
{noformat}
java.lang.NullPointerException
at
com.sun.tools.javac.comp.Lower.visitIterableForeachLoop(Lower.java:3275)
at com.sun.tools.javac.comp.Lower.visitForeachLoop(Lower.java:3162)
at
com.sun.tools.javac.tree.JCTree$JCEnhancedForLoop.accept(JCTree.java:1176)
at
com.sun.tools.javac.tree.TreeTranslator.translate(TreeTranslator.java:58)
at com.sun.tools.javac.comp.Lower.translate(Lower.java:2080)
at
com.sun.tools.javac.tree.TreeTranslator.translate(TreeTranslator.java:70)
at
com.sun.tools.javac.tree.TreeTranslator.visitBlock(TreeTranslator.java:167)
at com.sun.tools.javac.comp.Lower.visitBlock(Lower.java:3347)
at com.sun.tools.javac.tree.JCTree$JCBlock.accept(JCTree.java:1036)
at
com.sun.tools.javac.tree.TreeTranslator.translate(TreeTranslator.java:58)
at com.sun.tools.javac.comp.Lower.translate(Lower.java:2080)
at
com.sun.tools.javac.tree.TreeTranslator.visitMethodDef(TreeTranslator.java:150)
at
com.sun.tools.javac.comp.Lower.visitMethodDefInternal(Lower.java:2538)
at com.sun.tools.javac.comp.Lower.visitMethodDef(Lower.java:2448)
at com.sun.tools.javac.tree.JCTree$JCMethodDecl.accept(JCTree.java:882)
at
com.sun.tools.javac.tree.TreeTranslator.translate(TreeTranslator.java:58)
at com.sun.tools.javac.comp.Lower.translate(Lower.java:2080)
at com.sun.tools.javac.comp.Lower.visitClassDef(Lower.java:2219)
at com.sun.tools.javac.tree.JCTree$JCClassDecl.accept(JCTree.java:788)
at
com.sun.tools.javac.tree.TreeTranslator.translate(TreeTranslator.java:58)
at com.sun.tools.javac.comp.Lower.translate(Lower.java:2080)
at com.sun.tools.javac.comp.Lower.translate(Lower.java:2099)
at
com.sun.tools.javac.comp.Lower.translateTopLevelClass(Lower.java:3813)
at com.sun.tools.javac.main.JavaCompiler.desugar(JavaCompiler.java:1691)
at com.sun.tools.javac.main.JavaCompiler.desugar(JavaCompiler.java:1532)
at
com.sun.tools.javac.api.JavacTaskImpl$2.process(JavacTaskImpl.java:574)
at
com.sun.tools.javac.api.JavacTaskImpl$Filter.run(JavacTaskImpl.java:651)
at
com.sun.tools.javac.api.JavacTaskImpl.generate(JavacTaskImpl.java:577)
[catch] at
org.netbeans.modules.java.source.nbjavac.indexing.MultiPassCompileWorker.compile(MultiPassCompileWorker.java:303)
at
org.netbeans.modules.java.source.indexing.JavaCustomIndexer.index(JavaCustomIndexer.java:361)
at
org.netbeans.modules.parsing.spi.indexing.Indexable$MyAccessor$2.run(Indexable.java:138)
at
org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater.runIndexer(RepositoryUpdater.java:275)
at
org.netbeans.modules.parsing.spi.indexing.Indexable$MyAccessor.index(Indexable.java:136)
at
org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater$Work.doIndex(RepositoryUpdater.java:2750)
at
org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater$Work.access$800(RepositoryUpdater.java:2154)
at
org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater$Work$1.run(RepositoryUpdater.java:2636)
at
org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater$Work$1.run(RepositoryUpdater.java:2634)
at
org.netbeans.modules.parsing.impl.indexing.errors.TaskCache.refreshTransaction(TaskCache.java:540)
at
org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater$Work.index(RepositoryUpdater.java:2634)
at
org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater$Work$3.call(RepositoryUpdater.java:3300)
at
org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater$Work$3.call(RepositoryUpdater.java:3255)
at
org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater$4.run(RepositoryUpdater.java:2127)
at org.openide.util.lookup.Lookups.executeWith(Lookups.java:279)
at
org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater.runInC
[jira] [Updated] (NETBEANS-623) CTRL+/ does not work for block code comment
[ https://issues.apache.org/jira/browse/NETBEANS-623?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] mohamed chebbi updated NETBEANS-623: Description: CTRL+/ collaps the code Note: i have an AZERTY keyboard > CTRL+/ does not work for block code comment > > > Key: NETBEANS-623 > URL: https://issues.apache.org/jira/browse/NETBEANS-623 > Project: NetBeans > Issue Type: Bug > Components: java - Editor > Environment: OS : Linux > VM : Java HotSpot(TM) 64-Bit Server VM, 25.102-b14, Java(TM) SE Runtime > Environment, 1.8.0_102-b14 >Reporter: Constantin Drabo >Priority: Major > > CTRL+/ collaps the code > Note: i have an AZERTY keyboard -- This message was sent by Atlassian Jira (v8.3.4#803005) - 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
[jira] [Created] (NETBEANS-4094) Can't request verification of new plugin version on PP3 without dropping verification of previous version
Ernie Rael created NETBEANS-4094: Summary: Can't request verification of new plugin version on PP3 without dropping verification of previous version Key: NETBEANS-4094 URL: https://issues.apache.org/jira/browse/NETBEANS-4094 Project: NetBeans Issue Type: Bug Components: updatecenters - Pluginportal Reporter: Ernie Rael This problem opens a window where no version of the given plugin appears in the catalog. Between dropping and verification completion. To reproduce: # add new version of plugin in maven repository, refresh in PP3. # edit new version # Observe; there is no "request verification" button for new version If you edit the previous version, you can drop verification, then go back to the new version and request verification. -- This message was sent by Atlassian Jira (v8.3.4#803005) - 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
[netbeans-website] branch upgrade_gradle_version updated (68a3549 -> a3e8ac6)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch upgrade_gradle_version in repository https://gitbox.apache.org/repos/asf/netbeans-website.git. from 68a3549 Upgrade to gradle 6.3 add a3e8ac6 Remove wrapper config No new revisions were added by this update. Summary of changes: netbeans.apache.org/build.gradle | 4 1 file changed, 4 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
[netbeans-website] 01/01: Upgrade to gradle 6.3
This is an automated email from the ASF dual-hosted git repository.
hectorespert pushed a commit to branch upgrade_gradle_version
in repository https://gitbox.apache.org/repos/asf/netbeans-website.git
commit 68a35492d80b82c0f4b4e9c5751242cd6ef009d7
Author: Hector Espert
AuthorDate: Tue Mar 31 21:21:01 2020 +0200
Upgrade to gradle 6.3
---
netbeans.apache.org/build.gradle| 8
netbeans.apache.org/gradle/deps.gradle | 2 +-
.../gradle/wrapper/gradle-wrapper.jar | Bin 54783 -> 55741 bytes
.../gradle/wrapper/gradle-wrapper.properties| 3 +--
netbeans.apache.org/gradlew | 8
netbeans.apache.org/gradlew.bat | 2 +-
6 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/netbeans.apache.org/build.gradle b/netbeans.apache.org/build.gradle
index 55f5c97..1c45a2a 100644
--- a/netbeans.apache.org/build.gradle
+++ b/netbeans.apache.org/build.gradle
@@ -206,7 +206,7 @@ task buildSite(dependsOn: ["preprocessContent", "bake"],
}
-task("run", type: JavaExec, group: "Run", overwrite: true) {
+task run(type: JavaExec, group: "Run") {
def wDir = new File(buildDir, "tomcat")
@@ -216,14 +216,14 @@ task("run", type: JavaExec, group: "Run", overwrite:
true) {
}
main "TomcatMain"
-classpath buildscript.configurations.classpath +
files("${rootProject.projectDir}/buildSrc/build/classes/main")
+classpath buildscript.configurations.classpath +
files("${rootProject.projectDir}/buildSrc/build/classes/groovy/main")
args = [bakedDir, 8080, "SHUTDOWN", 8088]
workingDir = wDir
}
-task("stop", type: JavaExec, group: "Run", overwrite: true) {
+task stop(type: JavaExec, group: "Run") {
main "TomcatStopMain"
-classpath buildscript.configurations.classpath +
files("${rootProject.projectDir}/buildSrc/build/classes/main")
+classpath buildscript.configurations.classpath +
files("${rootProject.projectDir}/buildSrc/build/classes/groovy/main")
args = ["SHUTDOWN", 8082]
}
diff --git a/netbeans.apache.org/gradle/deps.gradle
b/netbeans.apache.org/gradle/deps.gradle
index 1e86767..2c1d522 100644
--- a/netbeans.apache.org/gradle/deps.gradle
+++ b/netbeans.apache.org/gradle/deps.gradle
@@ -22,7 +22,7 @@ buildscript {
tomcat
"org.apache.tomcat.embed:tomcat-embed-logging-juli:${libs.tomcatJuli}"
}
libs = [
-groovy: "2.4.11",
+groovy: "2.5.10",
jbake: "2.5.1",
snakeYaml: "1.18",
gradle: "3.5.1",
diff --git a/netbeans.apache.org/gradle/wrapper/gradle-wrapper.jar
b/netbeans.apache.org/gradle/wrapper/gradle-wrapper.jar
index 19c760f..457aad0 100644
Binary files a/netbeans.apache.org/gradle/wrapper/gradle-wrapper.jar and
b/netbeans.apache.org/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/netbeans.apache.org/gradle/wrapper/gradle-wrapper.properties
b/netbeans.apache.org/gradle/wrapper/gradle-wrapper.properties
index d212895..a4b4429 100644
--- a/netbeans.apache.org/gradle/wrapper/gradle-wrapper.properties
+++ b/netbeans.apache.org/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Sun Jun 04 17:14:53 EDT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
diff --git a/netbeans.apache.org/gradlew b/netbeans.apache.org/gradlew
index 4453cce..af6708f 100755
--- a/netbeans.apache.org/gradlew
+++ b/netbeans.apache.org/gradlew
@@ -28,16 +28,16 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to
pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
-warn ( ) {
+warn () {
echo "$*"
}
-die ( ) {
+die () {
echo
echo "$*"
echo
@@ -155,7 +155,7 @@ if $cygwin ; then
fi
# Escape application args
-save ( ) {
+save () {
for i do printf %s\\n "$i" | sed "s/'/'''/g;1s/^/'/;\$s/\$/' /" ;
done
echo " "
}
diff --git a/netbeans.apache.org/gradlew.bat b/netbeans.apache.org/gradlew.bat
index e95643d..0f8d593 100644
--- a/netbeans.apache.org/gradlew.bat
+++ b/netbeans.apache.org/gradlew.bat
@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS
to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
-
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@ne
[netbeans-website] branch upgrade_gradle_version created (now 68a3549)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch upgrade_gradle_version in repository https://gitbox.apache.org/repos/asf/netbeans-website.git. at 68a3549 Upgrade to gradle 6.3 This branch includes the following new commits: new 68a3549 Upgrade to gradle 6.3 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. - 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
[jira] [Resolved] (NETBEANS-3558) Add Spring Framework 5.2.2
[ https://issues.apache.org/jira/browse/NETBEANS-3558?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Hector Espert resolved NETBEANS-3558. - Fix Version/s: 12.0 Resolution: Fixed > Add Spring Framework 5.2.2 > -- > > Key: NETBEANS-3558 > URL: https://issues.apache.org/jira/browse/NETBEANS-3558 > Project: NetBeans > Issue Type: Improvement > Components: javaee - Spring >Affects Versions: Next >Reporter: Hector Espert >Assignee: Hector Espert >Priority: Minor > Labels: pull-request-available > Fix For: Next, 12.0 > > Attachments: Screenshot from 2019-12-22 13-24-24.png > > Time Spent: 1h > Remaining Estimate: 0h > > Update java/libs.springframework module to add Spring Framework 5.2.2 library > dependency for ant projects. > !Screenshot from 2019-12-22 13-24-24.png! -- This message was sent by Atlassian Jira (v8.3.4#803005) - 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
[netbeans-html4j] 01/02: Record booting sequence and print the log in case of timeout
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git
commit c5449e128067ed7416248697907e29f6736145ff
Author: Jaroslav Tulach
AuthorDate: Tue Mar 31 19:24:31 2020 +0200
Record booting sequence and print the log in case of timeout
---
.../org/netbeans/html/presenters/spi/Generic.java | 98 --
.../html/presenters/spi/ProtoPresenterBuilder.java | 2 +-
.../netbeans/html/presenters/spi/ValueOfTest.java | 5 +-
.../html/presenters/spi/test/GenericTest.java | 2 +-
4 files changed, 56 insertions(+), 51 deletions(-)
diff --git
a/generic/src/main/java/org/netbeans/html/presenters/spi/Generic.java
b/generic/src/main/java/org/netbeans/html/presenters/spi/Generic.java
index df12a8b..1481efd 100644
--- a/generic/src/main/java/org/netbeans/html/presenters/spi/Generic.java
+++ b/generic/src/main/java/org/netbeans/html/presenters/spi/Generic.java
@@ -40,11 +40,12 @@ import java.util.NavigableSet;
import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import org.netbeans.html.boot.spi.Fn;
abstract class Generic implements Fn.Presenter, Fn.KeepAlive, Flushable {
-private String msg;
+private StringBuilder msg;
private Item call;
private final NavigableSet exported;
private final int key;
@@ -69,7 +70,22 @@ abstract class Generic implements Fn.Presenter,
Fn.KeepAlive, Flushable {
return initialized;
}
-abstract void log(Level level, String msg, Object... args);
+final void log(Level level, String msg, Object... args) {
+StringBuilder sb = this.msg;
+if (sb != null) {
+for (int i = 0; i < args.length; i++) {
+String txt = args[i] == null ? "null" : args[i].toString();
+msg = msg.replace("{" + i + "}", txt);
+}
+synchronized (lock()) {
+sb.append('[').append(level).append("] ");
+sb.append(msg);
+sb.append('\n');
+}
+}
+handleLog(level, msg, args);
+}
+abstract void handleLog(Level level, String msg, Object... args);
@Texts({
"begin=try {\n"
@@ -165,43 +181,43 @@ abstract class Generic implements Fn.Presenter,
Fn.KeepAlive, Flushable {
+ "\n impl.toVM = toVM;"
+ "\n impl.toVM('r', 'OK', 'Initialized', null, null);"
+ "\n})(this);",
-
+"initializationProtocol=--- Initialization protocol ---\n",
"error=Cannot initialize DukeScript: @1",
"version=$version"
})
final void init() {
-if (msg != null) {
-for (;;) {
-try {
-log(Level.FINE, "Awaiting as of {0}", msg);
-initialized.await();
-log(Level.FINE, "Waiting is over");
-return;
-} catch (InterruptedException ex) {
-log(Level.INFO, "Interrupt", ex);
-}
+if (initialized.getCount() == 0) {
+return;
+}
+synchronized (lock()) {
+if (initialized.getCount() == 0) {
+return;
+}
+if (msg == null) {
+this.msg = new StringBuilder(Strings.initializationProtocol());
+callbackFn(new ProtoPresenterBuilder.OnPrepared() {
+@Override
+public void callbackIsPrepared(String clbk) {
+log(Level.FINE, "callbackReady with {0}", clbk);
+loadJS(Strings.begin(clbk).toString());
+log(Level.FINE, "checking OK state");
+loadJS(Strings.init(key, clbk).toString());
+}
+});
}
}
-this.msg = "";
-callbackFn(new ProtoPresenterBuilder.OnPrepared() {
-@Override
-public void callbackIsPrepared(String clbk) {
-log(Level.FINE, "callbackReady with {0}", clbk);
-loadJS(Strings.begin(clbk).toString());
-log(Level.FINE, "checking OK state");
-if (!assertOK()) {
-final CharSequence err = Strings.error(msg);
-log(Level.WARNING, "no OK: {0}", err);
-throw new IllegalStateException(err.toString());
+for (int counter = 0;; counter++) {
+try {
+handleLog(Level.FINE, "Awaiting as of {0}", counter);
+if (initialized.await(10, TimeUnit.SECONDS)) {
+handleLog(Level.FINE, "Waiting is over");
+return;
}
-log(Level.FINE, "assertOK");
-
-loadJS(Strings.init(
[netbeans-html4j] 02/02: Abstracting the interface between Browser.Command and Grizzly HTTP server
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git
commit c853bf519492ba9c2fa46e02330fd22953d497f0
Author: Jaroslav Tulach
AuthorDate: Tue Mar 31 19:43:42 2020 +0200
Abstracting the interface between Browser.Command and Grizzly HTTP server
---
.../netbeans/html/presenters/browser/Browser.java | 359 -
.../html/presenters/browser/GrizzlyServer.java | 207
.../html/presenters/browser/HttpServer.java| 62
.../html/presenters/browser/BrowserTest.java | 58 +---
.../html/presenters/browser/DynamicHTTP.java | 68 ++--
.../presenters/browser/JavaScriptUtilities.java| 43 +++
.../netbeans/html/presenters/browser/KOScript.java | 11 +-
.../html/presenters/browser/KoBrowserTest.java | 143 ++--
.../html/presenters/browser/ServerFactories.java | 91 ++
.../presenters/browser/ServerMimeTypeTest.java | 102 ++
.../html/presenters/browser/ServerTest.java| 9 +-
.../html/presenters/browser/SimpleServerTest.java | 270
.../org/netbeans/html/presenters/browser/test.css | 18 ++
.../org/netbeans/html/presenters/browser/test.js | 18 ++
.../netbeans/html/presenters/browser/test.min.js | 18 ++
15 files changed, 1090 insertions(+), 387 deletions(-)
diff --git
a/browser/src/main/java/org/netbeans/html/presenters/browser/Browser.java
b/browser/src/main/java/org/netbeans/html/presenters/browser/Browser.java
index 9b80d32..d433644 100644
--- a/browser/src/main/java/org/netbeans/html/presenters/browser/Browser.java
+++ b/browser/src/main/java/org/netbeans/html/presenters/browser/Browser.java
@@ -20,6 +20,7 @@ package org.netbeans.html.presenters.browser;
import org.netbeans.html.presenters.render.Show;
import java.io.Closeable;
+import java.io.File;
import java.io.FileNotFoundException;
import java.io.Flushable;
import java.io.IOException;
@@ -31,6 +32,9 @@ import java.io.Writer;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLDecoder;
+import java.nio.file.Files;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedList;
@@ -41,16 +45,9 @@ import java.util.UUID;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
+import java.util.function.Supplier;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.glassfish.grizzly.PortRange;
-import org.glassfish.grizzly.http.server.HttpHandler;
-import org.glassfish.grizzly.http.server.HttpServer;
-import org.glassfish.grizzly.http.server.NetworkListener;
-import org.glassfish.grizzly.http.server.Request;
-import org.glassfish.grizzly.http.server.Response;
-import org.glassfish.grizzly.http.server.ServerConfiguration;
-import org.glassfish.grizzly.http.util.HttpStatus;
import org.netbeans.html.boot.spi.Fn;
import org.netbeans.html.boot.spi.Fn.Presenter;
import org.netbeans.html.presenters.spi.ProtoPresenter;
@@ -74,12 +71,13 @@ import org.openide.util.lookup.ServiceProvider;
public final class Browser implements Fn.Presenter, Fn.KeepAlive, Flushable,
Executor, Closeable {
static final Logger LOG = Logger.getLogger(Browser.class.getName());
-private final Map SESSIONS = new HashMap();
+private final Map SESSIONS = new HashMap<>();
private final String app;
-private HttpServer s;
+private HttpServer server;
private Runnable onPageLoad;
private Command current;
private final Config config;
+private final Supplier> serverProvider;
/** Default constructor. Reads configuration from properties. The actual
browser to
* be launched can be influenced by value of
@@ -111,34 +109,39 @@ Executor, Closeable {
* @param config the configuration
*/
public Browser(Config config) {
-this(findCalleeClassName(), config);
+this(findCalleeClassName(), config, null);
}
-
-Browser(String app, Config config) {
+
+Browser(String app, Config config, Supplier>
serverProvider) {
+this.serverProvider = serverProvider != null ? serverProvider :
GrizzlyServer::new;
this.app = app;
this.config = new Config(config);
}
@Override
public final void execute(final Runnable r) {
-current.runSafe(r, true);
+current.execute(r);
}
@Override
public void close() throws IOException {
-s.shutdownNow();
+if (server != null) {
+server.shutdownNow();
+}
}
HttpServer server() {
-return s;
+return server;
}
static HttpServer findServer(Object obj) {
-Command c = null;
+Command c;
if (obj instanceof Command) {
c = (Command) obj;
} else if (obj instanceof Pr
[netbeans-html4j] branch master updated (e05f503 -> c853bf5)
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git. from e05f503 Making sure the Javadoc can be generated on JDK8, 11 and 14 new c5449e1 Record booting sequence and print the log in case of timeout new c853bf5 Abstracting the interface between Browser.Command and Grizzly HTTP server The 2 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: .../netbeans/html/presenters/browser/Browser.java | 359 - .../html/presenters/browser/GrizzlyServer.java | 207 .../html/presenters/browser/HttpServer.java| 62 .../html/presenters/browser/BrowserTest.java | 58 +--- .../html/presenters/browser/DynamicHTTP.java | 68 ++-- .../presenters/browser/JavaScriptUtilities.java| 40 ++- .../netbeans/html/presenters/browser/KOScript.java | 11 +- .../html/presenters/browser/KoBrowserTest.java | 143 ++-- .../html/presenters/browser/ServerFactories.java | 91 ++ .../presenters/browser/ServerMimeTypeTest.java | 102 ++ .../html/presenters/browser/ServerTest.java| 9 +- .../html/presenters/browser/SimpleServerTest.java | 270 .../org/netbeans/html/presenters/browser/test.css | 0 .../org/netbeans/html/presenters/browser/test.js | 0 .../netbeans/html/presenters/browser/test.min.js | 0 .../org/netbeans/html/presenters/spi/Generic.java | 98 +++--- .../html/presenters/spi/ProtoPresenterBuilder.java | 2 +- .../netbeans/html/presenters/spi/ValueOfTest.java | 5 +- .../html/presenters/spi/test/GenericTest.java | 2 +- 19 files changed, 1067 insertions(+), 460 deletions(-) create mode 100644 browser/src/main/java/org/netbeans/html/presenters/browser/GrizzlyServer.java create mode 100644 browser/src/main/java/org/netbeans/html/presenters/browser/HttpServer.java copy generic/src/test/java/org/netbeans/html/presenters/spi/test/Counter.java => browser/src/test/java/org/netbeans/html/presenters/browser/JavaScriptUtilities.java (55%) create mode 100644 browser/src/test/java/org/netbeans/html/presenters/browser/ServerFactories.java create mode 100644 browser/src/test/java/org/netbeans/html/presenters/browser/ServerMimeTypeTest.java create mode 100644 browser/src/test/java/org/netbeans/html/presenters/browser/SimpleServerTest.java copy html4j-maven-plugin/src/test/resources/org/netbeans/html/mojo/gradle1/src/main/resources/empty.js => browser/src/test/resources/org/netbeans/html/presenters/browser/test.css (100%) copy html4j-maven-plugin/src/test/resources/org/netbeans/html/mojo/gradle1/src/main/resources/empty.js => browser/src/test/resources/org/netbeans/html/presenters/browser/test.js (100%) copy html4j-maven-plugin/src/test/resources/org/netbeans/html/mojo/gradle1/src/main/resources/empty.js => browser/src/test/resources/org/netbeans/html/presenters/browser/test.min.js (100%) - 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
[jira] [Commented] (NETBEANSINFRA-185) Register PP3 UC in Apache NetBeans 12.0
[ https://issues.apache.org/jira/browse/NETBEANSINFRA-185?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17072010#comment-17072010 ] Matthias Bläsing commented on NETBEANSINFRA-185: Before we can switch over to PP3 (and putting it into production), we still need to get the credentials for the authentication providers into the hands of the PMC. As the credentials are potentially bound to a single person currently and creating new credentials will invalidate all accounts associated with these credentials we need get that sorted before PP3 is put into production. > Register PP3 UC in Apache NetBeans 12.0 > --- > > Key: NETBEANSINFRA-185 > URL: https://issues.apache.org/jira/browse/NETBEANSINFRA-185 > Project: Apache NetBeans Infra > Issue Type: Task > Components: PluginPortal - infra >Reporter: Jiří Kovalský >Priority: Critical > > We need to register update center [1] of new Plugin Portal 3.0 in the Apache > NetBeans IDE 12.0 and either remove or rename the old one [2] to Legacy > Plugin Portal. > [1] [http://netbeans-vm.apache.org/pluginportal/data/12.0/catalog.xml.gz] > [2] > [http://plugins.netbeans.org/nbpluginportal/updates/11.0/catalog.xml.gz|http://plugins.netbeans.org/nbpluginportal/updates/11.0/catalog.xml] -- This message was sent by Atlassian Jira (v8.3.4#803005) - 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
[netbeans-website] branch jkovalsky/PP23UC created (now 63b9746)
This is an automated email from the ASF dual-hosted git repository. jkovalsky pushed a change to branch jkovalsky/PP23UC in repository https://gitbox.apache.org/repos/asf/netbeans-website.git. at 63b9746 Merge pull request #465 from apache/geertjanw-patch-21 No new revisions were added by this update. - 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
[jira] [Updated] (NETBEANSINFRA-185) Register PP3 UC in Apache NetBeans 12.0
[ https://issues.apache.org/jira/browse/NETBEANSINFRA-185?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Jiří Kovalský updated NETBEANSINFRA-185: Due Date: 10/Apr/20 > Register PP3 UC in Apache NetBeans 12.0 > --- > > Key: NETBEANSINFRA-185 > URL: https://issues.apache.org/jira/browse/NETBEANSINFRA-185 > Project: Apache NetBeans Infra > Issue Type: Task > Components: PluginPortal - infra >Reporter: Jiří Kovalský >Priority: Critical > > We need to register update center [1] of new Plugin Portal 3.0 in the Apache > NetBeans IDE 12.0 and either remove or rename the old one [2] to Legacy > Plugin Portal. > [1] [http://netbeans-vm.apache.org/pluginportal/data/12.0/catalog.xml.gz] > [2] > [http://plugins.netbeans.org/nbpluginportal/updates/11.0/catalog.xml.gz|http://plugins.netbeans.org/nbpluginportal/updates/11.0/catalog.xml] -- This message was sent by Atlassian Jira (v8.3.4#803005) - 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
[jira] [Created] (NETBEANSINFRA-185) Register PP3 UC in Apache NetBeans 12.0
Jiří Kovalský created NETBEANSINFRA-185: --- Summary: Register PP3 UC in Apache NetBeans 12.0 Key: NETBEANSINFRA-185 URL: https://issues.apache.org/jira/browse/NETBEANSINFRA-185 Project: Apache NetBeans Infra Issue Type: Task Components: PluginPortal - infra Reporter: Jiří Kovalský We need to register update center [1] of new Plugin Portal 3.0 in the Apache NetBeans IDE 12.0 and either remove or rename the old one [2] to Legacy Plugin Portal. [1] [http://netbeans-vm.apache.org/pluginportal/data/12.0/catalog.xml.gz] [2] [http://plugins.netbeans.org/nbpluginportal/updates/11.0/catalog.xml.gz|http://plugins.netbeans.org/nbpluginportal/updates/11.0/catalog.xml] -- This message was sent by Atlassian Jira (v8.3.4#803005) - 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
[jira] [Created] (NETBEANS-4093) Absence of Pack200 in JDK 14 should not cause failure of NetBean installer
Massimiliano Cuttini created NETBEANS-4093: -- Summary: Absence of Pack200 in JDK 14 should not cause failure of NetBean installer Key: NETBEANS-4093 URL: https://issues.apache.org/jira/browse/NETBEANS-4093 Project: NetBeans Issue Type: Bug Components: platform - Window System Affects Versions: 11.3 Environment: Windows 10 Reporter: Massimiliano Cuttini Attachments: image-2020-03-31-15-35-30-583.png Pack200 was deprecated in JDK 13 ([https://openjdk.java.net/jeps/336]) with planned removal in JDK 14 ([https://openjdk.java.net/jeps/367]) which happened recently ([http://hg.openjdk.java.net/jdk/jdk/rev/f236fd5d0c2c]) and supposed to be part of upcoming [JDK 14 Early Access|http://jdk.java.net/14/] Build 27. The ufficial Netbean 11.3 installer for windows fail to install with this message and crash !image-2020-03-31-15-35-30-583.png! -- This message was sent by Atlassian Jira (v8.3.4#803005) - 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
[jira] [Created] (NETBEANS-4092) package.json icon is to big
Christian Lenz created NETBEANS-4092: Summary: package.json icon is to big Key: NETBEANS-4092 URL: https://issues.apache.org/jira/browse/NETBEANS-4092 Project: NetBeans Issue Type: Bug Components: projects - Generic Projects UI Affects Versions: 11.2, 11.3 Environment: Product Version: Apache NetBeans IDE 11.3 Java: 9.0.4; Java HotSpot(TM) 64-Bit Server VM 9.0.4+11 Runtime: Java(TM) SE Runtime Environment 9.0.4+11 System: Windows 10 version 10.0 running on amd64; Cp1252; de_DE (nb) User directory: C:\Projekte\Netbeans Plugins\MinifierBeans\build\testuserdir Cache directory: C:\Projekte\Netbeans Plugins\MinifierBeans\build\testuserdir\var\cache Reporter: Christian Lenz Attachments: image-2020-03-31-14-40-41-931.png, image-2020-03-31-14-41-47-408.png In my current IDE 11.1 there is no problem with the npm icon for the package.json file. You can see it in this my attached file image-2020-03-31-14-43-07-177.png. it is 16x16 px small. When I use 11.3 the icon is bigger see image-2020-03-31-14-40-41-931. I also tested ith with 11.2 and there is the same problem. So smth changed from 11.1 to 11.2 with icons or HiDPI maybe? Steps to reprocuce: * open a project with a package.json file * open the tree nodes in the project view to see the package.json file * Icon is to big. Both IDEs are running on JDK 9.0.4, same PC (Surface Book 1 with HiDPI resolution) -- This message was sent by Atlassian Jira (v8.3.4#803005) - 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
[netbeans] branch master updated (0f9f4c5 -> 77bb92d)
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 0f9f4c5 Merging #2036: Default JavaFX archetypes to javafx 1.8 when running on jdk1.8 new e47e1f7 Sync master to release 12.0 beta2 new 33ab777 test module-info in jdk8 new 37c9799 Ingore module-info.java if on jdk1.8 or earlier. new 77bb92d Merge pull request #2037 from errael/master The 3805 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: .../api/common/classpath/ModuleClassPathsTest.java | 42 ++ .../maven/classpath/ClassPathProviderImpl.java | 15 ++-- 2 files changed, 54 insertions(+), 3 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
