Merge pull request #6275 from apache/delivery

Sync delivery to release190 for 19-rc4

Author: neilcsmith-net

enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EnterpriseBeansImpl.java

@@ -44,6 +44,7 @@
 import org.netbeans.modules.j2ee.metadata.model.api.support.annotation.ObjectProvider;
 import org.netbeans.modules.j2ee.metadata.model.api.support.annotation.PersistentObjectManager;
 
+// @todo: Support JakartaEE
 public class EnterpriseBeansImpl implements EnterpriseBeans {
 
     private final AnnotationModelHelper helper;

enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/annotation/AnnotationHelpers.java

@@ -33,6 +33,7 @@
 /**
  * @author Petr Slechta
  */
+// @todo: Support JakartaEE
 public class AnnotationHelpers {
 
     private AnnotationModelHelper helper;

enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/SendJMSGenerator.java

@@ -79,6 +79,7 @@
  *
  * @author Martin Adamek
  */
+// @todo: Support JakartaEE
 public final class SendJMSGenerator {
 
     private static final Logger LOG = Logger.getLogger(SendJMSGenerator.class.getName());

enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EjbMethodController.java

@@ -72,7 +72,7 @@ public EjbType run(EjbJarMetadata metadata) throws Exception {
                 Project project = FileOwnerQuery.getOwner(ejbClassFO);
                 if (project != null){
                     J2eeProjectCapabilities projectCap = J2eeProjectCapabilities.forProject(project);
-                    allowsNoInterface = projectCap != null ? projectCap.isEjb31LiteSupported() : false;
+                    allowsNoInterface = (projectCap != null && (projectCap.isEjb31LiteSupported() || projectCap.isEjb40LiteSupported()));
                 }
 
                 controller = new SessionMethodController(className, model, allowsNoInterface);

enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/EjbFacadeVisualPanel2.java

@@ -381,8 +381,9 @@ private void inProjectComboActionPerformed(java.awt.event.ActionEvent evt) {//GE
     // End of variables declaration//GEN-END:variables
 
     private void updateCheckboxes() {
+        J2eeProjectCapabilities projectCap = J2eeProjectCapabilities.forProject(project);
         //by default for ejb 3.1 no interfaces will be created
-        localCheckBox.setSelected(!J2eeProjectCapabilities.forProject(project).isEjb31LiteSupported());
+        localCheckBox.setSelected(!(projectCap.isEjb31LiteSupported() || projectCap.isEjb40LiteSupported()));
         changeSupport.fireChange();
     }
 

enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/EjbFacadeWizardPanel2.java

@@ -90,7 +90,8 @@ public boolean isValid() {
             return false;
         }
         if (!(component.isRemote() || component.isLocal())) {
-            if(J2eeProjectCapabilities.forProject(project).isEjb31LiteSupported()) {
+            J2eeProjectCapabilities projectCap = J2eeProjectCapabilities.forProject(project);
+            if(projectCap.isEjb31LiteSupported() || projectCap.isEjb40LiteSupported()) {
                 //if it's jee6 project, ejb 3.1 allow to omit any interfaces
             } else {
                 wizardDescriptor.putProperty(WizardDescriptor.PROP_ERROR_MESSAGE, NbBundle.getMessage(EjbFacadeWizardPanel2.class, "ERR_ChooseInterface")); // NOI18N

enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MdbPropertiesPanelVisual.java

@@ -53,6 +53,7 @@
  *
  * @author Martin Fousek <marfous@netbeans.org>
  */
+// @todo: Support JakartaEE
 @SuppressWarnings("serial") // not used to be serialized
 public class MdbPropertiesPanelVisual extends javax.swing.JPanel {
 

enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MessageDestinationUiSupport.java

@@ -64,6 +64,7 @@
  * This class contains only static methods.
  * @author Tomas Mysik
  */
+// @todo: Support JakartaEE
 public abstract class MessageDestinationUiSupport {
 
     /**

enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/SessionEJBWizardDescriptor.java

@@ -79,7 +79,8 @@ public boolean isValid() {
         }
         boolean isLocal = wizardPanel.isLocal();
         boolean isRemote = wizardPanel.isRemote();
-        if (!isLocal && !isRemote && !J2eeProjectCapabilities.forProject(project).isEjb31LiteSupported()) {
+        J2eeProjectCapabilities projectCap = J2eeProjectCapabilities.forProject(project);
+        if (!isLocal && !isRemote && !projectCap.isEjb31LiteSupported() && !projectCap.isEjb40LiteSupported()) {
             wizardDescriptor.putProperty(WizardDescriptor.PROP_ERROR_MESSAGE, NbBundle.getMessage(SessionEJBWizardDescriptor.class,"ERR_RemoteOrLocal_MustBeSelected")); //NOI18N
             return false;
         }

enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/SessionEJBWizardPanel.java

@@ -476,15 +476,15 @@ public Project getRemoteInterfaceProject() {
     }
 
     private boolean isSingletonSupported(J2eeProjectCapabilities projectCap) {
-        return projectCap.isEjb31LiteSupported();
+        return projectCap.isEjb31LiteSupported() || projectCap.isEjb40LiteSupported();
     }
 
     private boolean isNoInterfaceViewSupported(J2eeProjectCapabilities projectCap) {
-        return projectCap.isEjb31LiteSupported();
+        return projectCap.isEjb31LiteSupported() || projectCap.isEjb40LiteSupported();
     }
 
     private boolean isTimerSupported(J2eeProjectCapabilities projectCap) {
-        return projectCap.isEjb31Supported() || projectCap.isEjb32LiteSupported();
+        return projectCap.isEjb31Supported() || projectCap.isEjb32LiteSupported() || projectCap.isEjb40LiteSupported();
     }
 
     private boolean isRemoteInterfaceSupported() {