buildr4osgi 0.9.2 → 0.9.3

data/lib/buildr4osgi/osgi/bundle.rb

@@ -120,7 +120,7 @@ module OSGi #:nodoc:
       
       #Read the imports
       imports = []
-      manifest.first[B_IMPORT_PKG].each_pair {|key, value| imports << BundlePackage.new(key.strip, value["version"], :is_export => false)} unless manifest.first[B_IMPORT_PKG].nil?
+      manifest.first[B_IMPORT_PKG].each_pair {|key, value| imports << BundlePackage.new(key.strip, value["version"], :is_export => false, :optional => value[B_RESOLUTION] == "optional")} unless manifest.first[B_IMPORT_PKG].nil?
       
       #Read the imported packages
       
@@ -175,22 +175,20 @@ module OSGi #:nodoc:
 
     
     #
-    # Resolves the matching artifacts associated with the project.
+    # Resolves the matching artifacts.
     #
-    def resolve_matching_artifacts(project)
+    def resolve_matching_artifacts
       # Collect the bundle projects, duplicate them so no changes can be applied to them
       # and extend them with the BundleProjectMatcher module
       
       b_projects = BundleProjects::bundle_projects.select {|p|
-        unless p == project
-          p.extend BundleProjectMatcher
-          p.matches(:name => name, :version => version)
-        end
+        p.extend BundleProjectMatcher
+        p.matches(:name => name, :version => version)
       }
       #projects take precedence over the dependencies elsewhere, that's what happens in Eclipse
       # for example
       return b_projects unless b_projects.empty?
-      return project.osgi.registry.resolved_containers.collect {|i| 
+      return OSGi.registry.resolved_containers.collect {|i| 
         i.find(:name => name, :version => version)
       }.flatten.compact.collect{|b| b.dup }
     end
@@ -220,12 +218,12 @@ module OSGi #:nodoc:
     # Resolve a bundle from itself, by finding the appropriate bundle in the OSGi containers.
     # Returns self or the project it represents if a project is found to be self.
     #
-    def resolve(project, bundles = resolve_matching_artifacts(project))
+    def resolve(bundles = resolve_matching_artifacts)
       bundle = case bundles.size
       when 0 then nil
       when 1 then bundles.first
       else
-        BundleResolvingStrategies.send(project.osgi.options.bundle_resolving_strategy, bundles)
+        BundleResolvingStrategies.send(OSGi.options.bundle_resolving_strategy, bundles)
       end
       if bundle.nil?
         warn "Could not resolve bundle for #{self.to_s}" 
@@ -247,8 +245,8 @@ module OSGi #:nodoc:
 
     # Finds the fragments associated with this bundle.
     #
-    def fragments(project)
-      project.osgi.registry.resolved_containers.collect {|i| 
+    def fragments
+      OSGi.registry.resolved_containers.collect {|i| 
         i.find_fragments(:host => name).select{|f|
           if f.fragment.version.is_a? VersionRange
             f.fragment.version.in_range(version)
@@ -268,6 +266,13 @@ module OSGi #:nodoc:
     end
     
     alias :eql? ==
+    
+    # Important for maps.
+    # We absolutely want to avoid having to resolve several times the same bundle
+    #
+    def hash
+      return to_s.hash
+    end
 
   end
 end

data/lib/buildr4osgi/osgi/bundle_package.rb

@@ -19,12 +19,19 @@ module OSGi #:nodoc:
   # Created from the Import-Package or Provide-Package (Export-Package) header.
   #
   class BundlePackage
-    attr_accessor :name, :version, :bundles, :imports, :is_export
+    attr_accessor :name, :version, :bundles, :imports, :is_export, :original_version, :optional
     
     def initialize(name, version, args = {}) #:nodoc:
       @name= name
       @is_export = args[:is_export]
-      @version = (is_export ? version.gsub(/\"/, '') : VersionRange.parse(version, true)) if version
+      @optional = args[:optional]
+      @original_version = version
+      if version
+        v = version.gsub(/\"/, '')
+        v = VersionRange.parse(v, true)
+        v ||= v
+        @version = v
+      end
       @bundles = args[:bundles] || []
       @imports = args[:imports] || []
     end
@@ -32,31 +39,41 @@ module OSGi #:nodoc:
     #
     # Resolves the matching artifacts associated with the project.
     #
-    def resolve_matching_artifacts(project)
+    def resolve_matching_artifacts
       # Collect the bundle projects
       # and extend them with the BundleProjectMatcher module
       b_projects = BundleProjects::bundle_projects.select {|p|
-        unless p == project
-          p.extend BundleProjectMatcher 
-          p.matches(:exports_package => name, :version => version)
-        end
+        p.extend BundleProjectMatcher 
+        p.matches(:exports_package => name, :version => version)
       }
+      warn "*** SPLIT PACKAGE: #{self} is exported by more than one project: <#{b_projects.join(", ")}> ABORTING!" if b_projects.size > 1
       return b_projects unless b_projects.empty?
       
-      resolved = project.osgi.registry.resolved_containers.collect {|i| i.find(:exports_package => name, :version => version)}
+      resolved = OSGi.registry.resolved_containers.collect {|i| i.find(:exports_package => name, :version => version)}
       resolved.flatten.compact.collect{|b| b.dup}
     end
     
     # Resolves the bundles that export this package.
     #
-    def resolve(project, bundles = resolve_matching_artifacts(project))
+    def resolve(bundles = resolve_matching_artifacts)
       bundles = case bundles.size
       when 0 then []
       when 1 then bundles
       else
-        bundles = OSGi::PackageResolvingStrategies.send(project.osgi.options.package_resolving_strategy, name, bundles)
+        bundles = PackageResolvingStrategies.send(OSGi.options.package_resolving_strategy, name, bundles)
+      end
+      if bundles.empty?
+        
+        return [] if OSGi.is_framework_package?(name) # Is the bundle part of the packages provided by default ?
+          
+          
+        trace "original version: #{original_version}"
+        if optional
+          info "No bundles found exporting the optional package #{name};version=#{version} (#{original_version})"
+        else
+          warn "No bundles found exporting the package #{name};version=#{version} (#{original_version})"
+        end
       end
-      warn "No bundles found exporting the package #{name}; version=#{version}" if (bundles.empty?)
       bundles
       
     end
@@ -65,6 +82,13 @@ module OSGi #:nodoc:
       "Package #{name}; version #{version}"
     end
     
+    # Important for maps.
+    # We absolutely want to avoid having to resolve several times the same package
+    #
+    def hash
+      return to_s.hash
+    end
+    
     # We just test the name and version as we want to be able to see if an unresolved package and a resolved one represent the same
     # bundle package.
     def ==(other)

data/lib/buildr4osgi/osgi/container.rb

@@ -41,6 +41,7 @@ module OSGi #:nodoc:
         warn "Folder #{p_loc_complete} not found!" if !File.exists? p_loc_complete 
         parse(p_loc_complete) if File.exists? p_loc_complete
       end
+      info("Done parsing #{location}")
     end
 
     # Parses the directory and grabs the plugins, adding the created bundle objects to @bundles.

data/lib/buildr4osgi/osgi/execution_environment.rb

@@ -0,0 +1,199 @@
+# 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.
+
+module OSGi
+  
+  # The notion of profile in OSGi refers to the execution environment: SDK, loaded libraries in LD_LIBRARY_PATH.
+  # A set of default execution environments is defined by the OSGi specifications.
+  class ExecutionEnvironment
+    
+    attr_reader :name, :description, :packages
+    
+    def initialize(name, description, packages)
+      @name = name
+      @description = description
+      @packages = packages.is_a?(Array) ? packages : [packages]
+      @packages.freeze
+      freeze
+    end
+    
+  end
+  
+  # No profile.
+  NONE = ExecutionEnvironment.new("None", "None", [])
+  
+  # The standard CDC-1.0/Foundation-1.0 profile
+  CDC10FOUNDATION10 = ExecutionEnvironment.new("CDC-1.0/Foundation-1.0", "Equal to J2ME Foundation Profile", ["javax.microedition.io"])
+  
+  # The standard CDC-1.0/Foundation-1.1 profile
+  CDC10FOUNDATION11 = ExecutionEnvironment.new("CDC-1.0/Foundation-1.1", "Equal to J2ME Foundation Profile", ["javax.microedition.io","javax.microedition.pki",
+    "javax.security.auth.x500"])
+    
+  # The standard J2SE-1.2 profile
+  J2SE12 = ExecutionEnvironment.new("J2SE-1.2", "Java 2 Platform, Standard Edition 1.2", %w{javax.accessibility javax.swing javax.swing.border javax.swing.colorchooser javax.swing.event javax.swing.filechooser 
+    javax.swing.plaf javax.swing.plaf.basic javax.swing.plaf.metal javax.swing.plaf.multi javax.swing.table javax.swing.text javax.swing.text.html 
+    javax.swing.text.html.parser javax.swing.text.rtf javax.swing.tree javax.swing.undo org.omg.CORBA org.omg.CORBA.DynAnyPackage org.omg.CORBA.ORBPackage 
+    org.omg.CORBA.portable org.omg.CORBA.TypeCodePackage org.omg.CosNaming org.omg.CosNaming.NamingContextPackage})
+  
+  # The standard J2SE-1.3 profile
+  J2SE13 = ExecutionEnvironment.new("J2SE-1.3", "Java 2 Platform, Standard Edition 1.3", %w{javax.accessibility javax.naming javax.naming.directory javax.naming.event javax.naming.ldap
+     javax.naming.spi javax.rmi javax.rmi.CORBA javax.sound.midi javax.sound.midi.spi javax.sound.sampled javax.sound.sampled.spi javax.swing javax.swing.border
+     javax.swing.colorchooser javax.swing.event javax.swing.filechooser javax.swing.plaf javax.swing.plaf.basic javax.swing.plaf.metal javax.swing.plaf.multi
+     javax.swing.table javax.swing.text javax.swing.text.html javax.swing.text.html.parser javax.swing.text.rtf javax.swing.tree javax.swing.undo javax.transaction
+     org.omg.CORBA org.omg.CORBA_2_3 org.omg.CORBA_2_3.portable org.omg.CORBA.DynAnyPackage org.omg.CORBA.ORBPackage org.omg.CORBA.portable
+     org.omg.CORBA.TypeCodePackage org.omg.CosNaming org.omg.CosNaming.NamingContextPackage org.omg.SendingContext org.omg.stub.java.rmi})
+     
+  # The standard J2SE-1.4 profile
+  J2SE14 = ExecutionEnvironment.new("J2SE-1.4", "Java 2 Platform, Standard Edition 1.4", %w{javax.accessibility javax.crypto javax.crypto.interfaces javax.crypto.spec javax.imageio 
+    javax.imageio.event javax.imageio.metadata javax.imageio.plugins.jpeg javax.imageio.spi javax.imageio.stream javax.naming javax.naming.directory javax.naming.event 
+    javax.naming.ldap javax.naming.spi javax.net javax.net.ssl javax.print javax.print.attribute javax.print.attribute.standard javax.print.event javax.rmi 
+    javax.rmi.CORBA javax.security.auth javax.security.auth.callback javax.security.auth.kerberos javax.security.auth.login javax.security.auth.spi 
+    javax.security.auth.x500 javax.security.cert javax.sound.midi javax.sound.midi.spi javax.sound.sampled javax.sound.sampled.spi javax.sql javax.swing 
+    javax.swing.border javax.swing.colorchooser javax.swing.event javax.swing.filechooser javax.swing.plaf javax.swing.plaf.basic javax.swing.plaf.metal 
+    javax.swing.plaf.multi javax.swing.table javax.swing.text javax.swing.text.html javax.swing.text.html.parser javax.swing.text.rtf javax.swing.tree 
+    javax.swing.undo javax.transaction javax.transaction.xa javax.xml.parsers javax.xml.transform javax.xml.transform.dom javax.xml.transform.sax 
+    javax.xml.transform.stream org.ietf.jgss org.omg.CORBA org.omg.CORBA_2_3 org.omg.CORBA_2_3.portable org.omg.CORBA.DynAnyPackage org.omg.CORBA.ORBPackage 
+    org.omg.CORBA.portable org.omg.CORBA.TypeCodePackage org.omg.CosNaming org.omg.CosNaming.NamingContextExtPackage org.omg.CosNaming.NamingContextPackage 
+    org.omg.Dynamic org.omg.DynamicAny org.omg.DynamicAny.DynAnyFactoryPackage org.omg.DynamicAny.DynAnyPackage org.omg.IOP org.omg.IOP.CodecFactoryPackage 
+    org.omg.IOP.CodecPackage org.omg.Messaging org.omg.PortableInterceptor org.omg.PortableInterceptor.ORBInitInfoPackage org.omg.PortableServer
+    org.omg.PortableServer.CurrentPackage org.omg.PortableServer.POAManagerPackage org.omg.PortableServer.POAPackage org.omg.PortableServer.portable 
+    org.omg.PortableServer.ServantLocatorPackage org.omg.SendingContext org.omg.stub.java.rmi org.w3c.dom org.w3c.dom.css org.w3c.dom.events 
+    org.w3c.dom.html org.w3c.dom.stylesheets org.w3c.dom.views org.xml.sax org.xml.sax.ext org.xml.sax.helpers})
+  
+  # The standard J2SE-1.5 profile
+  J2SE15 = ExecutionEnvironment.new("J2SE-1.5", "Java 2 Platform, Standard Edition 5.0", %w{javax.accessibility javax.activity javax.crypto javax.crypto.interfaces 
+    javax.crypto.spec javax.imageio javax.imageio.event 
+    javax.imageio.metadata javax.imageio.plugins.bmp javax.imageio.plugins.jpeg javax.imageio.spi javax.imageio.stream javax.management javax.management.loading 
+    javax.management.modelmbean javax.management.monitor javax.management.openmbean javax.management.relation javax.management.remote javax.management.remote.rmi 
+    javax.management.timer javax.naming javax.naming.directory javax.naming.event javax.naming.ldap javax.naming.spi javax.net javax.net.ssl javax.print 
+    javax.print.attribute javax.print.attribute.standard javax.print.event javax.rmi javax.rmi.CORBA javax.rmi.ssl javax.security.auth javax.security.auth.callback 
+    javax.security.auth.kerberos javax.security.auth.login javax.security.auth.spi javax.security.auth.x500 javax.security.cert javax.security.sasl javax.sound.midi 
+    javax.sound.midi.spi javax.sound.sampled javax.sound.sampled.spi javax.sql javax.sql.rowset javax.sql.rowset.serial javax.sql.rowset.spi javax.swing 
+    javax.swing.border javax.swing.colorchooser javax.swing.event javax.swing.filechooser javax.swing.plaf javax.swing.plaf.basic javax.swing.plaf.metal 
+    javax.swing.plaf.multi javax.swing.plaf.synth javax.swing.table javax.swing.text javax.swing.text.html javax.swing.text.html.parser javax.swing.text.rtf 
+    javax.swing.tree javax.swing.undo javax.transaction javax.transaction.xa javax.xml javax.xml.datatype javax.xml.namespace javax.xml.parsers javax.xml.transform 
+    javax.xml.transform.dom javax.xml.transform.sax javax.xml.transform.stream javax.xml.validation javax.xml.xpath org.ietf.jgss org.omg.CORBA org.omg.CORBA_2_3 
+    org.omg.CORBA_2_3.portable org.omg.CORBA.DynAnyPackage org.omg.CORBA.ORBPackage org.omg.CORBA.portable org.omg.CORBA.TypeCodePackage org.omg.CosNaming 
+    org.omg.CosNaming.NamingContextExtPackage org.omg.CosNaming.NamingContextPackage org.omg.Dynamic org.omg.DynamicAny org.omg.DynamicAny.DynAnyFactoryPackage 
+    org.omg.DynamicAny.DynAnyPackage org.omg.IOP org.omg.IOP.CodecFactoryPackage org.omg.IOP.CodecPackage org.omg.Messaging org.omg.PortableInterceptor 
+    org.omg.PortableInterceptor.ORBInitInfoPackage org.omg.PortableServer org.omg.PortableServer.CurrentPackage org.omg.PortableServer.POAManagerPackage 
+    org.omg.PortableServer.POAPackage org.omg.PortableServer.portable org.omg.PortableServer.ServantLocatorPackage org.omg.SendingContext org.omg.stub.java.rmi 
+    org.w3c.dom org.w3c.dom.bootstrap org.w3c.dom.css org.w3c.dom.events org.w3c.dom.html org.w3c.dom.ls org.w3c.dom.ranges org.w3c.dom.stylesheets 
+    org.w3c.dom.traversal org.w3c.dom.views org.xml.sax org.xml.sax.ext org.xml.sax.helpers})
+  
+  # The standard JavaSE-1.6 profile
+  JAVASE16 = ExecutionEnvironment.new("JavaSE-1.6", "Java Platform, Standard Edition 6.0", %w{javax.accessibility javax.activation javax.activity 
+    javax.annotation javax.annotation.processing javax.crypto javax.crypto.interfaces 
+    javax.crypto.spec javax.imageio javax.imageio.event javax.imageio.metadata javax.imageio.plugins.bmp javax.imageio.plugins.jpeg javax.imageio.spi 
+    javax.imageio.stream javax.jws javax.jws.soap javax.lang.model javax.lang.model.element javax.lang.model.type javax.lang.model.util javax.management 
+    javax.management.loading javax.management.modelmbean javax.management.monitor javax.management.openmbean javax.management.relation javax.management.remote 
+    javax.management.remote.rmi javax.management.timer javax.naming javax.naming.directory javax.naming.event javax.naming.ldap javax.naming.spi javax.net 
+    javax.net.ssl javax.print javax.print.attribute javax.print.attribute.standard javax.print.event javax.rmi javax.rmi.CORBA javax.rmi.ssl javax.script 
+    javax.security.auth javax.security.auth.callback javax.security.auth.kerberos javax.security.auth.login javax.security.auth.spi javax.security.auth.x500 
+    javax.security.cert javax.security.sasl javax.sound.midi javax.sound.midi.spi javax.sound.sampled javax.sound.sampled.spi javax.sql javax.sql.rowset 
+    javax.sql.rowset.serial javax.sql.rowset.spi javax.swing javax.swing.border javax.swing.colorchooser javax.swing.event javax.swing.filechooser 
+    javax.swing.plaf javax.swing.plaf.basic javax.swing.plaf.metal javax.swing.plaf.multi javax.swing.plaf.synth javax.swing.table javax.swing.text 
+    javax.swing.text.html javax.swing.text.html.parser javax.swing.text.rtf javax.swing.tree javax.swing.undo javax.tools javax.transaction 
+    javax.transaction.xa javax.xml javax.xml.bind javax.xml.bind.annotation javax.xml.bind.annotation.adapters javax.xml.bind.attachment 
+    javax.xml.bind.helpers javax.xml.bind.util javax.xml.crypto javax.xml.crypto.dom javax.xml.crypto.dsig javax.xml.crypto.dsig.dom 
+    javax.xml.crypto.dsig.keyinfo javax.xml.crypto.dsig.spec javax.xml.datatype javax.xml.namespace javax.xml.parsers javax.xml.soap javax.xml.stream 
+    javax.xml.stream.events javax.xml.stream.util javax.xml.transform javax.xml.transform.dom javax.xml.transform.sax javax.xml.transform.stax 
+    javax.xml.transform.stream javax.xml.validation javax.xml.ws javax.xml.ws.handler javax.xml.ws.handler.soap javax.xml.ws.http javax.xml.ws.soap 
+    javax.xml.ws.spi javax.xml.xpath org.ietf.jgss org.omg.CORBA org.omg.CORBA_2_3 org.omg.CORBA_2_3.portable org.omg.CORBA.DynAnyPackage 
+    org.omg.CORBA.ORBPackage org.omg.CORBA.portable org.omg.CORBA.TypeCodePackage org.omg.CosNaming org.omg.CosNaming.NamingContextExtPackage 
+    org.omg.CosNaming.NamingContextPackage org.omg.Dynamic org.omg.DynamicAny org.omg.DynamicAny.DynAnyFactoryPackage org.omg.DynamicAny.DynAnyPackage 
+    org.omg.IOP org.omg.IOP.CodecFactoryPackage org.omg.IOP.CodecPackage org.omg.Messaging org.omg.PortableInterceptor 
+    org.omg.PortableInterceptor.ORBInitInfoPackage org.omg.PortableServer org.omg.PortableServer.CurrentPackage org.omg.PortableServer.POAManagerPackage 
+    org.omg.PortableServer.POAPackage org.omg.PortableServer.portable org.omg.PortableServer.ServantLocatorPackage org.omg.SendingContext 
+    org.omg.stub.java.rmi org.w3c.dom org.w3c.dom.bootstrap org.w3c.dom.css org.w3c.dom.events org.w3c.dom.html org.w3c.dom.ls org.w3c.dom.ranges 
+    org.w3c.dom.stylesheets org.w3c.dom.traversal org.w3c.dom.views org.xml.sax org.xml.sax.ext org.xml.sax.helpers})
+    
+  JAVASE17 = ExecutionEnvironment.new("JavaSE-1.7", "Java SE 1.7.x (early access)", %w{javax.accessibility javax.activation javax.activity javax.annotation javax.annotation.processing 
+    javax.crypto javax.crypto.interfaces javax.crypto.spec javax.imageio javax.imageio.event javax.imageio.metadata javax.imageio.plugins.bmp 
+    javax.imageio.plugins.jpeg javax.imageio.spi javax.imageio.stream javax.jws javax.jws.soap javax.lang.model javax.lang.model.element javax.lang.model.type 
+    javax.lang.model.util javax.management javax.management.loading javax.management.modelmbean javax.management.monitor javax.management.openmbean 
+    javax.management.relation javax.management.remote javax.management.remote.rmi javax.management.timer javax.naming javax.naming.directory javax.naming.event 
+    javax.naming.ldap javax.naming.spi javax.net javax.net.ssl javax.print javax.print.attribute javax.print.attribute.standard javax.print.event javax.rmi 
+    javax.rmi.CORBA javax.rmi.ssl javax.script javax.security.auth javax.security.auth.callback javax.security.auth.kerberos javax.security.auth.login 
+    javax.security.auth.spi javax.security.auth.x500 javax.security.cert javax.security.sasl javax.sound.midi javax.sound.midi.spi javax.sound.sampled 
+    javax.sound.sampled.spi javax.sql javax.sql.rowset javax.sql.rowset.serial javax.sql.rowset.spi javax.swing javax.swing.border javax.swing.colorchooser 
+    javax.swing.event javax.swing.filechooser javax.swing.plaf javax.swing.plaf.basic javax.swing.plaf.metal javax.swing.plaf.multi javax.swing.plaf.synth 
+    javax.swing.table javax.swing.text javax.swing.text.html javax.swing.text.html.parser javax.swing.text.rtf javax.swing.tree javax.swing.undo javax.tools 
+    javax.transaction javax.transaction.xa javax.xml javax.xml.bind javax.xml.bind.annotation javax.xml.bind.annotation.adapters javax.xml.bind.attachment 
+    javax.xml.bind.helpers javax.xml.bind.util javax.xml.crypto javax.xml.crypto.dom javax.xml.crypto.dsig javax.xml.crypto.dsig.dom javax.xml.crypto.dsig.keyinfo 
+    javax.xml.crypto.dsig.spec javax.xml.datatype javax.xml.namespace javax.xml.parsers javax.xml.soap javax.xml.stream javax.xml.stream.events javax.xml.stream.util 
+    javax.xml.transform javax.xml.transform.dom javax.xml.transform.sax javax.xml.transform.stax javax.xml.transform.stream javax.xml.validation javax.xml.ws 
+    javax.xml.ws.handler javax.xml.ws.handler.soap javax.xml.ws.http javax.xml.ws.soap javax.xml.ws.spi javax.xml.xpath org.ietf.jgss org.omg.CORBA org.omg.CORBA_2_3 
+    org.omg.CORBA_2_3.portable org.omg.CORBA.DynAnyPackage org.omg.CORBA.ORBPackage org.omg.CORBA.portable org.omg.CORBA.TypeCodePackage org.omg.CosNaming 
+    org.omg.CosNaming.NamingContextExtPackage org.omg.CosNaming.NamingContextPackage org.omg.Dynamic org.omg.DynamicAny org.omg.DynamicAny.DynAnyFactoryPackage 
+    org.omg.DynamicAny.DynAnyPackage org.omg.IOP org.omg.IOP.CodecFactoryPackage org.omg.IOP.CodecPackage org.omg.Messaging org.omg.PortableInterceptor 
+    org.omg.PortableInterceptor.ORBInitInfoPackage org.omg.PortableServer org.omg.PortableServer.CurrentPackage org.omg.PortableServer.POAManagerPackage 
+    org.omg.PortableServer.POAPackage org.omg.PortableServer.portable org.omg.PortableServer.ServantLocatorPackage org.omg.SendingContext org.omg.stub.java.rmi 
+    org.w3c.dom org.w3c.dom.bootstrap org.w3c.dom.css org.w3c.dom.events org.w3c.dom.html org.w3c.dom.ls org.w3c.dom.ranges org.w3c.dom.stylesheets 
+    org.w3c.dom.traversal org.w3c.dom.views org.xml.sax org.xml.sax.ext org.xml.sax.helpers})
+  
+  OSGIMINIMUM10 = ExecutionEnvironment.new("OSGi/Minimum-1.0", "OSGi EE that is a minimal set that allows the implementation of an OSGi Framework", [])
+  OSGIMINIMUM11 = ExecutionEnvironment.new("OSGi/Minimum-1.1", "OSGi EE that is a minimal set that allows the implementation of an OSGi Framework", [])
+  OSGIMINIMUM12 = ExecutionEnvironment.new("OSGi/Minimum-1.2", "OSGi EE that is a minimal set that allows the implementation of an OSGi Framework", [])
+  
+  # The execution environment configuration class
+  # represents how to dispose of execution environments.
+  # The default execution environments are initialized in the constructor.
+  #
+  class ExecutionEnvironmentConfiguration
+    
+    attr_accessor :extra_packages, :execution_environment
+    
+    # Constructor
+    def initialize
+      @extra_packages = []
+      @available_ee = {}
+      
+      register_execution_environment(NONE)
+      register_execution_environment(CDC10FOUNDATION10)
+      register_execution_environment(CDC10FOUNDATION11)
+      register_execution_environment(J2SE12)
+      register_execution_environment(J2SE13)
+      register_execution_environment(J2SE14)
+      register_execution_environment(J2SE15)
+      register_execution_environment(JAVASE16)
+      register_execution_environment(JAVASE17)
+      register_execution_environment(OSGIMINIMUM10)
+      register_execution_environment(OSGIMINIMUM11)
+      register_execution_environment(OSGIMINIMUM12)
+      
+      @execution_environment = JAVASE16.name
+    end
+    
+    #
+    # Returns the current execution environment.
+    # By default we return JavaSE-1.6
+    #
+    def current_execution_environment
+      @available_ee[@execution_environment]
+    end
+    
+    # Registers an execution enviroment in the configuration.
+    # This method should be used to register additional execution environments using an extension.
+    # 
+    def register_execution_environment(ee)
+      raise "Cannot register this execution environment" unless ee.is_a? ExecutionEnvironment
+      available_ee[ee.name] = ee
+    end
+      
+    attr_accessor :available_ee
+    
+  end
+end

data/lib/buildr4osgi/osgi/library_extension.rb

@@ -103,6 +103,8 @@ module Buildr4OSGi #:nodoc:
     #
     def library_project(dependencies, group, name, version, options = {:exclude => ["META-INF/MANIFEST.MF"], :include => [], :manifest => {}})
       options[:manifest] ||= {} 
+      options[:include] ||= []
+      options[:exclude] ||= []
       deps_as_str = []
       # We create an object and we extend with the module so we can get access to the walk_libs method.
       walker = Object.new 
@@ -134,7 +136,18 @@ module Buildr4OSGi #:nodoc:
             walk_libs(#{deps_as_str}) {|lib|
               names << lib.to_spec 
               lib.invoke # make sure the artifact is present.
-              Zip::ZipFile.foreach(lib.to_s) {|entry| entries << entry.name.sub(/(.*)\\/.*.class$/, '\\1').gsub(/\\//, '.') if /.*\\.class$/.match(entry.name)}
+              Zip::ZipFile.foreach(lib.to_s) {|entry| 
+                if /.*\\.class$/.match(entry.name)
+                  add_to_entries = true
+                  [#{options[:exclude].inspect}].flatten.each {|excluded|
+                    add_to_entries &&= !entry.name.match(excluded)
+                  }
+                  [#{options[:include].inspect}].flatten.each {|included|
+                    add_to_entries &&= included.match(entry.name)
+                  }
+                  entries << entry.name.sub(/(.*)\\/.*.class$/, '\\1').gsub(/\\//, '.') if add_to_entries
+                end
+              }
             }
             lib_manifest = { 
               "Bundle-Version" => "#{version}",

data/lib/buildr4osgi/osgi/packaging_sources.rb

@@ -15,9 +15,13 @@
 
 module OSGi
   
+    # FIXME this code should not be here, it should not be under OSGi directly.
     # generate an Eclipse-SourceBundle manifest from the manifest of a runtime plugin
     # Assumes that there are no jars inside the runtime plugin.
     def self.create_source_bundle_manifest(pluginManifest)
+      if pluginManifest.is_a?(::Buildr::Packaging::Java::Manifest)
+        pluginManifest = pluginManifest.main
+      end
       #remove the properties after the sym-name such as ';singleton=true'
       bundleSymName = pluginManifest["Bundle-SymbolicName"].split(';').first
       bundleVersion = pluginManifest["Bundle-Version"]

data/lib/buildr4osgi/osgi/project_extension.rb

@@ -16,6 +16,11 @@
 # Methods added to Project for compiling, handling of resources and generating source documentation.
 module OSGi
   
+  MISSING = "missing"
+  
+  RESOLVED = {}
+    
+  
   module BundleCollector #:nodoc:
     
     attr_accessor :bundles, :projects, :project_dependencies
@@ -24,38 +29,56 @@ module OSGi
     # Returns them as a sorted array.
     #
     def collect(project)
+      info "** Collecting dependencies for #{project}"
       @bundles = []
       @projects = []
-      project.manifest_dependencies().each {|dep| _collect(dep, project)}
+      dependencies = project.manifest_dependencies().each {|dep| ; _collect(dep)}
+      @projects.delete project # Remove our own reference if it was added.
+      info "** Done collecting dependencies for #{project}"
+      return dependencies
     end
     
     # Collects the bundles associated with the bundle
     # 
-    def _collect(bundle, project)
+    def _collect(bundle)
       if bundle.is_a?(Bundle)
-        bundle = bundle.resolve(project)
-        unless bundle.nil?
+        unless ::OSGi::RESOLVED[bundle]
+          resolved = bundle.resolve
+          trace "Resolving #{bundle}: #{resolved}"
+          ::OSGi::RESOLVED[bundle] = resolved.nil? ? ::OSGi::MISSING : resolved
+        end
+        bundle = ::OSGi::RESOLVED[bundle]
+        unless bundle.nil? || bundle == ::OSGi::MISSING
           if bundle.is_a?(Buildr::Project)
             @projects << bundle
           elsif !(@bundles.include? bundle)
             @bundles << bundle
-            @bundles |= bundle.fragments(project)       
-            (bundle.bundles + bundle.imports).each {|b|
-              _collect(b, project)
+            @bundles |= bundle.fragments      
+            (bundle.bundles + bundle.imports).each {|import|
+              _collect import
             }
           end
         end
       elsif bundle.is_a?(BundlePackage)
-        bundle.resolve(project).each {|b| 
-          if b.is_a?(Buildr::Project)
-            @projects << b
-          elsif !(@bundles.include? b)
-            @bundles << b
-            (b.bundles + b.imports).each {|import|
-              _collect(import, project)  
-            }
-          end
-        }
+        unless ::OSGi::RESOLVED[bundle]
+          resolved = bundle.resolve
+          trace "Resolving #{bundle}: #{resolved}"
+          ::OSGi::RESOLVED[bundle] = (resolved.nil? || (resolved.is_a?(Array) && resolved.empty?)) ? ::OSGi::MISSING : resolved
+        end
+        bundle = ::OSGi::RESOLVED[bundle]
+        unless bundle.nil? || bundle == ::OSGi::MISSING
+          bundle.each {|b| 
+            if b.is_a?(Buildr::Project)
+              @projects << b
+            elsif !(@bundles.include? b)
+              @bundles << b
+              @bundles |= b.fragments  
+              (b.bundles + b.imports).each {|import|
+                _collect import  
+              }
+            end
+          }
+        end
       elsif bundle.is_a?(Buildr::Project)
         @projects << bundle
       end
@@ -85,8 +108,12 @@ module OSGi
         
         dependencies = ::OSGi::Dependencies.new(project)
         dependencies.write(_projects.keys) {|hash, p|
-          hash[p]["dependencies"] |= _dependencies[p]
-          hash[p]["projects"] |= _projects[p]
+          unless _dependencies[p].nil?
+            hash[p]["dependencies"] = _dependencies[p]
+          end
+          unless _projects[p].nil?
+            hash[p]["projects"] = _projects[p]
+          end
         }
       end
     end
@@ -204,7 +231,19 @@ module OSGi
     # returns an array of the dependencies of the plugin, read from the manifest.
     def manifest_dependencies()
       as_bundle = Bundle.fromProject(self)
-      as_bundle.nil? ? [] : as_bundle.bundles.collect{|b| b.resolve(self)}.compact + as_bundle.imports.collect {|i| i.resolve(self)}.flatten
+      as_bundle.nil? ? [] : as_bundle.bundles.collect{|b| b.resolve}.compact + as_bundle.imports.collect {|i| i.resolve}.flatten
+    end
+    
+    # Returns the EE defined in the manifest if present.
+    def execution_environments()   
+      # Code copied straight from Bundle.fromProject
+      packaging = project.packages.select {|package| package.is_a?(BundlePackaging)}
+      raise "More than one bundle packaging is defined over the project #{project.id}, see BOSGI-16." if packaging.size > 1
+      return nil if packaging.empty?   
+      m = ::Buildr::Packaging::Java::Manifest.new(File.exists?("META-INF/MANIFEST.MF") ? File.read("META-INF/MANIFEST.MF") : nil) 
+      m.main.merge!(manifest)
+      m.main.merge!(packaging.first.manifest)
+      (Manifest.read(m.to_s).first["Bundle-RequiredExecutionEnvironment"] || {}).keys.compact.flatten.collect {|ee| OSGi.options.available_ee[ee]}
     end
     
   end