You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by lk...@apache.org on 2019/07/01 14:59:23 UTC
[netbeans] branch master updated: NP-20 Payara modules improvement
(#1334)
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 91c93f4 NP-20 Payara modules improvement (#1334)
91c93f4 is described below
commit 91c93f4b54f154a04fee5061042d37f37820f8f8
Author: Gaurav Gupta <ga...@gmail.com>
AuthorDate: Mon Jul 1 15:59:18 2019 +0100
NP-20 Payara modules improvement (#1334)
* NP-20 Payara Server JavaEE8 Profile API integration
* NP-20 Fix ergonomics warning for duplicate Payara folder properties
* NP-20 set payara modules version to 2.0
* NP-20 Fix ergonomics same position warning
* NP-20 No iterator for MultiFileObject fix
* NP-20 Payara Micro TemplateRegistration polish
---
enterprise/payara.common/manifest.mf | 2 +-
enterprise/payara.common/nbproject/project.xml | 2 +-
.../payara.eecommon/nbproject/project.properties | 2 +-
enterprise/payara.eecommon/nbproject/project.xml | 4 ++--
.../dd/loader/PayaraDescriptorDataObject.java | 4 ++--
enterprise/payara.jakartaee/manifest.mf | 2 +-
enterprise/payara.jakartaee/nbproject/project.xml | 6 +++---
.../payara/jakartaee/Hk2JavaEEPlatformImpl.java | 4 ++--
.../modules/payara/jakartaee/Hk2JaxWsStack.java | 4 +++-
enterprise/payara.micro/manifest.mf | 2 +-
.../netbeans/modules/fish/payara/micro/layer.xml | 2 --
.../micro/project/ui/BaseWizardIterator.java | 3 +++
.../project/ui/MicroProjectWizardIterator.java | 22 ++++++++++++++--------
enterprise/payara.tooling/manifest.mf | 2 +-
14 files changed, 35 insertions(+), 26 deletions(-)
diff --git a/enterprise/payara.common/manifest.mf b/enterprise/payara.common/manifest.mf
index f35cbc8..ccec8af 100644
--- a/enterprise/payara.common/manifest.mf
+++ b/enterprise/payara.common/manifest.mf
@@ -4,6 +4,6 @@ OpenIDE-Module: org.netbeans.modules.payara.common/0
OpenIDE-Module-Install: org/netbeans/modules/payara/common/Installer.class
OpenIDE-Module-Layer: org/netbeans/modules/payara/common/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/payara/common/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.0
+OpenIDE-Module-Specification-Version: 2.0
OpenIDE-Module-Provides: org.netbeans.modules.payara.common
diff --git a/enterprise/payara.common/nbproject/project.xml b/enterprise/payara.common/nbproject/project.xml
index 0f21d19..faeb21d 100644
--- a/enterprise/payara.common/nbproject/project.xml
+++ b/enterprise/payara.common/nbproject/project.xml
@@ -92,7 +92,7 @@
<compile-dependency/>
<run-dependency>
<release-version>0-1</release-version>
- <specification-version>1.0</specification-version>
+ <specification-version>2.0</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git a/enterprise/payara.eecommon/nbproject/project.properties b/enterprise/payara.eecommon/nbproject/project.properties
index 47a0578..55ec8ef 100644
--- a/enterprise/payara.eecommon/nbproject/project.properties
+++ b/enterprise/payara.eecommon/nbproject/project.properties
@@ -17,7 +17,7 @@
is.autoload=true
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.0
+spec.version.base=2.0
test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=\
diff --git a/enterprise/payara.eecommon/nbproject/project.xml b/enterprise/payara.eecommon/nbproject/project.xml
index 2614781..9d1ffe7 100644
--- a/enterprise/payara.eecommon/nbproject/project.xml
+++ b/enterprise/payara.eecommon/nbproject/project.xml
@@ -137,7 +137,7 @@
<compile-dependency/>
<run-dependency>
<release-version>0-1</release-version>
- <specification-version>1.0</specification-version>
+ <specification-version>2.0</specification-version>
</run-dependency>
</dependency>
<dependency>
@@ -146,7 +146,7 @@
<compile-dependency/>
<run-dependency>
<release-version>0-1</release-version>
- <specification-version>1.0</specification-version>
+ <specification-version>2.0</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git a/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/dd/loader/PayaraDescriptorDataObject.java b/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/dd/loader/PayaraDescriptorDataObject.java
index c0b1235..9a53d91 100644
--- a/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/dd/loader/PayaraDescriptorDataObject.java
+++ b/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/dd/loader/PayaraDescriptorDataObject.java
@@ -65,13 +65,13 @@ import org.xml.sax.SAXParseException;
@MIMEResolver.Registration(
displayName = "Bundle#PayaraResolver",
resource = "../../dd/resources/payara-dd-mime-resolver.xml",
- position = 300
+ position = 3500
)
@DataObject.Registration(
displayName = "Bundle#PayaraResolver",
mimeType = DD_MIME_TYPE,
iconBase = DD_ICON,
- position = 300
+ position = 3600
)
@ActionReferences({
@ActionReference(
diff --git a/enterprise/payara.jakartaee/manifest.mf b/enterprise/payara.jakartaee/manifest.mf
index 413c39b..8e72e43 100644
--- a/enterprise/payara.jakartaee/manifest.mf
+++ b/enterprise/payara.jakartaee/manifest.mf
@@ -4,5 +4,5 @@ OpenIDE-Module: org.netbeans.modules.payara.jakartaee/0
OpenIDE-Module-Layer: org/netbeans/modules/payara/jakartaee/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/payara/jakartaee/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.modules.serverplugins.javaee
-OpenIDE-Module-Specification-Version: 1.0
+OpenIDE-Module-Specification-Version: 2.0
diff --git a/enterprise/payara.jakartaee/nbproject/project.xml b/enterprise/payara.jakartaee/nbproject/project.xml
index a4135ba..0941f73 100644
--- a/enterprise/payara.jakartaee/nbproject/project.xml
+++ b/enterprise/payara.jakartaee/nbproject/project.xml
@@ -103,7 +103,7 @@
<compile-dependency/>
<run-dependency>
<release-version>0-1</release-version>
- <specification-version>1.0</specification-version>
+ <specification-version>2.0</specification-version>
</run-dependency>
</dependency>
<dependency>
@@ -112,7 +112,7 @@
<compile-dependency/>
<run-dependency>
<release-version>0</release-version>
- <specification-version>1.0</specification-version>
+ <specification-version>2.0</specification-version>
</run-dependency>
</dependency>
<dependency>
@@ -121,7 +121,7 @@
<compile-dependency/>
<run-dependency>
<release-version>0-1</release-version>
- <specification-version>1.0</specification-version>
+ <specification-version>2.0</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git a/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/Hk2JavaEEPlatformImpl.java b/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/Hk2JavaEEPlatformImpl.java
index d95c2ec..3e1c9bd 100644
--- a/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/Hk2JavaEEPlatformImpl.java
+++ b/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/Hk2JavaEEPlatformImpl.java
@@ -187,9 +187,9 @@ public class Hk2JavaEEPlatformImpl extends J2eePlatformImpl2 {
break;
case v1_7: profiles[index++] = Profile.JAVA_EE_7_FULL;
break;
- case v1_8_web: profiles[index++] = Profile.JAVA_EE_7_WEB;
+ case v1_8_web: profiles[index++] = Profile.JAVA_EE_8_WEB;
break;
- case v1_8: profiles[index++] = Profile.JAVA_EE_7_FULL;
+ case v1_8: profiles[index++] = Profile.JAVA_EE_8_FULL;
break;
}
} else {
diff --git a/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/Hk2JaxWsStack.java b/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/Hk2JaxWsStack.java
index 3c6f9bb..29af133 100644
--- a/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/Hk2JaxWsStack.java
+++ b/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/Hk2JaxWsStack.java
@@ -72,7 +72,9 @@ public class Hk2JaxWsStack implements WSStackImplementation<JaxWs> {
@Override
public WSStackVersion getVersion() {
Set<Profile> supportedProfiles = platform.getSupportedProfiles();
- if (supportedProfiles.contains(Profile.JAVA_EE_7_FULL)
+ if (supportedProfiles.contains(Profile.JAVA_EE_8_FULL)
+ || supportedProfiles.contains(Profile.JAVA_EE_8_WEB)
+ || supportedProfiles.contains(Profile.JAVA_EE_7_FULL)
|| supportedProfiles.contains(Profile.JAVA_EE_7_WEB)
|| supportedProfiles.contains(Profile.JAVA_EE_6_FULL)
|| supportedProfiles.contains(Profile.JAVA_EE_6_WEB)) {
diff --git a/enterprise/payara.micro/manifest.mf b/enterprise/payara.micro/manifest.mf
index eec011b..8829898 100644
--- a/enterprise/payara.micro/manifest.mf
+++ b/enterprise/payara.micro/manifest.mf
@@ -3,4 +3,4 @@ AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.payara.micro/0
OpenIDE-Module-Layer: org/netbeans/modules/fish/payara/micro/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/fish/payara/micro/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.0
\ No newline at end of file
+OpenIDE-Module-Specification-Version: 2.0
\ No newline at end of file
diff --git a/enterprise/payara.micro/src/org/netbeans/modules/fish/payara/micro/layer.xml b/enterprise/payara.micro/src/org/netbeans/modules/fish/payara/micro/layer.xml
index 5985dd9..7465bba 100644
--- a/enterprise/payara.micro/src/org/netbeans/modules/fish/payara/micro/layer.xml
+++ b/enterprise/payara.micro/src/org/netbeans/modules/fish/payara/micro/layer.xml
@@ -23,8 +23,6 @@
<filesystem>
<folder name="Templates">
<folder name="PayaraResources">
- <attr name="displayName" bundlevalue="org.netbeans.modules.fish.payara.micro.plugin.Bundle#Templates/PayaraResources"/>
- <attr name="position" intvalue="1750"/>
</folder>
</folder>
</filesystem>
diff --git a/enterprise/payara.micro/src/org/netbeans/modules/fish/payara/micro/project/ui/BaseWizardIterator.java b/enterprise/payara.micro/src/org/netbeans/modules/fish/payara/micro/project/ui/BaseWizardIterator.java
index 1c46176..9e8aa90 100644
--- a/enterprise/payara.micro/src/org/netbeans/modules/fish/payara/micro/project/ui/BaseWizardIterator.java
+++ b/enterprise/payara.micro/src/org/netbeans/modules/fish/payara/micro/project/ui/BaseWizardIterator.java
@@ -41,6 +41,9 @@ public abstract class BaseWizardIterator implements WizardDescriptor.BackgroundI
protected abstract WizardDescriptor.Panel[] createPanels(ValidationGroup validationGroup);
+ public BaseWizardIterator() {
+ }
+
@Override
public void initialize(WizardDescriptor descriptor) {
this.descriptor = descriptor;
diff --git a/enterprise/payara.micro/src/org/netbeans/modules/fish/payara/micro/project/ui/MicroProjectWizardIterator.java b/enterprise/payara.micro/src/org/netbeans/modules/fish/payara/micro/project/ui/MicroProjectWizardIterator.java
index d3f96f9..ac7351d 100644
--- a/enterprise/payara.micro/src/org/netbeans/modules/fish/payara/micro/project/ui/MicroProjectWizardIterator.java
+++ b/enterprise/payara.micro/src/org/netbeans/modules/fish/payara/micro/project/ui/MicroProjectWizardIterator.java
@@ -47,22 +47,28 @@ import org.netbeans.validation.api.ui.ValidationGroup;
import org.openide.WizardDescriptor;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
-import org.openide.util.NbBundle.Messages;
import static org.openide.util.NbBundle.getMessage;
/**
*
* @author Gaurav Gupta <ga...@payara.fish>
*/
-@TemplateRegistration(
- folder = ArchetypeWizards.TEMPLATE_FOLDER,
- position = 200,
- displayName = "#TTL_NewProjectWizard",
- iconBase = PROJECT_ICON,
- description = "../resources/PayaraMicroProjectDescription.html"
-)
public final class MicroProjectWizardIterator extends BaseWizardIterator {
+ public MicroProjectWizardIterator() {
+ }
+
+ @TemplateRegistration(
+ folder = ArchetypeWizards.TEMPLATE_FOLDER,
+ position = 550,
+ displayName = "#TTL_NewProjectWizard",
+ iconBase = PROJECT_ICON,
+ description = "../resources/PayaraMicroProjectDescription.html"
+ )
+ public static MicroProjectWizardIterator createWebAppIterator() {
+ return new MicroProjectWizardIterator();
+ }
+
@Override
public Set<FileObject> instantiate() throws IOException {
ProjectInfo projectInfo = new ProjectInfo(
diff --git a/enterprise/payara.tooling/manifest.mf b/enterprise/payara.tooling/manifest.mf
index fb66eaf..25cc24d 100644
--- a/enterprise/payara.tooling/manifest.mf
+++ b/enterprise/payara.tooling/manifest.mf
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.payara.tooling/0
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/payara/tooling/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.0
+OpenIDE-Module-Specification-Version: 2.0
---------------------------------------------------------------------
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