Attachment #129176 for bug #223442

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 223442
Collapse All | Expand All




import org.netbeans.api.annotations.common.CheckForNull;
import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.api.project.Project;
import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment;
import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException;
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform;
import org.netbeans.api.j2ee.core.Profile;
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
import org.netbeans.modules.j2ee.deployment.devmodules.api.ServerInstance;
import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
import org.netbeans.modules.javaee.specs.support.api.EjbSupport;
import org.netbeans.modules.javaee.specs.support.api.JpaSupport;

    private final J2eeModuleProvider provider;
    private final Profile ejbJarProfile;
    private final Profile webProfile;
    private final Set<Profile> serverProfiles;

    private J2eeProjectCapabilities(Project project, J2eeModuleProvider provider, Set<Profile> serverProfiles,
            Profile ejbJarProfile, Profile webProfile) {
        this.project = project;
        this.provider = provider;
        this.serverProfiles = serverProfiles;
        this.ejbJarProfile = ejbJarProfile;
        this.webProfile = webProfile;
    }

        if (provider == null) {
            return null;
        }
        J2eePlatform platform = Util.getPlatform(project);
        if (platform == null) {
            return null;
        }
        Profile ejbJarProfile = null;
        Profile webProfile = null;
        if (provider.getJ2eeModule().getType() == J2eeModule.Type.EJB ||

                }
            }
        }
        return new J2eeProjectCapabilities(project, provider, platform.getSupportedProfiles(),
                ejbJarProfile, webProfile);
    }

    /**

        J2eeModule.Type moduleType = provider.getJ2eeModule().getType();
        boolean eeOk = ejbJarProfile != null && (ejbJarProfile.equals(Profile.JAVA_EE_5) ||
                ejbJarProfile.equals(Profile.JAVA_EE_6_FULL));
        boolean serverOk = serverProfiles.contains(Profile.JAVA_EE_5) ||
                serverProfiles.contains(Profile.JAVA_EE_6_FULL) ||
                serverProfiles.contains(Profile.JAVA_EE_7_FULL);
        return J2eeModule.Type.EJB.equals(moduleType) && eeOk && serverOk;
    }

    /**

    public boolean isEjb31Supported() {
        J2eeModule.Type moduleType = provider.getJ2eeModule().getType();
        boolean ee6or7 = ejbJarProfile != null && (ejbJarProfile.equals(Profile.JAVA_EE_6_FULL) || ejbJarProfile.equals(Profile.JAVA_EE_7_FULL));
        boolean serverOk = serverProfiles.contains(Profile.JAVA_EE_6_FULL) ||
                serverProfiles.contains(Profile.JAVA_EE_7_FULL);
        return serverOk && ee6or7 && (J2eeModule.Type.EJB.equals(moduleType) ||
                J2eeModule.Type.WAR.equals(moduleType));
    }


    public boolean isEjb31LiteSupported() {
        J2eeModule.Type moduleType = provider.getJ2eeModule().getType();
        boolean ee6or7Web = ejbJarProfile != null && (ejbJarProfile.equals(Profile.JAVA_EE_6_WEB) || ejbJarProfile.equals(Profile.JAVA_EE_7_WEB));
        boolean serverOk = serverProfiles.contains(Profile.JAVA_EE_6_WEB) ||
                serverProfiles.contains(Profile.JAVA_EE_7_WEB);
        return isEjb31Supported() || (J2eeModule.Type.WAR.equals(moduleType) && ee6or7Web && serverOk);
    }

    /**

Return to bug 223442

Lines 46-58 Link Here

(-)a/j2ee.common/src/org/netbeans/modules/j2ee/common/J2eeProjectCapabilities.java (-8 / +19 lines)
46	import org.netbeans.api.annotations.common.CheckForNull;	46	import org.netbeans.api.annotations.common.CheckForNull;
47	import org.netbeans.api.annotations.common.NonNull;	47	import org.netbeans.api.annotations.common.NonNull;
48	import org.netbeans.api.project.Project;	48	import org.netbeans.api.project.Project;
49	import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment;
50	import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException;
51	import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;	49	import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
52	import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform;	50	import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform;
53	import org.netbeans.api.j2ee.core.Profile;	51	import org.netbeans.api.j2ee.core.Profile;
54	import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;	52	import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
55	import org.netbeans.modules.j2ee.deployment.devmodules.api.ServerInstance;
56	import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;	53	import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
57	import org.netbeans.modules.javaee.specs.support.api.EjbSupport;	54	import org.netbeans.modules.javaee.specs.support.api.EjbSupport;
58	import org.netbeans.modules.javaee.specs.support.api.JpaSupport;	55	import org.netbeans.modules.javaee.specs.support.api.JpaSupport;
Lines 70-80 Link Here
70	private final J2eeModuleProvider provider;	67	private final J2eeModuleProvider provider;
71	private final Profile ejbJarProfile;	68	private final Profile ejbJarProfile;
72	private final Profile webProfile;	69	private final Profile webProfile;
		70	private final Set<Profile> serverProfiles;
73		71
74	private J2eeProjectCapabilities(Project project, J2eeModuleProvider provider,	72	private J2eeProjectCapabilities(Project project, J2eeModuleProvider provider, Set<Profile> serverProfiles,
75	Profile ejbJarProfile, Profile webProfile) {	73	Profile ejbJarProfile, Profile webProfile) {
76	this.project = project;	74	this.project = project;
77	this.provider = provider;	75	this.provider = provider;
		76	this.serverProfiles = serverProfiles;
78	this.ejbJarProfile = ejbJarProfile;	77	this.ejbJarProfile = ejbJarProfile;
79	this.webProfile = webProfile;	78	this.webProfile = webProfile;
80	}	79	}
Lines 85-90 Link Here
85	if (provider == null) {	84	if (provider == null) {
86	return null;	85	return null;
87	}	86	}
		87	J2eePlatform platform = Util.getPlatform(project);
		88	if (platform == null) {
		89	return null;
		90	}
88	Profile ejbJarProfile = null;	91	Profile ejbJarProfile = null;
89	Profile webProfile = null;	92	Profile webProfile = null;
90	if (provider.getJ2eeModule().getType() == J2eeModule.Type.EJB \|\|	93	if (provider.getJ2eeModule().getType() == J2eeModule.Type.EJB \|\|
Lines 101-107 Link Here
101	}	104	}
102	}	105	}
103	}	106	}
104	return new J2eeProjectCapabilities(project, provider, ejbJarProfile, webProfile);	107	return new J2eeProjectCapabilities(project, provider, platform.getSupportedProfiles(),
		108	ejbJarProfile, webProfile);
105	}	109	}
106		110
107	/**	111	/**
Lines 112-118 Link Here
112	J2eeModule.Type moduleType = provider.getJ2eeModule().getType();	116	J2eeModule.Type moduleType = provider.getJ2eeModule().getType();
113	boolean eeOk = ejbJarProfile != null && (ejbJarProfile.equals(Profile.JAVA_EE_5) \|\|	117	boolean eeOk = ejbJarProfile != null && (ejbJarProfile.equals(Profile.JAVA_EE_5) \|\|
114	ejbJarProfile.equals(Profile.JAVA_EE_6_FULL));	118	ejbJarProfile.equals(Profile.JAVA_EE_6_FULL));
115	return J2eeModule.Type.EJB.equals(moduleType) && eeOk;	119	boolean serverOk = serverProfiles.contains(Profile.JAVA_EE_5) \|\|
		120	serverProfiles.contains(Profile.JAVA_EE_6_FULL) \|\|
		121	serverProfiles.contains(Profile.JAVA_EE_7_FULL);
		122	return J2eeModule.Type.EJB.equals(moduleType) && eeOk && serverOk;
116	}	123	}
117		124
118	/**	125	/**
Lines 122-128 Link Here
122	public boolean isEjb31Supported() {	129	public boolean isEjb31Supported() {
123	J2eeModule.Type moduleType = provider.getJ2eeModule().getType();	130	J2eeModule.Type moduleType = provider.getJ2eeModule().getType();
124	boolean ee6or7 = ejbJarProfile != null && (ejbJarProfile.equals(Profile.JAVA_EE_6_FULL) \|\| ejbJarProfile.equals(Profile.JAVA_EE_7_FULL));	131	boolean ee6or7 = ejbJarProfile != null && (ejbJarProfile.equals(Profile.JAVA_EE_6_FULL) \|\| ejbJarProfile.equals(Profile.JAVA_EE_7_FULL));
125	return ee6or7 && (J2eeModule.Type.EJB.equals(moduleType) \|\|	132	boolean serverOk = serverProfiles.contains(Profile.JAVA_EE_6_FULL) \|\|
		133	serverProfiles.contains(Profile.JAVA_EE_7_FULL);
		134	return serverOk && ee6or7 && (J2eeModule.Type.EJB.equals(moduleType) \|\|
126	J2eeModule.Type.WAR.equals(moduleType));	135	J2eeModule.Type.WAR.equals(moduleType));
127	}	136	}
128		137
Lines 133-139 Link Here
133	public boolean isEjb31LiteSupported() {	142	public boolean isEjb31LiteSupported() {
134	J2eeModule.Type moduleType = provider.getJ2eeModule().getType();	143	J2eeModule.Type moduleType = provider.getJ2eeModule().getType();
135	boolean ee6or7Web = ejbJarProfile != null && (ejbJarProfile.equals(Profile.JAVA_EE_6_WEB) \|\| ejbJarProfile.equals(Profile.JAVA_EE_7_WEB));	144	boolean ee6or7Web = ejbJarProfile != null && (ejbJarProfile.equals(Profile.JAVA_EE_6_WEB) \|\| ejbJarProfile.equals(Profile.JAVA_EE_7_WEB));
136	return isEjb31Supported() \|\| (J2eeModule.Type.WAR.equals(moduleType) && ee6or7Web);	145	boolean serverOk = serverProfiles.contains(Profile.JAVA_EE_6_WEB) \|\|
		146	serverProfiles.contains(Profile.JAVA_EE_7_WEB);
		147	return isEjb31Supported() \|\| (J2eeModule.Type.WAR.equals(moduleType) && ee6or7Web && serverOk);
137	}	148	}
138		149
139	/**	150	/**