You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by jt...@apache.org on 2020/06/21 12:59:50 UTC
[netbeans] branch master updated (c067f12 -> 700af67)
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 c067f12 Merge pull request #2202 from KacerCZ/test-php-modules
add ddf52b6 Move JavaFX related functionality to JavaFX cluster
add e955df4 Merge '12.0+' into MoveToJavaFXCluster
add 35542e7 Adding missing license
add c17a078 Localized error messages from ModuleManager
add bc31e77 Enable download when simple activation fails
new 700af67 Merge remote-tracking branch 'dukescript/MoveToJavaFXCluster'
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:
ergonomics/ide.ergonomics/java.properties | 2 -
ergonomics/ide.ergonomics/javafx.properties | 6 ++
.../ide/ergonomics/fod/ConfigurationPanel.java | 1 +
java/maven/nbproject/project.xml | 1 +
.../maven/src/org/netbeans/modules/maven/layer.xml | 6 --
.../modules/maven/newproject/Bundle.properties | 1 -
.../maven/newproject/MavenWizardIterator.java | 36 -------
javafx/javafx2.kit/manifest.mf | 1 +
javafx/javafx2.kit/nbproject/project.properties | 2 +-
javafx/javafx2.kit/nbproject/project.xml | 39 ++++++++
.../netbeans/modules/javafx2/kit/Bundle.properties | 2 +
.../modules/javafx2/kit/JavaFXWizardIterator.java | 62 ++++++++++++
.../org/netbeans/modules/javafx2/kit}/javafx.html | 0
.../src/org/netbeans/modules/javafx2/kit/layer.xml | 22 ++--
.../modules/javafx2/kit}/resources/jaricon.png | Bin
{java => javafx}/maven.htmlui/build.xml | 2 +-
{java => javafx}/maven.htmlui/licenseinfo.xml | 0
{java => javafx}/maven.htmlui/manifest.mf | 0
.../maven.htmlui/nbproject/project.properties | 0
.../maven.htmlui/nbproject/project.xml | 0
.../modules/maven/htmlui/Bundle.properties | 0
.../netbeans/modules/maven/htmlui/DeviceType.java | 0
.../org/netbeans/modules/maven/htmlui/DukeHTML.png | Bin
.../modules/maven/htmlui/DukeScriptWizard.java | 0
.../modules/maven/htmlui/MacUtilities.java | 0
.../modules/maven/htmlui/MavenUtilities.java | 0
.../netbeans/modules/maven/htmlui/description.html | 0
.../modules/maven/htmlui/dukeScriptWizard.html | 0
.../modules/maven/htmlui/dukescript.archetype | 0
.../modules/maven/htmlui/MacUtilitiesTest.java | 0
.../modules/maven/htmlui/MavenUtilitiesTest.java | 0
.../modules/maven/htmlui/WizardDataTest.java | 0
nbbuild/cluster.properties | 4 +-
.../src/org/netbeans/IllegalModuleException.java | 111 +++++++++++++++++++++
.../src/org/netbeans/ModuleManager.java | 30 +++---
.../unit/src/org/netbeans/ModuleManagerTest.java | 8 ++
36 files changed, 265 insertions(+), 71 deletions(-)
create mode 100644 javafx/javafx2.kit/src/org/netbeans/modules/javafx2/kit/JavaFXWizardIterator.java
rename {java/maven/src/org/netbeans/modules/maven/newproject => javafx/javafx2.kit/src/org/netbeans/modules/javafx2/kit}/javafx.html (100%)
copy java/maven.htmlui/licenseinfo.xml => javafx/javafx2.kit/src/org/netbeans/modules/javafx2/kit/layer.xml (59%)
copy {java/maven/src/org/netbeans/modules/maven => javafx/javafx2.kit/src/org/netbeans/modules/javafx2/kit}/resources/jaricon.png (100%)
rename {java => javafx}/maven.htmlui/build.xml (94%)
rename {java => javafx}/maven.htmlui/licenseinfo.xml (100%)
rename {java => javafx}/maven.htmlui/manifest.mf (100%)
rename {java => javafx}/maven.htmlui/nbproject/project.properties (100%)
rename {java => javafx}/maven.htmlui/nbproject/project.xml (100%)
rename {java => javafx}/maven.htmlui/src/org/netbeans/modules/maven/htmlui/Bundle.properties (100%)
rename {java => javafx}/maven.htmlui/src/org/netbeans/modules/maven/htmlui/DeviceType.java (100%)
rename {java => javafx}/maven.htmlui/src/org/netbeans/modules/maven/htmlui/DukeHTML.png (100%)
rename {java => javafx}/maven.htmlui/src/org/netbeans/modules/maven/htmlui/DukeScriptWizard.java (100%)
rename {java => javafx}/maven.htmlui/src/org/netbeans/modules/maven/htmlui/MacUtilities.java (100%)
rename {java => javafx}/maven.htmlui/src/org/netbeans/modules/maven/htmlui/MavenUtilities.java (100%)
rename {java => javafx}/maven.htmlui/src/org/netbeans/modules/maven/htmlui/description.html (100%)
rename {java => javafx}/maven.htmlui/src/org/netbeans/modules/maven/htmlui/dukeScriptWizard.html (100%)
rename {java => javafx}/maven.htmlui/src/org/netbeans/modules/maven/htmlui/dukescript.archetype (100%)
rename {java => javafx}/maven.htmlui/test/unit/src/org/netbeans/modules/maven/htmlui/MacUtilitiesTest.java (100%)
rename {java => javafx}/maven.htmlui/test/unit/src/org/netbeans/modules/maven/htmlui/MavenUtilitiesTest.java (100%)
rename {java => javafx}/maven.htmlui/test/unit/src/org/netbeans/modules/maven/htmlui/WizardDataTest.java (100%)
create mode 100644 platform/o.n.bootstrap/src/org/netbeans/IllegalModuleException.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 remote-tracking branch
'dukescript/MoveToJavaFXCluster'
Posted by jt...@apache.org.
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
commit 700af678ed08f642ecf77dfd3040d74e0caa80b9
Merge: c067f12 bc31e77
Author: Eppleton IT <se...@dukescript.com>
AuthorDate: Sun Jun 21 14:59:23 2020 +0200
Merge remote-tracking branch 'dukescript/MoveToJavaFXCluster'
ergonomics/ide.ergonomics/java.properties | 2 -
ergonomics/ide.ergonomics/javafx.properties | 6 ++
.../ide/ergonomics/fod/ConfigurationPanel.java | 1 +
java/maven/nbproject/project.xml | 1 +
.../maven/src/org/netbeans/modules/maven/layer.xml | 6 --
.../modules/maven/newproject/Bundle.properties | 1 -
.../maven/newproject/MavenWizardIterator.java | 36 -------
javafx/javafx2.kit/manifest.mf | 1 +
javafx/javafx2.kit/nbproject/project.properties | 2 +-
javafx/javafx2.kit/nbproject/project.xml | 39 ++++++++
.../netbeans/modules/javafx2/kit/Bundle.properties | 2 +
.../modules/javafx2/kit/JavaFXWizardIterator.java | 62 ++++++++++++
.../org/netbeans/modules/javafx2/kit}/javafx.html | 0
.../src/org/netbeans/modules/javafx2/kit/layer.xml | 22 ++--
.../modules/javafx2/kit/resources/jaricon.png | Bin 0 -> 883 bytes
{java => javafx}/maven.htmlui/build.xml | 2 +-
{java => javafx}/maven.htmlui/licenseinfo.xml | 0
{java => javafx}/maven.htmlui/manifest.mf | 0
.../maven.htmlui/nbproject/project.properties | 0
.../maven.htmlui/nbproject/project.xml | 0
.../modules/maven/htmlui/Bundle.properties | 0
.../netbeans/modules/maven/htmlui/DeviceType.java | 0
.../org/netbeans/modules/maven/htmlui/DukeHTML.png | Bin
.../modules/maven/htmlui/DukeScriptWizard.java | 0
.../modules/maven/htmlui/MacUtilities.java | 0
.../modules/maven/htmlui/MavenUtilities.java | 0
.../netbeans/modules/maven/htmlui/description.html | 0
.../modules/maven/htmlui/dukeScriptWizard.html | 0
.../modules/maven/htmlui/dukescript.archetype | 0
.../modules/maven/htmlui/MacUtilitiesTest.java | 0
.../modules/maven/htmlui/MavenUtilitiesTest.java | 0
.../modules/maven/htmlui/WizardDataTest.java | 0
nbbuild/cluster.properties | 4 +-
.../src/org/netbeans/IllegalModuleException.java | 111 +++++++++++++++++++++
.../src/org/netbeans/ModuleManager.java | 30 +++---
.../unit/src/org/netbeans/ModuleManagerTest.java | 8 ++
36 files changed, 265 insertions(+), 71 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