Attachment #134331 for bug #274901

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 355-361 Link Here

(-)src/org/eclipse/pde/internal/build/ProductGenerator.java (-1 / +1 lines)
355	buffer.append(info.getSymbolicName());	355	buffer.append(info.getSymbolicName());
356	if (info.getStartLevel() != BundleInfo.NO_LEVEL \|\| info.isMarkedAsStarted())	356	if (info.getStartLevel() != BundleInfo.NO_LEVEL \|\| info.isMarkedAsStarted())
357	buffer.append('@');	357	buffer.append('@');
358	if (info.getStartLevel() != BundleInfo.NO_LEVEL) {	358	if (info.getStartLevel() != BundleInfo.NO_LEVEL && info.getStartLevel() != 0) {
359	buffer.append(info.getStartLevel());	359	buffer.append(info.getStartLevel());
360	if (info.isMarkedAsStarted())	360	if (info.isMarkedAsStarted())
361	buffer.append(':');	361	buffer.append(':');

Lines 126-132 Link Here

(-)src/org/eclipse/pde/internal/build/site/P2Utils.java (-1 / +4 lines)
126	if (userInfos != null && userInfos.size() > 0) {	126	if (userInfos != null && userInfos.size() > 0) {
127	if (userInfos.containsKey(modelName)) {	127	if (userInfos.containsKey(modelName)) {
128	BundleInfo userInfo = (BundleInfo) userInfos.get(modelName);	128	BundleInfo userInfo = (BundleInfo) userInfos.get(modelName);
129	info.setStartLevel(userInfo.getStartLevel());	129	int start = userInfo.getStartLevel();
		130	if (start == BundleInfo.NO_LEVEL \|\| start == 0)
		131	start = defaultStartLevel;
		132	info.setStartLevel(start);
130	info.setMarkedAsStarted(userInfo.isMarkedAsStarted());	133	info.setMarkedAsStarted(userInfo.isMarkedAsStarted());
131	} else {	134	} else {
132	info.setStartLevel(defaultStartLevel);	135	info.setStartLevel(defaultStartLevel);

Return to bug 274901

Lines 298-303 Link Here

(-)src/org/eclipse/pde/build/internal/tests/ProductTests.java (-1 / +5 lines)
298	buffer.append(" <plugins> \n");	298	buffer.append(" <plugins> \n");
299	buffer.append(" <plugin id=\"A\" version=\"1.0.0.v1\" /> \n");	299	buffer.append(" <plugin id=\"A\" version=\"1.0.0.v1\" /> \n");
300	buffer.append(" </plugins> \n");	300	buffer.append(" </plugins> \n");
		301	buffer.append(" <configurations> \n");
		302	buffer.append(" <plugin id=\"A\" autoStart=\"true\" startLevel=\"0\" /> \n"); //bug 274901
		303	buffer.append(" </configurations> \n");
301	buffer.append("</product> \n");	304	buffer.append("</product> \n");
302	Utils.writeBuffer(product, buffer);	305	Utils.writeBuffer(product, buffer);
303		306
Lines 317-322 Link Here
317	runProductBuild(buildFolder);	320	runProductBuild(buildFolder);
318		321
319	assertResourceFile(buildFolder, "tmp/eclipse/plugins/A_1.0.0.v1.jar");	322	assertResourceFile(buildFolder, "tmp/eclipse/plugins/A_1.0.0.v1.jar");
		323	assertLogContainsLine(buildFolder.getFile("tmp/eclipse/configuration/config.ini"), "osgi.bundles=A@start");
320	}	324	}
321		325
322	public void testBug246060() throws Exception {	326	public void testBug246060() throws Exception {
Lines 399-405 Link Here
399	assertLogContainsLine(config, "osgi.bundles.defaultStartLevel=3");	403	assertLogContainsLine(config, "osgi.bundles.defaultStartLevel=3");
400	assertLogContainsLine(config, "osgi.bundles=org.eclipse.equinox.simpleconfigurator@1:start");	404	assertLogContainsLine(config, "osgi.bundles=org.eclipse.equinox.simpleconfigurator@1:start");
401	assertLogContainsLine(info, "org.eclipse.core.runtime_" + versions.get("org.eclipse.core.runtime") + ",3,false" );	405	assertLogContainsLine(info, "org.eclipse.core.runtime_" + versions.get("org.eclipse.core.runtime") + ",3,false" );
402	assertLogContainsLine(info, "org.eclipse.equinox.app_" + versions.get("org.eclipse.equinox.app") + ",0,false" );	406	assertLogContainsLine(info, "org.eclipse.equinox.app_" + versions.get("org.eclipse.equinox.app") + ",3,false" ); //bug 274901
403	assertLogContainsLine(info, "org.eclipse.equinox.common_" + versions.get("org.eclipse.equinox.common") + ",1,true" );	407	assertLogContainsLine(info, "org.eclipse.equinox.common_" + versions.get("org.eclipse.equinox.common") + ",1,true" );
404	}	408	}
405		409