buildr4osgi 0.9.0 → 0.9.2

data/spec/eclipse/feature_spec.rb

@@ -143,7 +143,7 @@ FEATURE
     foo.package(:feature).feature_xml = "feature.xml"
     
     foo.package(:feature).invoke
-    feature_file = File.join(foo.base_dir, "target", "foo-1.0.0-feature.jar")
+    feature_file = File.join(foo.base_dir, "target", "foo-1.0.0.zip")
     Zip::ZipFile.open(feature_file) do |zip|
       zip.find_entry("eclipse/features/foo_1.0.0/feature.xml").should_not be_nil
       zip.read("eclipse/features/foo_1.0.0/feature.xml").should == featurexml
@@ -164,7 +164,7 @@ PROPS
     foo.package(:feature).feature_xml = "feature.xml"
     foo.package(:feature).feature_properties = "feature.properties"
     foo.package(:feature).invoke
-    feature_file = File.join(foo.base_dir, "target", "foo-1.0.0-feature.jar")
+    feature_file = File.join(foo.base_dir, "target", "foo-1.0.0.zip")
     Zip::ZipFile.open(feature_file) do |zip|
       zip.find_entry("eclipse/features/foo_1.0.0/feature.xml").should_not be_nil
       zip.read("eclipse/features/foo_1.0.0/feature.xml").should == featurexml
@@ -190,7 +190,7 @@ PROPS
     f.license = "The license is too long to explain"
     f.licenseURL = "http://example.com/license"
     foo.package(:feature).invoke
-    feature_file = File.join(foo.base_dir, "target", "foo-1.0.0-feature.jar")
+    feature_file = File.join(foo.base_dir, "target", "foo-1.0.0.zip")
     Zip::ZipFile.open(feature_file) do |zip|
       zip.find_entry("eclipse/features/foo_1.0.0/feature.xml").should_not be_nil
       feature_xml = zip.read("eclipse/features/foo_1.0.0/feature.xml")
@@ -222,7 +222,7 @@ describe Buildr4OSGi::FeatureTask, " when running" do
   
   it "should create a jar file with a eclipse/plugins and a eclipse/features structure" do
     @foo.package(:feature).invoke
-    feature_file = File.join(@foo.base_dir, "target", "foo-1.0.0-feature.jar")
+    feature_file = File.join(@foo.base_dir, "target", "foo-1.0.0.zip")
     File.exists?(feature_file).should be_true
     Zip::ZipFile.open(feature_file) do |zip|
       zip.find_entry("eclipse/features/foo_1.0.0/feature.xml").should_not be_nil
@@ -232,7 +232,7 @@ describe Buildr4OSGi::FeatureTask, " when running" do
   end
   
   it 'should complain if one of the dependencies is not a plugin' do
-    @foo.package(:feature).plugins << SLF4J
+    @foo.package(:feature).plugins << LOG4J
     lambda { @foo.package(:feature).invoke}.should raise_error(
     /The dependency .* is not an Eclipse plugin: make sure the headers Bundle-SymbolicName and Bundle-Version are present in the manifest/)
   end
@@ -259,9 +259,11 @@ end
 describe Buildr4OSGi::FeatureTask, " package subprojects" do
   
   before do
+    Buildr::write "bar/src/main/java/Hello.java", "public class Hello {}"
     @container = define("container") do
       @bar = define("bar", :version => "1.0.0") do
-        package(:jar).with :manifest => {"Bundle-SymbolicName" => "bar", "Bundle-Version" => "1.0.0"}
+        package(:bundle)
+        package(:sources)
       end
     end
     @foo = define("foo", :version => "1.0.0")
@@ -288,6 +290,101 @@ describe Buildr4OSGi::FeatureTask, " package subprojects" do
       zip.find_entry("eclipse/features/foo_1.0.0/feature.properties").should_not be_nil
       zip.find_entry("eclipse/plugins/bar_1.0.0.jar").should_not be_nil
       zip.find_entry("eclipse/plugins/bar_1.0.0.jar").directory?.should be_false
+
+    end
+  end
+  
+  
+end
+
+
+describe Buildr4OSGi::FeatureTask, "packaged as SDK" do
+  
+  before do
+    Buildr::write "bar/src/main/java/Hello.java", "public class Hello {}"
+    @container = define("container") do
+      project.group = "grp"
+      @bar = define("bar", :version => "1.0.0") do
+        package(:bundle)
+        package(:sources)
+      end
+    end
+    @foo = define("foo", :version => "1.0.0") do
+      
+      f = package(:feature)
+      f.plugins.<< project("container:bar"), :unjarred => true
+      f.label = "My feature"
+      f.provider = "Acme Inc"
+      f.description = "The best feature ever"
+      f.changesURL = "http://example.com/changes"
+      f.license = "The license is too long to explain"
+      f.licenseURL = "http://example.com/license"
+      f.branding_plugin = "com.musal.ui"
+      f.update_sites << {:url => "http://example.com/update", :name => "My update site"}
+      f.discovery_sites = [{:url => "http://example.com/update2", :name => "My update site2"}, 
+        {:url => "http://example.com/upup", :name => "My update site in case"}]
+      package(:sources)
+    end
+  end
+  
+  it "should create a jar file with the subproject packaged as a jar inside it" do
+    @foo.package(:sources).invoke
+    feature_file = @foo.package(:sources).to_s
+    File.exists?(feature_file).should be_true
+    Zip::ZipFile.open(feature_file) do |zip|
+      zip.find_entry("eclipse/features/foo.sources_1.0.0/feature.xml").should_not be_nil
+      zip.find_entry("eclipse/features/foo.sources_1.0.0/feature.properties").should_not be_nil
+      zip.find_entry("eclipse/plugins/bar.sources_1.0.0.jar").should be_nil
+      zip.find_entry("eclipse/plugins/bar.sources_1.0.0").directory?.should be_true
+      zip.find_entry("eclipse/plugins/bar.sources_1.0.0/Hello.java").should_not be_nil
+      
+    end
+  end
+  
+  
+end
+
+describe Buildr4OSGi::FeatureTask, "packaged as SDK, detecting the OSGi headers from the original build" do
+  
+  before do
+    Buildr::write "bar/src/main/java/Hello.java", "public class Hello {}"
+    @container = define("container") do
+      project.group = "grp"
+      @bar = define("bar", :version => "1.0.0") do
+        package(:jar).with :manifest => {"Bundle-SymbolicName" => "myName", "Bundle-Version" => "3.2.1"}
+        package(:sources)
+      end
+    end
+    @foo = define("foo", :version => "1.0.0") do
+      
+      f = package(:feature)
+      f.plugins.<< project("container:bar"), :unjarred => true
+      f.label = "My feature"
+      f.provider = "Acme Inc"
+      f.description = "The best feature ever"
+      f.changesURL = "http://example.com/changes"
+      f.license = "The license is too long to explain"
+      f.licenseURL = "http://example.com/license"
+      f.branding_plugin = "com.musal.ui"
+      f.update_sites << {:url => "http://example.com/update", :name => "My update site"}
+      f.discovery_sites = [{:url => "http://example.com/update2", :name => "My update site2"}, 
+        {:url => "http://example.com/upup", :name => "My update site in case"}]
+      package(:sources)
+    end
+  end
+  
+  it "should create a jar file with the subproject packaged as a jar inside it" do
+    @foo.package(:sources).invoke
+    feature_file = @foo.package(:sources).to_s
+    File.exists?(feature_file).should be_true
+    Zip::ZipFile.open(feature_file) do |zip|
+      zip.find_entry("eclipse/features/foo.sources_1.0.0/feature.xml").should_not be_nil
+      zip.find_entry("eclipse/features/foo.sources_1.0.0/feature.properties").should_not be_nil
+      zip.find_entry("eclipse/plugins/myName.sources_3.2.1.jar").should be_nil
+      zip.find_entry("eclipse/plugins/myName.sources_3.2.1").directory?.should be_true
+      zip.find_entry("eclipse/plugins/myName.sources_3.2.1/Hello.java").should_not be_nil
+      zip.find_entry("eclipse/plugins/myName.sources_3.2.1/META-INF/MANIFEST.MF").should_not be_nil
+      zip.read("eclipse/plugins/myName.sources_3.2.1/META-INF/MANIFEST.MF").should match(/Bundle-SymbolicName: myName\.sources/)
     end
   end
   

data/spec/osgi/bundle_spec.rb

@@ -48,11 +48,11 @@ MANIFEST
   end
   
   it 'should be transformed as an artifact' do
-    @bundle.to_s.should eql("osgi:org.eclipse.core.resources:jar:3.5.1.R_20090912")
+    @bundle.to_s.should eql("org.eclipse:org.eclipse.core.resources:jar:3.5.1.R_20090912")
   end
   
   it 'should compare with its artifact definition' do
-    (@bundle <=> "osgi:org.eclipse.core.resources:jar:3.5.1.R_20090912").should == 0
+    (@bundle <=> "org.eclipse:org.eclipse.core.resources:jar:3.5.1.R_20090912").should == 0
   end
   
   it 'should recognize itself as a fragment' do

data/spec/osgi/dependencies_spec.rb

@@ -0,0 +1,91 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+require File.join(File.dirname(__FILE__), '../spec_helpers')
+
+describe OSGi::Dependencies do
+  
+  it "should read a dependencies.yml file" do
+    write "dependencies.yml", {"foo" => {"dependencies" => ["com:artifact:jar:1.0"], "projects" => ["bar", "foobar"]},
+                               "bar" => {"dependencies" => [], "projects" => []},
+                               "foobar" => {"dependencies" => [], "projects" => []}}.to_yaml
+    foo = define("foo")
+    bar = define("bar")
+    foobar = define("foobar")
+    deps = OSGi::Dependencies.new(foo)
+    deps.read
+    deps.dependencies.should == ["com:artifact:jar:1.0"]
+    deps.projects.should == [bar, foobar]
+  end
+  
+  it "should complain if a project is missing" do
+    write "dependencies.yml", {"foo" => {"dependencies" => ["com:artifact:jar:1.0"], "projects" => ["bar", "foobar"]}}.to_yaml
+    foo = define("foo")
+    bar = define("bar")
+    
+    deps = OSGi::Dependencies.new(foo)
+    lambda { deps.read }.should raise_error(RuntimeError, /No such project/)
+  end
+  
+  it "should add the project to the dependencies even if the project is not declared in the dependencies file" do
+    write "dependencies.yml", {"foo" => {"dependencies" => ["com:artifact:jar:1.0"], "projects" => ["bar", "foobar"]}}.to_yaml
+    foo = define("foo")
+    bar = define("bar")
+    foobar = define("foobar")
+    deps = OSGi::Dependencies.new(foo)
+    deps.read
+    deps.dependencies.should == ["com:artifact:jar:1.0"]
+    deps.projects.should == [bar, foobar]
+  end
+  
+  it "should find the dependencies of each project even if cycles are present" do
+    write "dependencies.yml", {"foo" => {"dependencies" => ["com:artifact:jar:1.0"], "projects" => ["bar", "foobar"]},
+                               "bar" => {"dependencies" => [], "projects" => ["foo"]},
+                               "foobar" => {"dependencies" => [], "projects" => ["bar"]}}.to_yaml
+    foo = define("foo")
+    bar = define("bar")
+    foobar = define("foobar")
+    deps = OSGi::Dependencies.new(foo)
+    deps.read
+    deps.dependencies.should == ["com:artifact:jar:1.0"]
+    deps.projects.should == [bar, foobar]
+  end
+  
+  it "should add the dependencies of the projects it depends on to its own" do
+    write "dependencies.yml", {"foo" => {"dependencies" => [], "projects" => ["bar"]},
+                               "bar" => {"dependencies" => ["com:artifact:jar:1.0"], "projects" => []}}.to_yaml
+    foo = define("foo")
+    bar = define("bar")
+    deps = OSGi::Dependencies.new(foo)
+    deps.read
+    deps.dependencies.should == ["com:artifact:jar:1.0"]
+    deps.projects.should == [bar]
+  end
+  
+  it "should write dependencies for several projects" do
+    foo = define("foo")
+    bar = define("bar")
+    deps = OSGi::Dependencies.new(foo)
+    deps.write([foo, "bar"]) {|hash, name|
+      case
+        when name == "foo"  
+          hash["foo"]["projects"] << "bar"
+        when name == "bar"
+          hash["bar"]["dependencies"] << "com:art:jar:1.0"  
+      end
+    }
+    YAML.load(File.read("dependencies.yml")).should == {"foo"=>{"projects"=>["bar"], "dependencies"=>[]}, "bar"=>{"projects"=>[], "dependencies"=>["com:art:jar:1.0"]}}
+  end
+end

data/spec/osgi/library_extension_spec.rb

@@ -71,6 +71,23 @@ describe Buildr4OSGi::BuildLibraries do
     }
   end
   
+  it 'should not add the Export-Package header if no packages contain .class files' do
+    pending "Create a zip full of files but no .class files"
+    library_project(SLF4J, "group", "foo", "1.0.0")
+    foo = project("foo")
+    lambda {foo.package(:library_project).invoke}.should_not raise_error
+    jar = File.join(foo.base_dir, "target", "foo-1.0.0.jar")
+    File.exists?(jar).should be_true
+    Zip::ZipFile.open(jar) {|zip|
+      manifest = zip.find_entry("META-INF/MANIFEST.MF")
+      manifest.should_not be_nil  
+      contents = Manifest.read(zip.read(manifest))
+      contents.first["Export-Package"].should_not be_nil
+      contents.first["Export-Package"].keys.should include("org.slf4j.helpers")
+      contents.first["Export-Package"].keys.should_not include("org")
+    }
+  end
+  
   it 'should produce a zip of the sources' do
     library_project(SLF4J, "group", "foo", "1.0.0")
     foo = project("foo")

data/spec/osgi/packaging_sources_spec.rb

@@ -0,0 +1,71 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+require File.join(File.dirname(__FILE__), '../spec_helpers')
+
+Spec::Runner.configure do |config|
+  config.include Buildr4OSGi::SpecHelpers
+end
+
+describe OSGi::BundleTask do
+  
+  def define_project
+    Buildr::write "plugin.xml", <<-PLUGIN_XML
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+ <extension point="org.eclipse.core.runtime.preferences">
+   <initializer class="org.intalio.preferenceInitializer"></initializer>
+ </extension>
+ <extension id="helloproblemmarker" name="%marker" point="org.eclipse.core.resources.markers">
+       <super type="org.eclipse.core.resources.problemmarker"/>
+       <persistent value="true"/>
+ </extension>
+</plugin>
+PLUGIN_XML
+    Buildr::write "plugin.properties", <<-PLUGIN_PROPERTIES
+marker=Hello marker
+PLUGIN_PROPERTIES
+    Buildr::write "src/main/java/Main.java", "public class Main { public static void main(String[] args) {}}"
+    @plugin = define("plugin", :version => "1.0.0.001") do
+      package(:sources)
+      package(:plugin)
+    end
+    @path = @plugin.package(:sources).to_s
+    
+  end
+  
+  it "should package the sources as a normal Java -sources.jar" do
+    define_project
+    @plugin.package(:sources).invoke
+    File.exists?(@path).should be_true
+    @path.to_s.should include(".jar")
+    Zip::ZipFile.open(@path) do |zip|
+      zip.find_entry("Main.java").should_not be_nil
+    end
+  end
+
+  it "should package a manifest for OSGi" do
+    define_project
+    @plugin.package(:sources).invoke
+    File.exists?(@path).should be_true
+    sourcesManifest = ::Buildr::Packaging::Java::Manifest.new(nil)
+    Zip::ZipFile.open(@path) do |zip|
+      zip.find_entry("Main.java").should_not be_nil
+    end
+  end
+
+
+end

data/spec/osgi/packaging_spec.rb

@@ -41,7 +41,6 @@ PLUGIN_PROPERTIES
     Buildr::write "src/main/java/Main.java", "public class Main { public static void main(String[] args) {}}"
     @plugin = define("plugin", :version => "1.0.0.001")
     @path = @plugin.package(:plugin).to_s
-    
   end
   
   it "should package a project as a normal Java project" do
@@ -63,6 +62,16 @@ PLUGIN_PROPERTIES
     end
   end
   
+  it "should package a project as a plugin with its internal properties files" do
+    define_project
+    Buildr::write "src/main/java/somefolder/hello.properties", "# Empty properties file"
+     @plugin.package(:plugin).invoke
+    File.exists?(@path).should be_true
+    Zip::ZipFile.open(@path) do |zip|
+      zip.find_entry("somefolder/hello.properties").should_not be_nil
+    end
+  end
+  
   it "should work with subprojects" do
     Buildr::write "bar/plugin.xml", <<-PLUGIN_XML
 <?xml version="1.0" encoding="UTF-8"?>
@@ -85,6 +94,7 @@ PLUGIN_PROPERTIES
       define("bar", :version => "2.0")
     end
     project("plugin:bar").package(:plugin).invoke
+    File.basename(project("plugin:bar").package(:plugin).to_s).should == "bar-2.0.jar"
     Zip::ZipFile.open(project("plugin:bar").package(:plugin).to_s) do |zip|
       zip.find_entry("plugin.xml").should_not be_nil
       zip.find_entry("plugin.properties").should_not be_nil

data/spec/osgi/project_extension_spec.rb

@@ -25,16 +25,26 @@ describe OSGi::ProjectExtension do
     define('foo').dependencies.should be_instance_of(Array)
   end
   
-  it 'should add a new osgi method to projects' do
-    define('foo').osgi.should be_instance_of(OSGi::ProjectExtension::OSGi)
-  end
-  
-  it 'should give a handle over the OSGi containers registry' do
-    define('foo').osgi.registry.should be_instance_of(OSGi::Registry)
+  it 'should fail when the user uses a dependency that is not present locally or remotely' do
+    write "dependencies.yml", {"foo" => {"dependencies" => ["group:artifact:jar:99.99.1"], "projects" => []}, 
+                                "bar" => {"dependencies" => [], "projects" => ["foobar"]}}.to_yaml
+    foo = define('foo') {
+      compile.with dependencies
+    }
+    # bar = define("bar") {
+    #      compile.with dependencies
+    #    }
+    lambda {foo.compile.invoke}.should raise_error(RuntimeError, /Failed to download group:artifact:jar:99.99.1/)
+    pending "Unsupported scenario as of now."
+    lambda {bar.compile.invoke}.should raise_error(RuntimeError, /No such project/)
   end
   
-  it 'should give options to resolve bundle dependencies' do
-    pending
+  it 'should fail when the user uses a project that is not present locally or remotely' do
+    # see the spec dependencies_spec.rb at line 33 for an equivalent test.
+    write "dependencies.yml", {"bar" => {"dependencies" => [], "projects" => ["foobar"]}}.to_yaml
+    bar = define("bar") {
+      lambda {compile.with dependencies}.should raise_error(RuntimeError, /No such project/)
+    }
   end
   
 end
@@ -580,7 +590,7 @@ MANIFEST
     foo.osgi.registry.containers = @eclipse_instances.dup
     foo.dependencies
     foo.task('osgi:install:dependencies').invoke  
-    File.exist?(artifact("osgi:org.eclipse.debug.ui:jar:3.4.1.v20080811_r341").to_s).should be_true
+    File.exist?(artifact("org.eclipse:org.eclipse.debug.ui:jar:3.4.1.v20080811_r341").to_s).should be_true
     
   end
   
@@ -599,13 +609,13 @@ MANIFEST
     
     foo.task('osgi:resolve:dependencies').invoke
     foo.task('osgi:install:dependencies').invoke
-    File.exist?(artifact("osgi:org.eclipse.core.resources:jar:3.5.1.R_20090512").to_s).should be_true
-    Zip::ZipFile.open(artifact("osgi:org.eclipse.core.resources:jar:3.5.1.R_20090512").to_s) {|zip|
+    File.exist?(artifact("org.eclipse:org.eclipse.core.resources:jar:3.5.1.R_20090512").to_s).should be_true
+    Zip::ZipFile.open(artifact("org.eclipse:org.eclipse.core.resources:jar:3.5.1.R_20090512").to_s) {|zip|
      zip.entries.empty?.should_not be_true 
     }
-    File.exist?(artifact("osgi:org.eclipse.core.runtime.compatibility.registry:jar:3.2.200.v20090429-1800").to_s).should be_true
+    File.exist?(artifact("org.eclipse:org.eclipse.core.runtime.compatibility.registry:jar:3.2.200.v20090429-1800").to_s).should be_true
     
-    Zip::ZipFile.open(artifact("osgi:org.eclipse.core.runtime.compatibility.registry:jar:3.2.200.v20090429-1800").to_s) {|zip|
+    Zip::ZipFile.open(artifact("org.eclipse:org.eclipse.core.runtime.compatibility.registry:jar:3.2.200.v20090429-1800").to_s) {|zip|
      
      zip.entries.empty?.should_not be_true 
     }
@@ -627,17 +637,17 @@ MANIFEST
     
     foo.task('osgi:resolve:dependencies').invoke
     URI.should_receive(:upload).once.
-      with(URI.parse('sftp://example.com/base/osgi/org.eclipse.debug.ui/3.4.1.v20080811_r341/org.eclipse.debug.ui-3.4.1.v20080811_r341.jar'), 
-      artifact("osgi:org.eclipse.debug.ui:jar:3.4.1.v20080811_r341").to_s, anything)
+      with(URI.parse('sftp://example.com/base/org/eclipse/org.eclipse.debug.ui/3.4.1.v20080811_r341/org.eclipse.debug.ui-3.4.1.v20080811_r341.jar'), 
+      artifact("org.eclipse:org.eclipse.debug.ui:jar:3.4.1.v20080811_r341").to_s, anything)
     URI.should_receive(:upload).once.
-      with(URI.parse('sftp://example.com/base/osgi/org.eclipse.debug.ui/3.4.1.v20080811_r341/org.eclipse.debug.ui-3.4.1.v20080811_r341.pom'), 
-      artifact("osgi:org.eclipse.debug.ui:jar:3.4.1.v20080811_r341").pom.to_s, anything)
+      with(URI.parse('sftp://example.com/base/org/eclipse/org.eclipse.debug.ui/3.4.1.v20080811_r341/org.eclipse.debug.ui-3.4.1.v20080811_r341.pom'), 
+      artifact("org.eclipse:org.eclipse.debug.ui:jar:3.4.1.v20080811_r341").pom.to_s, anything)
     URI.should_receive(:upload).once.
-           with(URI.parse('sftp://example.com/base/osgi/org.eclipse.core.resources/3.5.1.R_20090512/org.eclipse.core.resources-3.5.1.R_20090512.pom'), 
-           artifact("osgi:org.eclipse.core.resources:jar:3.5.1.R_20090512").pom.to_s, anything)
+           with(URI.parse('sftp://example.com/base/org/eclipse/org.eclipse.core.resources/3.5.1.R_20090512/org.eclipse.core.resources-3.5.1.R_20090512.pom'), 
+           artifact("org.eclipse:org.eclipse.core.resources:jar:3.5.1.R_20090512").pom.to_s, anything)
     URI.should_receive(:upload).once.
-           with(URI.parse('sftp://example.com/base/osgi/org.eclipse.core.resources/3.5.1.R_20090512/org.eclipse.core.resources-3.5.1.R_20090512.jar'), 
-           artifact("osgi:org.eclipse.core.resources:jar:3.5.1.R_20090512").to_s, anything)
+           with(URI.parse('sftp://example.com/base/org/eclipse/org.eclipse.core.resources/3.5.1.R_20090512/org.eclipse.core.resources-3.5.1.R_20090512.jar'), 
+           artifact("org.eclipse:org.eclipse.core.resources:jar:3.5.1.R_20090512").to_s, anything)
     
     foo.task('osgi:upload:dependencies').invoke
     

data/spec/osgi/registry_spec.rb

@@ -47,4 +47,35 @@ describe OSGi::Registry do
     lambda {foo.osgi.registry.containers << "hello"}.should raise_error(TypeError)
     lambda {foo.osgi.registry.containers = ["hello"]}.should raise_error(RuntimeError, /Cannot set containers, containers have been resolved already/)
   end
+end
+
+
+describe OSGi::OSGi do
+  
+  it 'should add a new osgi method to projects' do
+    define('foo').osgi.should be_instance_of(::OSGi::OSGi)
+  end
+  
+  it 'should give a handle over the OSGi containers registry' do
+    define('foo').osgi.registry.should be_instance_of(::OSGi::Registry)
+  end
+  
+end
+
+describe OSGi::GroupMatcher do
+  
+  it 'should use osgi as the default group for an artifact' do
+    OSGi::GroupMatcher.instance.group("hello").should == "osgi"
+  end
+
+  it 'should use org.eclipse  as the default group for Eclipse artifacts' do
+    OSGi::GroupMatcher.instance.group("org.eclipse.core.resources").should == "org.eclipse"
+  end  
+  
+  it 'should let users specify their own groups' do
+    OSGi::GroupMatcher.instance.group_matchers << Proc.new {|name| "bar" if name.match /foo$/}
+    OSGi::GroupMatcher.instance.group("org.eclipse.core.resources").should == "org.eclipse"
+    OSGi::GroupMatcher.instance.group("hello").should == "osgi"
+    OSGi::GroupMatcher.instance.group("org.eclipse.core.foo").should == "bar" 
+  end
 end

data/spec/osgi/resolving_strategies_spec.rb

@@ -0,0 +1,116 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+require File.join(File.dirname(__FILE__), '../spec_helpers')
+
+describe OSGi::BundleResolvingStrategies do
+  
+  before(:all) do
+    @bundles = [OSGi::Bundle.new("art", "1.0"), OSGi::Bundle.new("art", "2.0"), 
+      OSGi::Bundle.new("art", "2.0.1"), OSGi::Bundle.new("art", "3.0")]
+    
+  end
+  
+  it 'should use latest by default to resolve bundle dependencies' do
+    define('foo').osgi.options.bundle_resolving_strategy.should eql(:latest)
+  end
+  
+  describe 'latest' do
+    
+    it 'should return the bundle with the latest version' do
+      OSGi::BundleResolvingStrategies.latest(@bundles).should == @bundles.last
+    end
+    
+  end
+  
+  describe 'oldest' do
+    
+    it 'should return the bundle with the oldest version' do
+      OSGi::BundleResolvingStrategies.oldest(@bundles).should == @bundles.first
+    end
+    
+  end
+  
+  describe 'prompt' do
+    
+    it 'should prompt the user to choose a bundle' do
+      input = $stdin
+      $stdin = StringIO.new
+      $stdin.should_receive(:gets).and_return("i\n")
+      $stdin.should_receive(:gets).and_return("256\n")
+      $stdin.should_receive(:gets).and_return("2\n")
+      lambda { 
+        OSGi::BundleResolvingStrategies.prompt(@bundles).should == @bundles[1]
+      }.should show("Invalid index")
+      $stdin = input
+    end
+    
+  end
+  
+end
+
+describe OSGi::PackageResolvingStrategies do
+  
+  before(:all) do
+    @bundles = [OSGi::Bundle.new("art", "1.0"), OSGi::Bundle.new("art", "2.0"), 
+      OSGi::Bundle.new("art", "2.0.1"), OSGi::Bundle.new("art", "3.0")]
+    
+  end
+  
+  it 'should use all by default to resolve package dependencies' do
+    define('foo').osgi.options.package_resolving_strategy.should eql(:all)
+  end
+  
+  describe 'all' do
+    
+    it 'should take all the bundles' do
+      OSGi::PackageResolvingStrategies.all(::OSGi::BundlePackage.new("com.package", "1.0"), @bundles).should == @bundles
+    end
+    
+  end
+  
+  describe 'prompt' do
+    
+    it 'should prompt the user to choose a bundle' do
+      input = $stdin
+      $stdin = StringIO.new
+      $stdin.should_receive(:gets).and_return("2\n")
+      OSGi::PackageResolvingStrategies.prompt(::OSGi::BundlePackage.new("com.package", "1.0"), @bundles).should == [@bundles[1]]
+      $stdin = input
+    end
+    
+    it 'should complain if the user enters an invalid index' do
+      input = $stdin
+      $stdin = StringIO.new
+      $stdin.should_receive(:gets).and_return("i\n")
+      $stdin.should_receive(:gets).and_return("256\n")
+      $stdin.should_receive(:gets).and_return("2\n")
+      lambda { 
+        OSGi::PackageResolvingStrategies.prompt(::OSGi::BundlePackage.new("com.package", "1.0"), @bundles).should == [@bundles[1]]
+      }.should show("Invalid index")
+      $stdin = input
+    end
+    
+    it 'should let the user select all bundles' do
+      input = $stdin
+      $stdin = StringIO.new
+      $stdin.should_receive(:gets).and_return("A\n")
+      OSGi::PackageResolvingStrategies.prompt(::OSGi::BundlePackage.new("com.package", "1.0"), @bundles).should == @bundles
+      $stdin = input
+    end
+    
+  end
+  
+end

data/spec/spec_helpers.rb

@@ -35,17 +35,17 @@ unless defined?(SpecHelpers)
   HELPERS_REPOSITORY = File.expand_path(File.join(File.dirname(__FILE__), "tmp", "remote"))
   Buildr::repositories.local = HELPERS_REPOSITORY
   slf4j = Buildr::group(%w{ slf4j-api slf4j-log4j12 jcl104-over-slf4j }, :under=>"org.slf4j", :version=>"1.5.8")
+  LOG4J = "log4j:log4j:jar:1.2.15"
   SLF4J = slf4j
   DEBUG_UI = "eclipse:org.eclipse.debug.ui:jar:3.4.1.v20080811_r341"
   Buildr::repositories.remote << "http://www.intalio.org/public/maven2"
   artifact(DEBUG_UI).invoke # download it once!
+  artifact(LOG4J).invoke
   for lib in SLF4J do
     artifact(lib).invoke
     artifact(artifact(lib).to_hash.merge(:classifier => "sources")).invoke
   end
   Buildr::repositories.local = fake_local
-  # Keep a default registry.
-  DEFAULT = Buildr::Nature::Registry.all unless defined?(DEFAULT)
   
   module Buildr4OSGi::SpecHelpers