Attachment 134331 Details for Bug 274901 – patch

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

[patch] patch

274901.txt (text/plain), 4.17 KB, created by Andrew Niefer

on 2009-05-04 18:32:00 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Niefer

Created: 2009-05-04 18:32:00 EDT

Size: 4.17 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.build
>Index: src/org/eclipse/pde/internal/build/ProductGenerator.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ProductGenerator.java,v
>retrieving revision 1.34
>diff -u -r1.34 ProductGenerator.java
>--- src/org/eclipse/pde/internal/build/ProductGenerator.java	30 Apr 2009 17:50:41 -0000	1.34
>+++ src/org/eclipse/pde/internal/build/ProductGenerator.java	4 May 2009 22:32:23 -0000
>@@ -355,7 +355,7 @@
> 		buffer.append(info.getSymbolicName());
> 		if (info.getStartLevel() != BundleInfo.NO_LEVEL || info.isMarkedAsStarted())
> 			buffer.append('@');
>-		if (info.getStartLevel() != BundleInfo.NO_LEVEL) {
>+		if (info.getStartLevel() != BundleInfo.NO_LEVEL && info.getStartLevel() != 0) {
> 			buffer.append(info.getStartLevel());
> 			if (info.isMarkedAsStarted())
> 				buffer.append(':');
>Index: src/org/eclipse/pde/internal/build/site/P2Utils.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/P2Utils.java,v
>retrieving revision 1.5
>diff -u -r1.5 P2Utils.java
>--- src/org/eclipse/pde/internal/build/site/P2Utils.java	25 Feb 2009 00:03:28 -0000	1.5
>+++ src/org/eclipse/pde/internal/build/site/P2Utils.java	4 May 2009 22:32:23 -0000
>@@ -126,7 +126,10 @@
> 				if (userInfos != null && userInfos.size() > 0) {
> 					if (userInfos.containsKey(modelName)) {
> 						BundleInfo userInfo = (BundleInfo) userInfos.get(modelName);
>-						info.setStartLevel(userInfo.getStartLevel());
>+						int start = userInfo.getStartLevel();
>+						if (start == BundleInfo.NO_LEVEL || start == 0)
>+							start = defaultStartLevel;
>+						info.setStartLevel(start);
> 						info.setMarkedAsStarted(userInfo.isMarkedAsStarted());
> 					} else {
> 						info.setStartLevel(defaultStartLevel);
>#P org.eclipse.pde.build.tests
>Index: src/org/eclipse/pde/build/internal/tests/ProductTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ProductTests.java,v
>retrieving revision 1.19
>diff -u -r1.19 ProductTests.java
>--- src/org/eclipse/pde/build/internal/tests/ProductTests.java	22 Mar 2009 00:36:39 -0000	1.19
>+++ src/org/eclipse/pde/build/internal/tests/ProductTests.java	4 May 2009 22:32:23 -0000
>@@ -298,6 +298,9 @@
> 		buffer.append("   <plugins>                                                           \n");
> 		buffer.append("      <plugin id=\"A\" version=\"1.0.0.v1\"  />                        \n");
> 		buffer.append("   </plugins>                                                          \n");
>+		buffer.append("   <configurations>                                                    \n");
>+		buffer.append("     <plugin id=\"A\" autoStart=\"true\" startLevel=\"0\" />           \n"); //bug 274901
>+		buffer.append("   </configurations>                                                   \n");
> 		buffer.append("</product>                                                             \n");
> 		Utils.writeBuffer(product, buffer);
> 
>@@ -317,6 +320,7 @@
> 		runProductBuild(buildFolder);
> 
> 		assertResourceFile(buildFolder, "tmp/eclipse/plugins/A_1.0.0.v1.jar");
>+		assertLogContainsLine(buildFolder.getFile("tmp/eclipse/configuration/config.ini"), "osgi.bundles=A@start");
> 	}
> 
> 	public void testBug246060() throws Exception {
>@@ -399,7 +403,7 @@
> 		assertLogContainsLine(config, "osgi.bundles.defaultStartLevel=3");
> 		assertLogContainsLine(config, "osgi.bundles=org.eclipse.equinox.simpleconfigurator@1:start");
> 		assertLogContainsLine(info, "org.eclipse.core.runtime_" + versions.get("org.eclipse.core.runtime") + ",3,false" );
>-		assertLogContainsLine(info, "org.eclipse.equinox.app_" + versions.get("org.eclipse.equinox.app") + ",0,false" );
>+		assertLogContainsLine(info, "org.eclipse.equinox.app_" + versions.get("org.eclipse.equinox.app") + ",3,false" ); //bug 274901
> 		assertLogContainsLine(info, "org.eclipse.equinox.common_" + versions.get("org.eclipse.equinox.common") + ",1,true" );
> 	}
>

Actions: View | Diff

Attachments on bug 274901: 134331 | 134494