Rakefile in jetty-6.1.18.1 vs Rakefile in jetty-6.1.19.1

- old
+ new

@@ -21,21 +21,20 @@ require 'hoe' $LOAD_PATH << './lib' require 'jetty/base' -JARS = %w{ jetty jetty-util jetty-rewrite-handler }.map do |n| - "#{n}-#{ Jetty::JETTY_VERSION }.jar" +JARS = %w{ jetty jetty-util jetty-rewrite-handler }.map do |n| + "#{n}-#{ Jetty::JETTY_VERSION }.jar" end JARS << "servlet-api-#{ Jetty::SERVLET_API_VERSION }-#{ Jetty::SERVLET_API_DATE }.jar" JARS << 'gravitext-testservlets-1.0.jar' JAR_FILES = JARS.map { |jar| "lib/jetty/#{jar}" } - desc "Update the Manifest with actual jars" task :manifest do - out = File.new( 'Manifest.txt', 'w' ) + out = File.new( 'Manifest.txt', 'w' ) begin out.write <<END History.txt Manifest.txt README.txt @@ -61,13 +60,13 @@ end end ASSEMBLY = "target/gravitext-testservlets-1.0-bin.dir" -file 'webapps/test.war' => [ 'webapps/test/index.html', +file 'webapps/test.war' => [ 'webapps/test/index.html', 'webapps/test/WEB-INF/web.xml' ] do - sh( 'jar cvf webapps/test.war ' + + sh( 'jar cvf webapps/test.war ' + '-C webapps/test index.html -C webapps/test WEB-INF/web.xml' ) end file ASSEMBLY => [ 'pom.xml', 'assembly.xml' ] do sh( 'mvn package' ) @@ -83,10 +82,10 @@ task :mvn_clean do rm_f( JAR_FILES + [ 'webapps/test.war' ] ) sh( 'mvn clean' ) end -task :clean => :mvn_clean +task :clean => :mvn_clean task :tag do tag = "jetty-#{Jetty::VERSION}" dname = File.dirname( __FILE__ ) dname = '.' if Dir.getwd == dname