Changed version number to 1.0.0.003

Buildfile

@@ -1,10 +1,8 @@
-require "buildr4osgi"
-
 require File.join(File.dirname(__FILE__), "repositories.rb")
 require File.join(File.dirname(__FILE__), "dependencies.rb")
 
 # Keep this structure to allow the build system to update version numbers.
-VERSION_NUMBER = "1.0.0.1"
+VERSION_NUMBER = "1.0.0.003"
 
 
 # Shorten expressions
@@ -24,24 +22,32 @@ define "cappuccino" do
   file(_("target/Frameworks")).enhance do
     mkdir_p "target/Frameworks/Debug"
         system <<-BASH
-    export BUILD_PATH="target/Build"
-    jake debug release
-    BASH
+export BUILD_PATH="target/Build"
+jake debug release
+BASH
 
-        cp_r "target/Build/Release/AppKit", "target/Frameworks/"
-        cp_r "target/Build/Release/Foundation", "target/Frameworks/"
-        cp_r "target/Build/Release/Objective-J", "target/Frameworks/"
-        cp_r "target/Build/Debug/AppKit", "target/Frameworks/Debug/"
-        cp_r "target/Build/Debug/Foundation", "target/Frameworks/Debug/"
-        cp_r "target/Build/Debug/Objective-J", "target/Frameworks/Debug/"
+    cp_r "target/Build/Release/AppKit", "target/Frameworks/"
+    cp_r "target/Build/Release/Foundation", "target/Frameworks/"
+    cp_r "target/Build/Release/Objective-J", "target/Frameworks/"
+    cp_r "target/Build/Debug/AppKit", "target/Frameworks/Debug/"
+    cp_r "target/Build/Debug/Foundation", "target/Frameworks/Debug/"
+    cp_r "target/Build/Debug/Objective-J", "target/Frameworks/Debug/"
   end
 
   # file(_("target/Build")).enhance do
   # end
-  package(:bundle).include _("target/patch"), :as => "patch"
-  package(:bundle).include _("target/Frameworks"), :as => "content/Frameworks"
-  package(:bundle).include _("build.properties"), :as => "build.properties"
-  package(:bundle).meta_inf << file('META-INF/web-fragment.xml')
+  read_m = ::Buildr::Packaging::Java::Manifest.parse(File.read(_("META-INF/MANIFEST.MF"))).main
+  read_m["Copyright"]="Intalio, Inc 2011"
+  read_m["Bundle-Version"]=VERSION_NUMBER.gsub(/SNAPSHOT/, "#{Time.now.to_i}")
+  read_m.delete("Jetty-WarFragmentFolderPath")
+  read_m.delete("Jetty-WarPatchFragmentFolderPath")
+  package(:jar).with :manifest => read_m
+  #package(:jar).include _("target/patch"), :as => "patch"
+  package(:jar).include _("target/Frameworks"), :as => "META-INF/resources/Frameworks"
+  
+  #do not include those: they are at best not read harmful.
+  #package(:bundle).include _("build.properties"), :as => "build.properties"
+  #package(:bundle).meta_inf << file('META-INF/web-fragment.xml')
 
 end
 

Gemfile

@@ -0,0 +1,25 @@
+source "http://rubygems.org"
+
+gem "atoulme-Antwrap", "0.7.1" # -java
+gem "bouncy-castle-java", "1.5.0146.1"
+gem "builder", "2.1.2"
+gem "buildr", "1.4.5" # -java
+gem "buildr4osgi", "0.9.6"
+gem "bundler", "1.0.0.rc.5"
+gem "diff-lcs", "1.1.2"
+gem "highline", "1.5.1"
+gem "hoe", "2.3.3"
+gem "jruby-openssl", "0.7.4"
+gem "json_pure", "1.4.3"
+gem "manifest", "0.0.8"
+gem "minitar", "0.5.3"
+gem "net-sftp", "2.0.4"
+gem "net-ssh", "2.0.23" # 2.1.4
+gem "rake", "0.8.7" # 0.9.1
+gem "rspec", "2.1.0"
+gem "rspec-core", "2.1.0"
+gem "rspec-expectations", "2.1.0"
+gem "rspec-mocks", "2.1.0"
+gem "rubyforge", "2.0.3"
+gem "rubyzip", "0.9.4"
+gem "xml-simple", "1.0.12"

Gemfile.lock

@@ -0,0 +1,81 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    atoulme-Antwrap (0.7.1-java)
+    bouncy-castle-java (1.5.0146.1)
+    builder (2.1.2)
+    buildr (1.4.5-java)
+      atoulme-Antwrap (= 0.7.1)
+      builder (= 2.1.2)
+      diff-lcs (= 1.1.2)
+      highline (= 1.5.1)
+      hoe (= 2.3.3)
+      jruby-openssl (>= 0.7)
+      json_pure (= 1.4.3)
+      minitar (= 0.5.3)
+      net-sftp (= 2.0.4)
+      net-ssh (= 2.0.23)
+      rake (= 0.8.7)
+      rspec (= 2.1.0)
+      rspec-core (= 2.1.0)
+      rspec-expectations (= 2.1.0)
+      rspec-mocks (= 2.1.0)
+      rubyforge (= 2.0.3)
+      rubyzip (= 0.9.4)
+      xml-simple (= 1.0.12)
+    buildr4osgi (0.9.6)
+      manifest (= 0.0.8)
+    diff-lcs (1.1.2)
+    highline (1.5.1)
+    hoe (2.3.3)
+      rake (>= 0.8.7)
+      rubyforge (>= 1.0.4)
+    jruby-openssl (0.7.4)
+      bouncy-castle-java
+    json_pure (1.4.3)
+    manifest (0.0.8)
+    minitar (0.5.3)
+    net-sftp (2.0.4)
+      net-ssh (>= 2.0.9)
+    net-ssh (2.0.23)
+    rake (0.8.7)
+    rspec (2.1.0)
+      rspec-core (~> 2.1.0)
+      rspec-expectations (~> 2.1.0)
+      rspec-mocks (~> 2.1.0)
+    rspec-core (2.1.0)
+    rspec-expectations (2.1.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.1.0)
+    rubyforge (2.0.3)
+      json_pure (>= 1.1.7)
+    rubyzip (0.9.4)
+    xml-simple (1.0.12)
+
+PLATFORMS
+  java
+
+DEPENDENCIES
+  atoulme-Antwrap (= 0.7.1)
+  bouncy-castle-java (= 1.5.0146.1)
+  builder (= 2.1.2)
+  buildr (= 1.4.5)
+  buildr4osgi (= 0.9.6)
+  bundler (= 1.0.0.rc.5)
+  diff-lcs (= 1.1.2)
+  highline (= 1.5.1)
+  hoe (= 2.3.3)
+  jruby-openssl (= 0.7.4)
+  json_pure (= 1.4.3)
+  manifest (= 0.0.8)
+  minitar (= 0.5.3)
+  net-sftp (= 2.0.4)
+  net-ssh (= 2.0.23)
+  rake (= 0.8.7)
+  rspec (= 2.1.0)
+  rspec-core (= 2.1.0)
+  rspec-expectations (= 2.1.0)
+  rspec-mocks (= 2.1.0)
+  rubyforge (= 2.0.3)
+  rubyzip (= 0.9.4)
+  xml-simple (= 1.0.12)

META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: cappuccinofrag
 Bundle-SymbolicName: com.intalio.cloud.cappuccino
 Fragment-Host: com.intalio.cloud.carbon
-Jetty-WarFragmentFolderPath: /content
-Jetty-WarPatchFragmentFolderPath: /patch
+Jetty-WarPatchFragmentFolderPath: /
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Eclipse-BundleShape: dir

META-INF/web-fragment.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<web-fragment 
-   xmlns="http://java.sun.com/xml/ns/javaee" 
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-   metadata-complete="false"
-   version="3.0">
-  <servlet>
-    <servlet-name>cappuccino-fragment</servlet-name>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>cappuccino-fragment</servlet-name>
-    <url-pattern>/carbon</url-pattern>
-  </servlet-mapping>
-   
-</web-fragment>