Permalink
Browse files

Use project as root URI for workspace index generation

  • Loading branch information...
1 parent df9139f commit d28fcd5f311fcae53ced0f0b6d9f5428a3f1d73f @njbartlett njbartlett committed Jul 18, 2012
@@ -53,9 +53,14 @@ public void builtBundles(final IProject project, IPath[] paths) {
Set<File> files = new HashSet<File>();
for (IPath path : paths) {
- IFile ifile = wsroot.getFile(path);
- File file = ifile.getLocation().toFile();
- files.add(file);
+ try {
+ IFile ifile = wsroot.getFile(path);
+ File file = ifile.getLocation().toFile();
+ files.add(file);
+ } catch (IllegalArgumentException e) {
+ System.err.println("### Error processing path: " + path);
+ e.printStackTrace();
+ }
}
// Generate the index file
@@ -83,7 +88,7 @@ public void analyzeResource(Resource resource, List<Capability> capabilities, Li
Map<String,String> config = new HashMap<String,String>();
config.put(ResourceIndexer.REPOSITORY_NAME, project.getName());
- config.put(ResourceIndexer.ROOT_URL, workspaceRootUri.toString());
+ config.put(ResourceIndexer.ROOT_URL, project.getLocationURI().toString());
config.put(ResourceIndexer.PRETTY, "true");
output = new FileOutputStream(indexFile);
View
@@ -6,10 +6,10 @@ repo: ${workspace}/../repo
# - uncomment 'Local OBR'
--pluginpath: ${workspace}/cnf/plugins/biz.aQute.repository/biz.aQute.repository-2.0.0.jar
+-pluginpath: ${workspace}/cnf/plugins/biz.aQute.repository/biz.aQute.repository-2.0.2.jar
## Eclipse SDK 3.5.2
-eclipse-repo: aQute.lib.deployer.obr.OBR;locations='file:${workspace}/cnf/eclipse-3.5.2/repository.xml';name=Eclipse SDK 3.5.2
+eclipse-repo: aQute.bnd.deployer.repository.FixedIndexedRepo;locations='file:${workspace}/cnf/eclipse-3.5.2/repository.xml';name=Eclipse SDK 3.5.2
## Eclipse SDK 4.2RC4
#eclipse-repo: aQute.lib.deployer.obr.OBR;locations='https://s3.amazonaws.com/eclipse-obr-4.2RC4/repository.xml';name=Eclipse SDK 4.2RC4
@@ -22,8 +22,9 @@ eclipse-repo: aQute.lib.deployer.obr.OBR;locations='file:${workspace}/cnf/eclips
## Remote OBR
--plugin: aQute.lib.deployer.obr.OBR;locations=https://raw.github.com/bndtools/repo/master/jars/repository.xml;name=Bnd Build Repository,\
- aQute.lib.deployer.obr.OBR;locations=https://raw.github.com/bndtools/repo/master/bundles/repository.xml;name=Bnd Repository,\
+-plugin:\
+ aQute.bnd.deployer.repository.FixedIndexedRepo;locations=https://raw.github.com/bndtools/repo/master/jars/repository.xml;name=Bnd Build Repository,\
+ aQute.bnd.deployer.repository.FixedIndexedRepo;locations=https://raw.github.com/bndtools/repo/master/bundles/repository.xml;name=Bnd Repository,\
${eclipse-repo}
# Remote OBR / GIT plugin
Binary file not shown.

0 comments on commit d28fcd5

Please sign in to comment.