Attachment 160676 Details for Bug 243582 – patch

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

[patch] patch

directives-2.patch (text/plain), 3.98 KB, created by Darin Wright

on 2010-03-02 15:03:30 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Darin Wright

Created: 2010-03-02 15:03:30 EST

Size: 3.98 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.build
>Index: src/org/eclipse/pde/internal/build/fetch/CVSFetchTaskFactory.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/fetch/CVSFetchTaskFactory.java,v
>retrieving revision 1.15
>diff -u -r1.15 CVSFetchTaskFactory.java
>--- src/org/eclipse/pde/internal/build/fetch/CVSFetchTaskFactory.java	1 Mar 2010 23:10:40 -0000	1.15
>+++ src/org/eclipse/pde/internal/build/fetch/CVSFetchTaskFactory.java	2 Mar 2010 20:02:55 -0000
>@@ -59,9 +59,6 @@
> 	private static final String PROP_FILETOCHECK = "fileToCheck"; //$NON-NLS-1$
> 	private static final String PROP_ELEMENTNAME = "elementName"; //$NON-NLS-1$
> 
>-	//Associated repository provider
>-	private static final String CVS_DIRECTIVES = ";type:=psf;provider:=\"org.eclipse.team.cvs.core.cvsnature\""; //$NON-NLS-1$
>-
> 	private void generateAuthentificationAntTask(Map entryInfos, IAntScript script) {
> 		String password = (String) entryInfos.get(KEY_PASSWORD);
> 		String cvsPassFileLocation = (String) entryInfos.get(KEY_CVSPASSFILE);
>@@ -213,7 +210,7 @@
> 		if (repoLocation != null && projectName != null) {
> 			String sourceURLs = asReference(repoLocation, module != null ? module : projectName, projectName, tag);
> 			if (sourceURLs != null) {
>-				entryInfos.put(Constants.KEY_SOURCE_REFERENCES, sourceURLs + CVS_DIRECTIVES);
>+				entryInfos.put(Constants.KEY_SOURCE_REFERENCES, sourceURLs);
> 			}
> 		}
> 	}
>@@ -249,8 +246,11 @@
> 			buffer.append(':');
> 			buffer.append(module);
> 
>-			buffer.append(";project="); //$NON-NLS-1$
>-			buffer.append(projectName);
>+			Path modulePath = new Path(module);
>+			if (!modulePath.lastSegment().equals(projectName)) {
>+				buffer.append(";project="); //$NON-NLS-1$
>+				buffer.append(projectName);
>+			}
> 
> 			if (tagName != null) {
> 				buffer.append(";tag="); //$NON-NLS-1$
>#P org.eclipse.pde.build.tests
>Index: src/org/eclipse/pde/build/internal/tests/FetchTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/FetchTests.java,v
>retrieving revision 1.14
>diff -u -r1.14 FetchTests.java
>--- src/org/eclipse/pde/build/internal/tests/FetchTests.java	1 Mar 2010 23:10:40 -0000	1.14
>+++ src/org/eclipse/pde/build/internal/tests/FetchTests.java	2 Mar 2010 20:02:56 -0000
>@@ -87,9 +87,9 @@
> 		IFile sourceRefsFile = buildFolder.getFile(IPDEBuildConstants.DEFAULT_SOURCE_REFERENCES_FILENAME_DESCRIPTOR);
> 		assertResourceFile(sourceRefsFile);
> 		Properties sourceRefs = Utils.loadProperties(sourceRefsFile);
>-		assertEquals(sourceRefs.get("org.eclipse.cvs,0.0.0"), "scm:cvs:pserver:dev.eclipse.org:/cvsroot/eclipse:org.eclipse.sdk-feature/plugins/org.eclipse.cvs;project=org.eclipse.cvs;tag=v20090520;type:=psf;provider:=\"org.eclipse.team.cvs.core.cvsnature\"");
>-		assertEquals(sourceRefs.get("org.eclipse.team.cvs.core,0.0.0"), "scm:cvs:pserver:dev.eclipse.org:/cvsroot/eclipse:org.eclipse.team.cvs.core;project=org.eclipse.team.cvs.core;tag=I20090430-0408;type:=psf;provider:=\"org.eclipse.team.cvs.core.cvsnature\"");
>-		assertEquals(sourceRefs.get("org.eclipse.team.cvs.ssh2,0.0.0"), "scm:cvs:pserver:dev.eclipse.org:/cvsroot/eclipse:org.eclipse.team.cvs.ssh2;project=org.eclipse.team.cvs.ssh2;tag=I20090508-2000;type:=psf;provider:=\"org.eclipse.team.cvs.core.cvsnature\"");
>+		assertEquals(sourceRefs.get("org.eclipse.cvs,0.0.0"), "scm:cvs:pserver:dev.eclipse.org:/cvsroot/eclipse:org.eclipse.sdk-feature/plugins/org.eclipse.cvs;tag=v20090520");
>+		assertEquals(sourceRefs.get("org.eclipse.team.cvs.core,0.0.0"), "scm:cvs:pserver:dev.eclipse.org:/cvsroot/eclipse:org.eclipse.team.cvs.core;tag=I20090430-0408");
>+		assertEquals(sourceRefs.get("org.eclipse.team.cvs.ssh2,0.0.0"), "scm:cvs:pserver:dev.eclipse.org:/cvsroot/eclipse:org.eclipse.team.cvs.ssh2;tag=I20090508-2000");
> 	}
> 
> 	public void testBug248767_2() throws Exception {

Actions: View | Diff

Attachments on bug 243582: 158774 | 160008 | 160150 | 160528 | 160673 | 160676 | 160857