Attachment #160676 for bug #243582

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




	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);

		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);
			}
		}
	}

			buffer.append(':');
			buffer.append(module);

			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$

Lines 87-95 Link Here

(-)src/org/eclipse/pde/build/internal/tests/FetchTests.java (-3 / +3 lines)
87	IFile sourceRefsFile = buildFolder.getFile(IPDEBuildConstants.DEFAULT_SOURCE_REFERENCES_FILENAME_DESCRIPTOR);	87	IFile sourceRefsFile = buildFolder.getFile(IPDEBuildConstants.DEFAULT_SOURCE_REFERENCES_FILENAME_DESCRIPTOR);
88	assertResourceFile(sourceRefsFile);	88	assertResourceFile(sourceRefsFile);
89	Properties sourceRefs = Utils.loadProperties(sourceRefsFile);	89	Properties sourceRefs = Utils.loadProperties(sourceRefsFile);
90	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\"");	90	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");
91	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\"");	91	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");
92	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\"");	92	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");
93	}	93	}
94		94
95	public void testBug248767_2() throws Exception {	95	public void testBug248767_2() throws Exception {

Return to bug 243582

Lines 59-67 Link Here

(-)src/org/eclipse/pde/internal/build/fetch/CVSFetchTaskFactory.java (-6 / +6 lines)
59	private static final String PROP_FILETOCHECK = "fileToCheck"; //$NON-NLS-1$	59	private static final String PROP_FILETOCHECK = "fileToCheck"; //$NON-NLS-1$
60	private static final String PROP_ELEMENTNAME = "elementName"; //$NON-NLS-1$	60	private static final String PROP_ELEMENTNAME = "elementName"; //$NON-NLS-1$
61		61
62	//Associated repository provider
63	private static final String CVS_DIRECTIVES = ";type:=psf;provider:=\"org.eclipse.team.cvs.core.cvsnature\""; //$NON-NLS-1$
64
65	private void generateAuthentificationAntTask(Map entryInfos, IAntScript script) {	62	private void generateAuthentificationAntTask(Map entryInfos, IAntScript script) {
66	String password = (String) entryInfos.get(KEY_PASSWORD);	63	String password = (String) entryInfos.get(KEY_PASSWORD);
67	String cvsPassFileLocation = (String) entryInfos.get(KEY_CVSPASSFILE);	64	String cvsPassFileLocation = (String) entryInfos.get(KEY_CVSPASSFILE);
Lines 213-219 Link Here
213	if (repoLocation != null && projectName != null) {	210	if (repoLocation != null && projectName != null) {
214	String sourceURLs = asReference(repoLocation, module != null ? module : projectName, projectName, tag);	211	String sourceURLs = asReference(repoLocation, module != null ? module : projectName, projectName, tag);
215	if (sourceURLs != null) {	212	if (sourceURLs != null) {
216	entryInfos.put(Constants.KEY_SOURCE_REFERENCES, sourceURLs + CVS_DIRECTIVES);	213	entryInfos.put(Constants.KEY_SOURCE_REFERENCES, sourceURLs);
217	}	214	}
218	}	215	}
219	}	216	}
Lines 249-256 Link Here
249	buffer.append(':');	246	buffer.append(':');
250	buffer.append(module);	247	buffer.append(module);
251		248
252	buffer.append(";project="); //$NON-NLS-1$	249	Path modulePath = new Path(module);
253	buffer.append(projectName);	250	if (!modulePath.lastSegment().equals(projectName)) {
		251	buffer.append(";project="); //$NON-NLS-1$
		252	buffer.append(projectName);
		253	}
254		254
255	if (tagName != null) {	255	if (tagName != null) {
256	buffer.append(";tag="); //$NON-NLS-1$	256	buffer.append(";tag="); //$NON-NLS-1$