Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Niefer2010-01-05 21:24:59 +0000
committerAndrew Niefer2010-01-05 21:24:59 +0000
commitfbc58d1d74b14dd9839e0357c8124a1e6705d1dc (patch)
tree76b3df44f4289b7b6733c9e5529f08d6aa30700a
parentff8983b256ba40a021573413738f3354df5bd169 (diff)
downloadrt.equinox.p2-fbc58d1d74b14dd9839e0357c8124a1e6705d1dc.tar.gz
rt.equinox.p2-fbc58d1d74b14dd9839e0357c8124a1e6705d1dc.tar.xz
rt.equinox.p2-fbc58d1d74b14dd9839e0357c8124a1e6705d1dc.zip
bug 286338 - kind ignored for Source repositories using "location"
-rw-r--r--bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/AbstractRepositoryTask.java9
-rw-r--r--bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/RepositoryFileSet.java3
2 files changed, 5 insertions, 7 deletions
diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/AbstractRepositoryTask.java b/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/AbstractRepositoryTask.java
index a484aa28f..de98cd0b1 100644
--- a/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/AbstractRepositoryTask.java
+++ b/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/AbstractRepositoryTask.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
+ * Copyright (c) 2009, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -123,10 +123,11 @@ public abstract class AbstractRepositoryTask extends Task {
RepositoryFileSet fileset = (RepositoryFileSet) iter.next();
if (fileset.getRepoLocation() != null) {
- //TODO depreciate
if (!fileset.getRepoLocation().startsWith(ANT_PREFIX)) {
- addArtifactSourceRepository(fileset.getRepoLocationURI());
- addMetadataSourceRepository(fileset.getRepoLocationURI());
+ if (fileset.isArtifact())
+ addArtifactSourceRepository(fileset.getRepoLocationURI());
+ if (fileset.isMetadata())
+ addMetadataSourceRepository(fileset.getRepoLocationURI());
}
} else if (fileset.getDir() != null) {
DirectoryScanner scanner = fileset.getDirectoryScanner(getProject());
diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/RepositoryFileSet.java b/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/RepositoryFileSet.java
index 5a9eed2d9..79b16675c 100644
--- a/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/RepositoryFileSet.java
+++ b/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/RepositoryFileSet.java
@@ -47,17 +47,14 @@ public class RepositoryFileSet extends FileSet {
}
public void setLocation(String value) {
- // TODO depreciate
myLocation = value;
}
public String getRepoLocation() {
- // TODO depreciate
return myLocation;
}
public URI getRepoLocationURI() {
- // TODO depreciate
try {
return RepositoryHelper.localRepoURIHelper(URIUtil.fromString(getRepoLocation()));
} catch (URISyntaxException e) {

Back to the top