Attachment #96963 for bug #178970

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 178970
Collapse All | Expand All

Lines 128-133 Link Here

(-)a/j2ee.common/src/org/netbeans/modules/j2ee/common/J2eeProjectCapabilities.java (+5 lines)
128	&& platform.isToolSupported("defaultPersistenceProviderJavaEE5"); // NOI18N	128	&& platform.isToolSupported("defaultPersistenceProviderJavaEE5"); // NOI18N
129	}	129	}
130		130
		131	public boolean isServerInstanceSet() {
		132	return getPlatform() != null;
		133	}
		134
		135
131	private J2eePlatform getPlatform() {	136	private J2eePlatform getPlatform() {
132	try {	137	try {
133	String instance = provider.getServerInstanceID();	138	String instance = provider.getServerInstanceID();

Lines 41-46 Link Here

(-)a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarJPAModuleInfo.java (+7 lines)
41		41
42	package org.netbeans.modules.j2ee.ejbjarproject;	42	package org.netbeans.modules.j2ee.ejbjarproject;
43		43
		44	import org.netbeans.modules.j2ee.common.J2eeProjectCapabilities;
44	import org.netbeans.modules.j2ee.persistence.spi.moduleinfo.JPAModuleInfo;	45	import org.netbeans.modules.j2ee.persistence.spi.moduleinfo.JPAModuleInfo;
45		46
46	/**	47	/**
Lines 64-67 Link Here
64	return project.getEjbModule().getModuleVersion();	65	return project.getEjbModule().getModuleVersion();
65	}	66	}
66		67
		68	@Override
		69	public boolean isServerInstanceSet() {
		70	return J2eeProjectCapabilities.forProject(project).isServerInstanceSet();
		71	}
		72
		73
67	}	74	}

Lines 69-73 Link Here

(-)a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/spi/moduleinfo/JPAModuleInfo.java (+2 lines)
69	* @return the version number of the module.	69	* @return the version number of the module.
70	*/	70	*/
71	String getVersion();	71	String getVersion();
		72
		73	boolean isServerInstanceSet();
72		74
73	}	75	}




        return Util.isSupportedJavaEEVersion(project) && providerSupplier != null && providerSupplier.supportsDefaultProvider();
    }

    /** Returns true if the project represents a Java EE project (not Java SE), which does
     * not have a server instance set. This could be e.g. a Maven project without a server set,
     * or Ant project with broken server reference.
     */
    public static boolean isServerInstanceMissing(Project project) {
        JPAModuleInfo moduleInfo = project.getLookup().lookup(JPAModuleInfo.class);
        if (moduleInfo == null) {
            return false;
        }
        return !moduleInfo.isServerInstanceSet();
    }

    public static Provider getDefaultProvider(Project project) {
        PersistenceProviderSupplier providerSupplier = project.getLookup().lookup(PersistenceProviderSupplier.class);
        return (providerSupplier != null && providerSupplier.supportsDefaultProvider()) ? providerSupplier.getSupportedProviders().get(0) : null;

Lines 61-66 Link Here

(-)a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/unit/PersistenceUnitWizardPanelJdbc.java (+6 lines)
61	import org.netbeans.modules.j2ee.persistence.provider.ProviderUtil;	61	import org.netbeans.modules.j2ee.persistence.provider.ProviderUtil;
62	import org.netbeans.modules.j2ee.persistence.util.PersistenceProviderComboboxHelper;	62	import org.netbeans.modules.j2ee.persistence.util.PersistenceProviderComboboxHelper;
63	import org.netbeans.modules.j2ee.persistence.util.SourceLevelChecker;	63	import org.netbeans.modules.j2ee.persistence.util.SourceLevelChecker;
		64	import org.netbeans.modules.j2ee.persistence.wizard.Util;
64	import org.netbeans.modules.j2ee.persistence.wizard.unit.PersistenceUnitWizardPanel.TableGeneration;	65	import org.netbeans.modules.j2ee.persistence.wizard.unit.PersistenceUnitWizardPanel.TableGeneration;
65	import org.openide.util.ImageUtilities;	66	import org.openide.util.ImageUtilities;
66	import org.openide.util.NbBundle;	67	import org.openide.util.NbBundle;
Lines 210-215 Link Here
210	}	211	}
211	}	212	}
212	}	213	}
		214	if (warning == null) {
		215	if (Util.isServerInstanceMissing(project)) {
		216	warning = "You should set the server!";
		217	}
		218	}
213	ImageIcon icon = null;	219	ImageIcon icon = null;
214	if(warning != null){	220	if(warning != null){
215	icon = ImageUtilities.loadImageIcon("org/netbeans/modules/j2ee/persistence/ui/resources/warning.gif", false); //NOI18N	221	icon = ImageUtilities.loadImageIcon("org/netbeans/modules/j2ee/persistence/ui/resources/warning.gif", false); //NOI18N

Lines 47-54 Link Here

(-)a/maven.j2ee/src/org/netbeans/modules/maven/j2ee/JPAStuffImpl.java (+18 lines)
47	import org.netbeans.modules.maven.j2ee.ejb.*;	47	import org.netbeans.modules.maven.j2ee.ejb.*;
48	import org.netbeans.api.project.Project;	48	import org.netbeans.api.project.Project;
49	import org.netbeans.modules.j2ee.common.DatasourceUIHelper;	49	import org.netbeans.modules.j2ee.common.DatasourceUIHelper;
		50	import org.netbeans.modules.j2ee.common.J2eeProjectCapabilities;
50	import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;	51	import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
51	import org.netbeans.modules.j2ee.deployment.common.api.Datasource;	52	import org.netbeans.modules.j2ee.deployment.common.api.Datasource;
		53	import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment;
		54	import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException;
52	import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;	55	import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
53	import org.netbeans.modules.j2ee.persistence.spi.datasource.JPADataSource;	56	import org.netbeans.modules.j2ee.persistence.spi.datasource.JPADataSource;
54	import org.netbeans.modules.j2ee.persistence.spi.datasource.JPADataSourcePopulator;	57	import org.netbeans.modules.j2ee.persistence.spi.datasource.JPADataSourcePopulator;
Lines 130-135 Link Here
130	return null;	133	return null;
131	}	134	}
132		135
		136	@Override
		137	public boolean isServerInstanceSet() {
		138	return J2eeProjectCapabilities.forProject(project).isServerInstanceSet();
		139	// J2eeModuleProvider; prvd = project.getLookup().lookup(J2eeModuleProvider.class);
		140	// if (prvd == null) {
		141	// return false;
		142	// }
		143	// try {
		144	// return Deployment.getDefault().
		145	// getServerInstance(prvd.getServerInstanceID()).getJ2eePlatform() != null;
		146	// } catch (InstanceRemovedException e) {
		147	// return false;
		148	// }
		149	}
		150
133		151
134	/**	152	/**
135	* Provides <code>JPADataSource</code> interface for <code>Datasource</code>s.	153	* Provides <code>JPADataSource</code> interface for <code>Datasource</code>s.

Lines 41-46 Link Here

(-)a/web.project/src/org/netbeans/modules/web/project/WebJPAModuleInfo.java (+7 lines)
41		41
42	package org.netbeans.modules.web.project;	42	package org.netbeans.modules.web.project;
43		43
		44	import org.netbeans.modules.j2ee.common.J2eeProjectCapabilities;
44	import org.netbeans.modules.j2ee.persistence.spi.moduleinfo.JPAModuleInfo;	45	import org.netbeans.modules.j2ee.persistence.spi.moduleinfo.JPAModuleInfo;
45	import org.netbeans.modules.j2ee.persistence.spi.moduleinfo.JPAModuleInfo.ModuleType;	46	import org.netbeans.modules.j2ee.persistence.spi.moduleinfo.JPAModuleInfo.ModuleType;
46		47
Lines 67-70 Link Here
67	return project.getWebModule().getModuleVersion();	68	return project.getWebModule().getModuleVersion();
68	}	69	}
69		70
		71	@Override
		72	public boolean isServerInstanceSet() {
		73	return J2eeProjectCapabilities.forProject(project).isServerInstanceSet();
		74	}
		75
		76
70	}	77	}

Return to bug 178970

Lines 226-231 Link Here

(-)a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/Util.java (+12 lines)
226	return Util.isSupportedJavaEEVersion(project) && providerSupplier != null && providerSupplier.supportsDefaultProvider();	226	return Util.isSupportedJavaEEVersion(project) && providerSupplier != null && providerSupplier.supportsDefaultProvider();
227	}	227	}
228		228
		229	/** Returns true if the project represents a Java EE project (not Java SE), which does
		230	* not have a server instance set. This could be e.g. a Maven project without a server set,
		231	* or Ant project with broken server reference.
		232	*/
		233	public static boolean isServerInstanceMissing(Project project) {
		234	JPAModuleInfo moduleInfo = project.getLookup().lookup(JPAModuleInfo.class);
		235	if (moduleInfo == null) {
		236	return false;
		237	}
		238	return !moduleInfo.isServerInstanceSet();
		239	}
		240
229	public static Provider getDefaultProvider(Project project) {	241	public static Provider getDefaultProvider(Project project) {
230	PersistenceProviderSupplier providerSupplier = project.getLookup().lookup(PersistenceProviderSupplier.class);	242	PersistenceProviderSupplier providerSupplier = project.getLookup().lookup(PersistenceProviderSupplier.class);
231	return (providerSupplier != null && providerSupplier.supportsDefaultProvider()) ? providerSupplier.getSupportedProviders().get(0) : null;	243	return (providerSupplier != null && providerSupplier.supportsDefaultProvider()) ? providerSupplier.getSupportedProviders().get(0) : null;