buildr4osgi 0.9.4 → 0.9.5

data/buildr4osgi.gemspec

@@ -16,7 +16,7 @@
 
 Gem::Specification.new do |spec|
   spec.name           = 'buildr4osgi'
-  spec.version        = '0.9.4'
+  spec.version        = '0.9.5'
   spec.author         = 'Antoine Toulme'
   spec.email          = "atoulme@intalio.com"
   spec.homepage       = "http://buildr.apache.org/"

data/lib/buildr4osgi/eclipse/p2.rb

@@ -37,21 +37,24 @@ module Buildr4OSGi
         super
         
         enhance do |p2_task|
-          fail "The p2 task needs to be associated with a site " unless site
-          p2_task.enhance [site]
+          if @site.nil?
+            @site = project.package(:site)
+          end
+          fail "The p2 task needs to be associated with a site " if @site.nil?
+          p2_task.enhance [@site]
           #add a prerequisite to the list of prerequisites, gives a chance
           #for other prerequisites to be placed before this block is executed.
           p2_task.enhance do 
             targetP2Repo = File.join(project.base_dir, "target", "p2repository")
             mkpath targetP2Repo
-            Buildr::unzip(targetP2Repo=>project.package(:site).to_s).extract
+            Buildr::unzip(targetP2Repo=>@site.to_s).extract
             eclipseSDK = Buildr::artifact("org.eclipse:eclipse-SDK:zip:3.6M3-win32")
             eclipseSDK.invoke
             Buildr::unzip(File.dirname(eclipseSDK.to_s) => eclipseSDK.to_s).extract
 
             launcherPlugin = Dir.glob("#{File.dirname(eclipseSDK.to_s)}/eclipse/plugins/org.eclipse.equinox.launcher_*")[0]
 
-            cmdline <<-CMD
+            cmdline = <<-CMD
             java -jar #{launcherPlugin} -application org.eclipse.equinox.p2.publisher.UpdateSitePublisher
             -metadataRepository file:#{targetP2Repo} 
             -artifactRepository file:#{targetP2Repo}
@@ -63,7 +66,7 @@ module Buildr4OSGi
             -clean -consoleLog
             CMD
             info "Invoking P2's metadata generation: #{cmdline}"
-            system cmdline
+            system cmdline.gsub(/\n/, "").gsub(/\s+/, " ")
 
             include targetP2Repo, :as => "."
           end

data/lib/buildr4osgi/osgi/packaging.rb

@@ -127,7 +127,7 @@ module OSGi
         unless @libs.nil? || @libs.empty?
           artifacts = Buildr.artifacts(@libs)
           path('lib').include artifacts
-          manifest["Bundle-Classpath"] = [".", artifacts.collect {|a| "lib/#{File.basename(a.to_s)}"}].flatten.join(",")
+          manifest["Bundle-ClassPath"] = [".", artifacts.collect {|a| "lib/#{File.basename(a.to_s)}"}].flatten.join(",")
           
         end
       end
@@ -275,8 +275,8 @@ module OSGi
         manifest["Bundle-SymbolicName"] ||= self.name.split(":").last # if it was resetted to nil, we force the id to be added back.
         
         plugin.with :manifest=> manifest, :meta_inf=>meta_inf
-        unless manifest["Bundle-Classpath"].nil? || compile.target.nil?
-          entry = manifest["Bundle-Classpath"].split(",").first
+        unless manifest["Bundle-ClassPath"].nil? || compile.target.nil?
+          entry = manifest["Bundle-ClassPath"].split(",").first
           plugin.path(entry).include compile.target, :as=>'.'
           plugin.path(entry).include properties.target, :as=>'.' unless properties.target.nil?
           plugin.with [resources.target, p_r.target].compact

data/lib/buildr4osgi/osgi/packaging_sources.rb

@@ -28,7 +28,7 @@ module OSGi
       sourcesManifest = ::Buildr::Packaging::Java::Manifest.new(nil)
       sourcesManifest.main["Bundle-ManifestVersion"] = "2"
       sourcesManifest.main["Eclipse-SourceBundle"] = "#{bundleSymName};version=\"#{bundleVersion}\";roots:=\".\""
-      sourcesManifest.main["Bundle-SymbolicName"] = bundleSymName + ".sources"
+      sourcesManifest.main["Bundle-SymbolicName"] = bundleSymName + ".source"
       sourcesManifest.main["Bundle-Name"] += " sources" if sourcesManifest.main["Bundle-Name"] 
       sourcesManifest.main["Bundle-Version"] = bundleVersion
       sourcesManifest.main["Bundle-Vendor"] = pluginManifest["Bundle-Vendor"] unless pluginManifest["Bundle-Vendor"].nil?

data/lib/buildr4osgi/osgi/project_extension.rb

@@ -185,7 +185,7 @@ module OSGi
             if local
               artifact = Buildr::artifact(bundle.to_s)
               installed = Buildr.repositories.locate(artifact)
-              rm_r installed
+              rm_rf installed
               mkpath File.dirname(installed)
               Buildr::artifact(bundle.to_s).from(bundle.file).install
               info "Installed #{installed}"

data/lib/buildr4osgi.rb

@@ -15,7 +15,6 @@
 
 require 'buildr4osgi/osgi'
 require 'buildr4osgi/eclipse'
-require 'buildr4osgi/compile'
 
 # Methods defined in Buildr4OSGi are both instance methods (e.g. when included in Project)
 # and class methods when invoked like Buildr4OSGi.project_library(SLF4J, "group", "foo", "1.0.0").

data/spec/osgi/packaging_spec.rb

@@ -302,7 +302,7 @@ describe OSGi::BundleTask, "with packaging libs" do
     end
   end
   
-  it "should add the libraries to the Bundle-Classpath" do
+  it "should add the libraries to the Bundle-ClassPath" do
     foo = define("foo", :version => "1.0.0") do
       compile.using :target=>'1.5'
       package(:plugin).libs << SLF4J[0]
@@ -311,7 +311,7 @@ describe OSGi::BundleTask, "with packaging libs" do
     foo.package(:plugin).invoke
     Zip::ZipFile.open(foo.package(:plugin).to_s) do |zip|
       zip.find_entry("META-INF/MANIFEST.MF").should_not be_nil
-      zip.read("META-INF/MANIFEST.MF").should match(/Bundle-Classpath: \.,lib\/slf4j-api-1\.5\.8\.jar/)
+      zip.read("META-INF/MANIFEST.MF").should match(/Bundle-ClassPath: \.,lib\/slf4j-api-1\.5\.8\.jar/)
     end
   end
   
@@ -369,8 +369,8 @@ describe OSGi::BundleTask, "with existing manifests" do
     
   end
   
-  it "should use the Bundle-Classpath entry whenever present to determine the classpath" do
-    Buildr::write "META-INF/MANIFEST.MF", "Bundle-SymbolicName: dev\nExport-Package: package1,\n package2\nBundle-Version: 1.0.0\nBundle-Classpath: WEB-INF/classes"
+  it "should use the Bundle-ClassPath entry whenever present to determine the classpath" do
+    Buildr::write "META-INF/MANIFEST.MF", "Bundle-SymbolicName: dev\nExport-Package: package1,\n package2\nBundle-Version: 1.0.0\nBundle-ClassPath: WEB-INF/classes"
     Buildr::write "src/main/java/Hello.java", "public class Hello {}"
     
     foo = define("foo", :version => "1.0.0.qualifier") do
@@ -384,8 +384,8 @@ describe OSGi::BundleTask, "with existing manifests" do
     
   end
   
-  it "should use the _first_ Bundle-Classpath entry whenever present to determine the classpath" do
-    Buildr::write "META-INF/MANIFEST.MF", "Bundle-SymbolicName: dev\nExport-Package: package1,\n package2\nBundle-Version: 1.0.0\nBundle-Classpath: WEB-INF/classes,else"
+  it "should use the _first_ Bundle-ClassPath entry whenever present to determine the classpath" do
+    Buildr::write "META-INF/MANIFEST.MF", "Bundle-SymbolicName: dev\nExport-Package: package1,\n package2\nBundle-Version: 1.0.0\nBundle-ClassPath: WEB-INF/classes,else"
     Buildr::write "src/main/java/Hello.java", "public class Hello {}"
     
     foo = define("foo", :version => "1.0.0.qualifier") do

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: buildr4osgi
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  hash: 49
+  prerelease: false
+  segments: 
+  - 0
+  - 9
+  - 5
+  version: 0.9.5
 platform: ruby
 authors: 
 - Antoine Toulme
@@ -9,19 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-11 00:00:00 -07:00
+date: 2010-09-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: manifest
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 0
+        - 8
         version: 0.0.8
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: |
   A plugin for adding OSGi support to Buildr. Ever dreamt you could resolve your OSGi dependencies ?
 
@@ -35,10 +47,6 @@ extra_rdoc_files:
 - LICENSE
 - NOTICE
 files: 
-- lib/buildr4osgi/compile/compiler.rb
-- lib/buildr4osgi/compile/ecj-3.4.1.jar
-- lib/buildr4osgi/compile/external.rb
-- lib/buildr4osgi/compile.rb
 - lib/buildr4osgi/eclipse/feature.rb
 - lib/buildr4osgi/eclipse/p2.rb
 - lib/buildr4osgi/eclipse/plugin.rb
@@ -68,8 +76,6 @@ files:
 - rakelib/rspec.rake
 - rakelib/setup.rake
 - rakelib/stage.rake
-- spec/compile/compiler_spec.rb
-- spec/compile/external_spec.rb
 - spec/eclipse/feature_spec.rb
 - spec/eclipse/p2_spec.rb
 - spec/eclipse/site_spec.rb
@@ -126,21 +132,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A plugin for adding OSGi support to Buildr.

data/lib/buildr4osgi/compile/compiler.rb

@@ -1,70 +0,0 @@
-# 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 Buildr4OSGi
-  module CompilerSupport
-    class OSGiC < Buildr::Compiler::Javac
-      
-      CURRENT_JDT_COMPILER = '3.4.1'
-      OPTIONS = [:warnings, :debug, :deprecation, :source, :target, :lint, :other]
-    
-      specify :language=>:java, :sources => 'java', :source_ext => 'java',
-              :target=>'classes', :target_ext=>'class', :packaging=>:jar
-              
-              
-      def compile(sources, target, dependencies) #:nodoc:
-        check_options options, OPTIONS
-        cmd_args = []
-        cmd_args << '-classpath' << dependencies.join(File::PATH_SEPARATOR) unless dependencies.empty?
-        source_paths = sources.select { |source| File.directory?(source) }
-        cmd_args << '-sourcepath' << source_paths.join(File::PATH_SEPARATOR) unless source_paths.empty?
-        cmd_args << '-d' << File.expand_path(target)
-        cmd_args += osgic_args
-        cmd_args += files_from_sources(sources)
-        unless Buildr.application.options.dryrun
-          trace((%w[java -classpath org.eclipse.jdt.internal.compiler.batch.Main] + cmd_args).join(' '))
-          Java.load
-          Java.org.eclipse.jdt.internal.compiler.batch.Main.compile(cmd_args.join(" ")) or
-              fail 'Failed to compile, see errors above'
-        end
-      end
-
-      private
-      
-      # See arg list here: http://publib.boulder.ibm.com/infocenter/rsahelp/v7r0m0/index.jsp?topic=/org.eclipse.jdt.doc.isv/guide/jdt_api_compile.htm
-      def osgic_args #:nodoc:
-        args = []  
-        args << '-warn:none' unless options[:warnings]
-        args << '-verbose' if Buildr.application.options.trace
-        args << '-g' if options[:debug]
-        args << '-deprecation' if options[:deprecation]
-        args << '-source' << options[:source].to_s if options[:source]
-        args << '-target' << options[:target].to_s if options[:target]
-        case options[:lint]
-        when Array  then args << "-Xlint:#{options[:lint].join(',')}"
-        when String then args << "-Xlint:#{options[:lint]}"
-        when true   then args << '-Xlint'
-        end
-        args + Array(options[:other])
-      end
-      
-    end
-    
-  end
-end
-
-Java.classpath << File.expand_path(File.join(File.dirname(__FILE__), "ecj-#{Buildr4OSGi::CompilerSupport::OSGiC::CURRENT_JDT_COMPILER}.jar"))
-
-Buildr::Compiler.compilers.unshift Buildr4OSGi::CompilerSupport::OSGiC

data/lib/buildr4osgi/compile/external.rb

@@ -1,73 +0,0 @@
-# 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.
-
-# We use an external compiler defined by ENV['EXTERNAL_COMPILER']
-module Buildr4OSGi
-  module CompilerSupport
-    class ExternalC < Buildr::Compiler::Javac
-      
-      OPTIONS = [:warnings, :debug, :deprecation, :source, :target, :lint, :other]
-    
-      specify :language=>:java, :sources => 'java', :source_ext => 'java',
-              :target=>'classes', :target_ext=>'class', :packaging=>:jar
-              
-              
-      def compile(sources, target, dependencies) #:nodoc:
-        check_options options, OPTIONS
-        cmd_args = []
-        cmd_args << '-classpath' << dependencies.join(File::PATH_SEPARATOR) unless dependencies.empty?
-        source_paths = sources.select { |source| File.directory?(source) }
-        cmd_args << '-sourcepath' << source_paths.join(File::PATH_SEPARATOR) unless source_paths.empty?
-        cmd_args << '-d' << File.expand_path(target)
-        cmd_args += externalc_args
-        Tempfile.open("external") {|tmp|
-          tmp.write files_from_sources(sources).join(' ')
-          cmd_args << "@#{tmp.path}"
-        }
-        unless Buildr.application.options.dryrun
-          fail "ENV['EXTERNAL_COMPILER'] is not defined" if ENV['EXTERNAL_COMPILER'].nil?
-          javac_path = File.join(ENV['EXTERNAL_COMPILER'], "bin", "javac")
-          final_args = cmd_args.insert(0, javac_path).push('2>&1').join(' ')
-          trace(final_args)
-          info %x[#{final_args}]
-          fail 'Failed to compile, see errors above' unless $?.success?
-        end
-      end
-
-      private
-      
-      # See arg list here: http://publib.boulder.ibm.com/infocenter/rsahelp/v7r0m0/index.jsp?topic=/org.eclipse.jdt.doc.isv/guide/jdt_api_compile.htm
-      def externalc_args #:nodoc:
-        args = []  
-        args << '-nowarn' unless options[:warnings]
-        args << '-verbose' if Buildr.application.options.trace
-        args << '-g' if options[:debug]
-        args << '-deprecation' if options[:deprecation]
-        args << '-source' << options[:source].to_s if options[:source]
-        args << '-target' << options[:target].to_s if options[:target]
-        case options[:lint]
-        when Array  then args << "-Xlint:#{options[:lint].join(',')}"
-        when String then args << "-Xlint:#{options[:lint]}"
-        when true   then args << '-Xlint'
-        end
-        args + Array(options[:other])
-      end
-      
-    end
-    
-  end
-end
-
-Buildr::Compiler.compilers << Buildr4OSGi::CompilerSupport::ExternalC

data/lib/buildr4osgi/compile.rb

@@ -1,17 +0,0 @@
-# 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 'buildr4osgi/compile/compiler'
-require 'buildr4osgi/compile/external'

data/spec/compile/compiler_spec.rb

@@ -1,62 +0,0 @@
-# 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 Buildr4OSGi::CompilerSupport::OSGiC do
-  describe "should compile a Java project just in the same way javac does" do  
-    javac_spec = File.read(File.join(File.dirname(__FILE__), "..", "..", "buildr", "spec", "java", "compiler_spec.rb"))
-    javac_spec = javac_spec.match(Regexp.escape("require File.join(File.dirname(__FILE__), '../spec_helpers')\n")).post_match
-    javac_spec.gsub!("javac", "osgic")
-    javac_spec.gsub!("nowarn", "warn:none")
-    eval(javac_spec)
-  end
-  
-  # Redirect the java error ouput, yielding so you can do something while it is
-  # and returning the content of the error buffer.
-  #
-  def redirect_java_err
-    byteArray = Rjb::import('java.io.ByteArrayOutputStream')
-    printStream = Rjb::import('java.io.PrintStream')
-    err = byteArray.new()
-    Rjb::import('java.lang.System').err = printStream.new(err)
-    yield
-    err.toString
-  end
-  
-  it "should not issue warnings for type casting when warnings are set to warn:none" do
-    write "src/main/java/Main.java", "import java.util.List; public class Main {public List get() {return null;}}"
-    foo = define("foo") {
-      compile.options.source = "1.5"
-      compile.options.target = "1.5"
-    }
-    redirect_java_err { foo.compile.invoke }.should_not match(/WARNING/)
-  end
-  
-  it "should not issue warnings for type casting when warnings are set to warn:none" do
-    write "src/main/java/Main.java", "import java.util.List; public class Main {public List get() {return null;}}"
-    foo = define("foo") {
-      compile.options.source = "1.5"
-      compile.options.target = "1.5"
-      compile.options.warnings = true
-    }
-    redirect_java_err { foo.compile.invoke }.should match(/WARNING/)
-  end
-  
-  
-end
-
-

data/spec/compile/external_spec.rb

@@ -1,41 +0,0 @@
-# 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 Buildr4OSGi::CompilerSupport::ExternalC do
-  
-  before :all do
-    Buildr::Compiler.compilers.delete Buildr::Compiler::Javac
-    Buildr::Compiler.compilers.delete Buildr4OSGi::CompilerSupport::OSGiC
-    raise "ENV['EXTERNAL_COMPILER'] is not defined !" unless ENV['EXTERNAL_COMPILER']
-  end
-  
-  describe "should compile a Java project just in the same way javac does" do  
-    javac_spec = File.read(File.join(File.dirname(__FILE__), "..", "..", "buildr", "spec", "java", "compiler_spec.rb"))
-    javac_spec = javac_spec.match(Regexp.escape("require File.join(File.dirname(__FILE__), '../spec_helpers')\n")).post_match
-    javac_spec.gsub!("javac", "externalc")
-    eval(javac_spec)
-  end
-  
-  after :all do
-    Buildr::Compiler.compilers << Buildr::Compiler::Javac
-    Buildr::Compiler.compilers.unshift Buildr4OSGi::CompilerSupport::OSGiC
-  end
-  
-end
-
-