Attachment #111427 for bug #200049

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

Lines 163-169 Link Here

(-)a/glassfish.javaee/nbproject/project.xml (-1 / +1 lines)
163	<compile-dependency/>	163	<compile-dependency/>
164	<run-dependency>	164	<run-dependency>
165	<release-version>4</release-version>	165	<release-version>4</release-version>
166	<specification-version>1.74</specification-version>	166	<specification-version>1.86</specification-version>
167	</run-dependency>	167	</run-dependency>
168	</dependency>	168	</dependency>
169	<dependency>	169	<dependency>




                    InstanceProperties.removeInstance(url);
                }
            }
            //
//            final boolean needToRegisterDefaultServer =
//                    !NbPreferences.forModule(this.getClass()).getBoolean(ServerUtilities.PROP_FIRST_RUN, false);
//            if (needToRegisterDefaultServer) {
//                commonUtilities.getServerProvider();
//            }
        } catch (Exception ex) {
            throw new ServerInitializationException("failed to init default instance", ex);
        }




                    <attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.J2eePlatformFactory"/>
                </file>
                <file name="OptionalFactory.instance">
                    <attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.support.ProxyOptionalFactory.create"/>
                    <attr name="delegate" methodvalue="org.netbeans.modules.glassfish.javaee.Hk2OptionalFactory.createPrelude"/>
                    <attr name="noInitializationFinishWhenNoInstances" boolvalue="true"/>
                    <attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.OptionalDeploymentManagerFactory"/>
                </file>
                <file name="ModuleConfigFactory.instance">

                    <attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.J2eePlatformFactory"/>
                </file>
                <file name="OptionalFactory.instance">
                    <attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.support.ProxyOptionalFactory.create"/>
                    <attr name="delegate" methodvalue="org.netbeans.modules.glassfish.javaee.Hk2OptionalFactory.createEe6"/>
                    <attr name="noInitializationFinishWhenNoInstances" boolvalue="true"/>
                    <attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.OptionalDeploymentManagerFactory"/>
                </file>
                <file name="ModuleConfigFactory.instance">

Lines 199-209 Link Here

(-)a/ide.kit/test/qa-functional/data/whitelist_3.txt (-5 lines)
199	org.netbeans.modules.j2ee.persistenceapi.PersistenceScopeAccessor	199	org.netbeans.modules.j2ee.persistenceapi.PersistenceScopeAccessor
200	org.netbeans.modules.j2ee.persistenceapi.PersistenceScopesAccessor	200	org.netbeans.modules.j2ee.persistenceapi.PersistenceScopesAccessor
201		201
202	#IZ 200049
203	org.netbeans.modules.glassfish.common.wizards.GlassfishWizardProvider
204	org.netbeans.modules.glassfish.javaee.Hk2DeploymentFactory
205	org.netbeans.modules.glassfish.javaee.Hk2OptionalFactory
206	org.netbeans.modules.glassfish.spi.ServerUtilities
207	org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment	202	org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment
208	org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule	203	org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule
209	org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule$Type	204	org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule$Type




    <!-- ACTUAL CHANGES BEGIN HERE: -->

    <changes>
        <change id="noInitializationFinishWhenNoInstances">
	    <api name="support"/>
	    <summary>
                Added noInitializationFinishWhenNoInstances attribute of
                ProxyOptionalFactory.
	    </summary>
	    <version major="1" minor="86"/>
	    <date day="10" month="10" year="2011"/>
	    <author login="phejl"/>
	    <compatibility binary="compatible" source="compatible" semantic="compatible" addition="yes"/>
	    <description>
                <p>
                In ProxyOptionalFactory you can use the new attribute
                noInitializationFinishWhenNoInstances to suppress invocation
                of finishServerInitialization() when there are no instances
                in the server registry.
                </p>
                <p>
                Designed to be used from XML Layer.
                </p>
	    </description>
            <class package="org.netbeans.modules.j2ee.deployment.plugins.spi.support" name="ProxyOptionalFactory"/>
            <issue number="200049"/>
	 </change>
         
       <change id="nonPersistentServer">
    	    <api name="j2eeserver"/>
            <summary>

Lines 42-48 Link Here

(-)a/j2eeserver/nbproject/project.properties (-1 / +1 lines)
42		42
43	is.autoload=true	43	is.autoload=true
44	javac.source=1.6	44	javac.source=1.6
45	spec.version.base=1.85.0	45	spec.version.base=1.86.0
46		46
47	javadoc.arch=${basedir}/arch.xml	47	javadoc.arch=${basedir}/arch.xml
48	javadoc.apichanges=${basedir}/apichanges.xml	48	javadoc.apichanges=${basedir}/apichanges.xml

Lines 44-49 Link Here

(-)a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/spi/support/ProxyOptionalFactory.java (-1 / +9 lines)
44		44
45	import java.util.Map;	45	import java.util.Map;
46	import javax.enterprise.deploy.spi.DeploymentManager;	46	import javax.enterprise.deploy.spi.DeploymentManager;
		47	import org.netbeans.modules.j2ee.deployment.impl.ServerRegistry;
47	import org.netbeans.modules.j2ee.deployment.plugins.spi.AntDeploymentProvider;	48	import org.netbeans.modules.j2ee.deployment.plugins.spi.AntDeploymentProvider;
48	import org.netbeans.modules.j2ee.deployment.plugins.spi.DatasourceManager;	49	import org.netbeans.modules.j2ee.deployment.plugins.spi.DatasourceManager;
49	import org.netbeans.modules.j2ee.deployment.plugins.spi.FindJSPServlet;	50	import org.netbeans.modules.j2ee.deployment.plugins.spi.FindJSPServlet;
Lines 74-79 Link Here
74	private final Map attributes;	75	private final Map attributes;
75		76
76	private final boolean noInitializationFinish;	77	private final boolean noInitializationFinish;
		78
		79	private final boolean noInitializationFinishWhenNoInstances;
77		80
78	/* GuardedBy("this") */	81	/* GuardedBy("this") */
79	private OptionalDeploymentManagerFactory delegate;	82	private OptionalDeploymentManagerFactory delegate;
Lines 83-88 Link Here
83		86
84	this.noInitializationFinish = Boolean.TRUE.equals(	87	this.noInitializationFinish = Boolean.TRUE.equals(
85	attributes.get("noInitializationFinish")); // NOI18N	88	attributes.get("noInitializationFinish")); // NOI18N
		89	this.noInitializationFinishWhenNoInstances = Boolean.TRUE.equals(
		90	attributes.get("noInitializationFinishWhenNoInstances")); // NOI18N
86	}	91	}
87		92
88	public static ProxyOptionalFactory create(Map map) {	93	public static ProxyOptionalFactory create(Map map) {
Lines 147-153 Link Here
147	@Override	152	@Override
148	public void finishServerInitialization() throws ServerInitializationException {	153	public void finishServerInitialization() throws ServerInitializationException {
149	if (!noInitializationFinish) {	154	if (!noInitializationFinish) {
150	getDelegate().finishServerInitialization();	155	if (!noInitializationFinishWhenNoInstances
		156	\|\| !ServerRegistry.getInstance().getInstances().isEmpty()) {
		157	getDelegate().finishServerInitialization();
		158	}
151	}	159	}
152	}	160	}
153		161

Return to bug 200049

Lines 320-331 Link Here

(-)a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2OptionalFactory.java (-6 lines)
320	InstanceProperties.removeInstance(url);	320	InstanceProperties.removeInstance(url);
321	}	321	}
322	}	322	}
323	//
324	// final boolean needToRegisterDefaultServer =
325	// !NbPreferences.forModule(this.getClass()).getBoolean(ServerUtilities.PROP_FIRST_RUN, false);
326	// if (needToRegisterDefaultServer) {
327	// commonUtilities.getServerProvider();
328	// }
329	} catch (Exception ex) {	323	} catch (Exception ex) {
330	throw new ServerInitializationException("failed to init default instance", ex);	324	throw new ServerInitializationException("failed to init default instance", ex);
331	}	325	}

Lines 116-121 Link Here

(-)a/j2eeserver/apichanges.xml (+25 lines)
116	<!-- ACTUAL CHANGES BEGIN HERE: -->	116	<!-- ACTUAL CHANGES BEGIN HERE: -->
117		117
118	<changes>	118	<changes>
		119	<change id="noInitializationFinishWhenNoInstances">
		120	<api name="support"/>
		121	<summary>
		122	Added noInitializationFinishWhenNoInstances attribute of
		123	ProxyOptionalFactory.
		124	</summary>
		125	<version major="1" minor="86"/>
		126	<date day="10" month="10" year="2011"/>
		127	<author login="phejl"/>
		128	<compatibility binary="compatible" source="compatible" semantic="compatible" addition="yes"/>
		129	<description>
		130	<p>
		131	In ProxyOptionalFactory you can use the new attribute
		132	noInitializationFinishWhenNoInstances to suppress invocation
		133	of finishServerInitialization() when there are no instances
		134	in the server registry.
		135	</p>
		136	<p>
		137	Designed to be used from XML Layer.
		138	</p>
		139	</description>
		140	<class package="org.netbeans.modules.j2ee.deployment.plugins.spi.support" name="ProxyOptionalFactory"/>
		141	<issue number="200049"/>
		142	</change>
		143
119	<change id="nonPersistentServer">	144	<change id="nonPersistentServer">
120	<api name="j2eeserver"/>	145	<api name="j2eeserver"/>
121	<summary>	146	<summary>

Lines 37-44 Link Here

(-)a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/layer.xml (-4 / +6 lines)
37	<attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.J2eePlatformFactory"/>	37	<attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.J2eePlatformFactory"/>
38	</file>	38	</file>
39	<file name="OptionalFactory.instance">	39	<file name="OptionalFactory.instance">
40	<attr name="instanceCreate" methodvalue="org.netbeans.modules.glassfish.javaee.Hk2OptionalFactory.createPrelude"/>	40	<attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.support.ProxyOptionalFactory.create"/>
41	<attr name="instanceClass" stringvalue="org.netbeans.modules.glassfish.javaee.Hk2OptionalFactory"/>	41	<attr name="delegate" methodvalue="org.netbeans.modules.glassfish.javaee.Hk2OptionalFactory.createPrelude"/>
		42	<attr name="noInitializationFinishWhenNoInstances" boolvalue="true"/>
42	<attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.OptionalDeploymentManagerFactory"/>	43	<attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.OptionalDeploymentManagerFactory"/>
43	</file>	44	</file>
44	<file name="ModuleConfigFactory.instance">	45	<file name="ModuleConfigFactory.instance">
Lines 75-82 Link Here
75	<attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.J2eePlatformFactory"/>	76	<attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.J2eePlatformFactory"/>
76	</file>	77	</file>
77	<file name="OptionalFactory.instance">	78	<file name="OptionalFactory.instance">
78	<attr name="instanceCreate" methodvalue="org.netbeans.modules.glassfish.javaee.Hk2OptionalFactory.createEe6"/>	79	<attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.support.ProxyOptionalFactory.create"/>
79	<attr name="instanceClass" stringvalue="org.netbeans.modules.glassfish.javaee.Hk2OptionalFactory"/>	80	<attr name="delegate" methodvalue="org.netbeans.modules.glassfish.javaee.Hk2OptionalFactory.createEe6"/>
		81	<attr name="noInitializationFinishWhenNoInstances" boolvalue="true"/>
80	<attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.OptionalDeploymentManagerFactory"/>	82	<attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.OptionalDeploymentManagerFactory"/>
81	</file>	83	</file>
82	<file name="ModuleConfigFactory.instance">	84	<file name="ModuleConfigFactory.instance">