bee_java 0.0.2 → 0.0.3

data/egg/servlet/tomcat.yml

@@ -0,0 +1,57 @@
+- build:       tomcat
+  description: Build file to manage Tomcat
+
+- properties:
+    # installation directory
+    tomcat_home:   ~
+    # starting script
+    tomcat_script: "#{tomcat_home}/bin/catalina.sh"
+    # the catalina base to use
+    tomcat_base:   "#{base}/tomcat"
+    # command line options
+    tomcat_opts:   "-Xms64m -Xmx256m -XX:MaxPermSize=64m"
+    # environment variables to set
+    tomcat_env:    |
+      export CATALINA_HOME="#{tomcat_home}"
+      export CATALINA_BASE="#{tomcat_base}"
+      export CATALINA_OPTS="#{tomcat_opts}"
+
+- target:      tomcat_check
+  description: Check that Tomcat home is set
+  script:
+  - if: "!defined?(tomcat_home)"
+    then:
+    - raise: "You must set property 'tomcat_home' in 'tomcat.yml' build file"
+
+- target:      tomcat_start
+  depends:     tomcat_check
+  description: Start Tomcat server
+  script:
+  - print: "Starting Tomcat..."
+  - |
+    #{tomcat_env}
+    #{tomcat_script} start
+
+- target:      tomcat_stop
+  depends:     tomcat_check
+  description: Stop Tomcat server
+  script:
+  - print: "Stopping Tomcat..."
+  - |
+    #{tomcat_env}
+    #{tomcat_script} stop -force
+
+- target:      tomcat_restart
+  depends:     tomcat_check
+  description: Restart Tomcat server
+  script:
+  - print: "Stopping Tomcat..."
+  - |
+    #{tomcat_env}
+    #{tomcat_script} stop -force
+  - sleep: 3
+  - print: "Starting Tomcat..."
+  - |
+    #{tomcat_env}
+    #{tomcat_script} start
+

data/egg/servlet/web.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.4" 
+         xmlns="http://java.sun.com/xml/ns/j2ee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+  <display-name><%= name.capitalize %></display-name>
+
+  <servlet>
+    <servlet-name><%= name %></servlet-name>
+    <servlet-class><%= main %></servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name><%= name %></servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+
+</web-app>

data/egg/servlet.yml

@@ -0,0 +1,111 @@
+# Copyright 2008-2009 Michel Casabianca <michel.casabianca@gmail.com>
+#
+# Licensed 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.
+
+- build:       servlet
+  default:     all
+  description: Generate a Java project for a servlet
+
+- properties:
+    name:        hello
+    main:        hello.World
+    description: |
+      This script will create Java project for a servlet. Type 'bee -b' to
+      list targets in generated project.
+
+- target:      welcome
+  description: Print information message
+  script:
+  - print: :description
+
+- target:      prompt
+  depends:     welcome
+  description: Prompt for project information
+  script:
+  - print: "Please answer following questions to generate the project:"
+  - prompt:
+      message: "What is the project name?"
+      default: :name
+      property: name
+  - prompt:
+      message: "What is the servlet main class?"
+      default: :main
+      property: main
+
+- target:      generate
+  depends:     prompt
+  description: Generate project
+  script:
+  - print: "Generating project..."
+  - rb: |
+      error "A directory named '#{name}' already exists, aborting" if
+        File.exists?("#{here}/#{name}")
+      _package_dir = File.dirname(main.gsub(/\./,'/'))
+      _package     = _package_dir.gsub(/\//, '.')
+      _main_class  = File.basename(main.gsub(/\./,'/'))
+      _test_class  = "#{_main_class}Test"
+  - mkdir: "#{here}/#{name}/src/#{_package_dir}"
+  - erb:
+      src:  "#{base}/servlet/Servlet.java"
+      dest: "#{here}/#{name}/src/#{_package_dir}/#{_main_class}.java"
+  - mkdir: "#{here}/#{name}/test/#{_package_dir}"
+  - erb:
+      src:  "#{base}/servlet/ServletTest.java"
+      dest: "#{here}/#{name}/test/#{_package_dir}/#{_test_class}.java"
+  - erb:
+      src:  "#{base}/servlet/build.yml"
+      dest: "#{here}/#{name}/build.yml"
+  - cp:
+      src:  "#{base}/servlet/dependencies.yml"
+      dest: "#{here}/#{name}/dependencies.yml"
+  - cp:
+      src:  "#{base}/servlet/tomcat.yml"
+      dest: "#{here}/#{name}/tomcat.yml"
+  - mkdir: "#{here}/#{name}/web"
+  - mkdir: "#{here}/#{name}/web/META-INF"
+  - mkdir: "#{here}/#{name}/web/WEB-INF"
+  - erb:
+      src:  "#{base}/servlet/MANIFEST.MF"
+      dest: "#{here}/#{name}/web/META-INF/MANIFEST.MF"
+  - erb:
+      src:  "#{base}/servlet/web.xml"
+      dest: "#{here}/#{name}/web/WEB-INF/web.xml"
+  - mkdir: "#{here}/#{name}/tomcat"
+  - mkdir: "#{here}/#{name}/tomcat/conf"
+  - mkdir: "#{here}/#{name}/tomcat/logs"
+  - mkdir: "#{here}/#{name}/tomcat/temp"
+  - mkdir: "#{here}/#{name}/tomcat/webapps"
+  - mkdir: "#{here}/#{name}/tomcat/work"
+  - erb:
+      src:  "#{base}/servlet/tomcat-server.xml"
+      dest: "#{here}/#{name}/tomcat/conf/server.xml"
+  - cp:
+      src:  "#{base}/servlet/tomcat-users.xml"
+      dest: "#{here}/#{name}/tomcat/conf/tomcat-users.xml"
+  - cp:
+      src:  "#{base}/servlet/tomcat-web.xml"
+      dest: "#{here}/#{name}/tomcat/conf/web.xml"
+
+- target:      customization
+  depends:     generate
+  description: Print information about project customization
+  script:
+  - print: |
+      Project has been generated in directory '#{name}'. Type 'bee -b' to
+      print information about generated build file. Please edit 'tomcat.yml'
+      build file to set correct value for property 'tomcat_home' (that is
+      Tomcat installation directory).
+      Enjoy!
+
+- target: all
+  depends: [welcome, prompt, generate, customization]

data/lib/bee_task_java.rb

@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'bee_task'
+require 'rubygems'
+require 'bee_task_package'
 require 'fileutils'
 require 'rexml/document'
 require 'rexml/xpath'
@@ -113,7 +114,7 @@ module Bee
         command += "-verbose " if verbose
         command += "#{options} " if options
         command += "#{files.join(' ')}"
-        puts "Running command '#{command}'" if @build.listener.verbose
+        puts "Running command '#{command}'" if @verbose
         ok = system(command)
         error "Error compiling Java source files" unless ok
       end
@@ -171,7 +172,7 @@ module Bee
         # run command line
         puts "Processing Jar archive '#{dest}'"
         command = "jar c"
-        command += "v" if @build.listener.verbose
+        command += "v" if @verbose
         command += "m" if manifest
         command +="f "
         command += "\"#{manifest}\" " if manifest
@@ -185,7 +186,7 @@ module Bee
         if files.length > 0
           command += "#{files.join(' ')}"
         end
-        puts "Running command '#{command}'" if @build.listener.verbose
+        puts "Running command '#{command}'" if @verbose
         ok = system(command)
         error "Error generating Jar archive" unless ok
       end
@@ -269,7 +270,7 @@ module Bee
         command += "-classpath #{path} " if path
         command += "\"#{main}\"" if main
         command += " #{arguments}" if arguments
-        puts "Running command '#{command}'" if @build.listener.verbose
+        puts "Running command '#{command}'" if @verbose
         ok = system(command)
         error "Error running java" unless ok
       end
@@ -330,7 +331,7 @@ module Bee
         command += "-quiet " if not verbose
         command += "#{options} " if options
         command += "#{files.join(' ')}"
-        puts "Running command '#{command}'" if @build.listener.verbose
+        puts "Running command '#{command}'" if @verbose
         ok = system(command)
         error "Error running javadoc" unless ok
       end
@@ -402,7 +403,7 @@ module Bee
           command += "#{options} " if options
           command += "-classpath #{path} " if path
           command += "org.junit.runner.JUnitCore #{classes.join(' ')}"
-          puts "Running command '#{command}'" if @build.listener.verbose
+          puts "Running command '#{command}'" if @verbose
           ok = system(command)
           error "Error running JUnit" unless ok
         else
@@ -441,13 +442,12 @@ module Bee
           error "Unknown scope '#{scope}', must be one of #{scopes}"
         end
         puts "Building CLASSPATH for dependencies '#{file}' and scope '#{scope}'..."
-        verbose = @build.listener.verbose
         if type == 'bee'
-          resolver = Bee::Task::BeeDependencyResolver.new(file, scope, verbose)
+          resolver = Bee::Task::BeeDependencyResolver.new(file, scope, @verbose)
         elsif type == 'maven1'
-          resolver = Bee::Task::MavenDependencyResolver.new(file, scope, verbose)
+          resolver = Bee::Task::MavenDependencyResolver.new(file, scope, @verbose)
         elsif type == 'maven2'
-          resolver = Bee::Task::Maven2DependencyResolver.new(file, scope, verbose)
+          resolver = Bee::Task::Maven2DependencyResolver.new(file, scope, @verbose)
         else
           error "Unknown type, must be 'bee', 'maven1' or 'maven2'"
         end

data/test/tc_bee_task_java.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'bee'
+require 'bee_context'
 require 'test/unit'
 $:.unshift(File.expand_path(File.dirname(__FILE__)))
 require 'test_build'
@@ -28,7 +28,7 @@ class TestBeeTaskJava < Test::Unit::TestCase
   # Create a context object and load tasks in it.
   def setup
     super
-    @context = Bee::Context.new(nil)
+    @context = Bee::Context.new()
     @listener = TestBuildListener.new
     @build = TestBuild.new(@context, @listener)
     @package = Bee::Task::Java.new(@build)
@@ -70,7 +70,7 @@ class TestBeeTaskJava < Test::Unit::TestCase
     begin
       # run nominal case
       @package.javac({'src' => 'src', 'dest' => 'build/classes'})
-      @listener.output = ''
+      @listener.clear()
       @package.jar({'src' => 'build/classes', 'dest' => 'build/test.jar'})
       assert_equal("Processing Jar archive 'build/test.jar'\n",
                    @listener.output)
@@ -90,7 +90,7 @@ class TestBeeTaskJava < Test::Unit::TestCase
     begin
       # run nominal case
       @package.javac({'src' => 'src', 'dest' => 'build/classes'})
-      @listener.output = ''
+      @listener.clear()
       @package.java({'classpath' => 'build/classes', 'main' => 'test.Test'})
       assert_equal("Running java class 'test.Test'\n",
                    @listener.output)
@@ -133,7 +133,7 @@ class TestBeeTaskJava < Test::Unit::TestCase
         @package.javac({ 'src' => 'test',
                          'dest' => 'build/classes',
                          'classpath' => ['build/classes', 'build/lib/*.jar']})
-        @listener.output = ''
+        @listener.clear()
         @package.junit({ 'src' => 'test',
                          'classpath' => ['build/classes', 'build/lib/*.jar']})
         assert_equal("Running JUnit on 1 test file(s)\n",

data/test/tc_dependency_resolver.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'bee'
+require 'bee_context'
 require 'test/unit'
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'dependency_resolver'

data/test/test_build_listener.rb

@@ -12,30 +12,29 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Test build listener.
+require 'rubygems'
+
 class TestBuildListener
 
+  attr_reader :formatter
   attr_reader :started
   attr_reader :finished
   attr_reader :targets
   attr_reader :tasks
   attr_reader :success
   attr_reader :errors
-  attr_accessor :output
-  attr_reader :verbose
-  
-  def initialize
-    @targets = []
-    @tasks = []
-    @output = ''
-    @verbose = false
+  attr_accessor :throw_error
+  attr_accessor :prompt
+
+  def initialize()
+    reset
   end
-  
-  def build_started(build)
+
+  def build_started(build, dry=false)
     @started = true
   end
 
-  def build_finished(build)
+  def build_finished()
     @finished = true
   end
 
@@ -44,11 +43,56 @@ class TestBuildListener
   end
 
   def task(task)
-    @tasks << tasks
+    @tasks << task
   end
 
   def error(exception)
-    @errors = exception
+    if throw_error
+      raise exception
+    else
+      @errors << exception
+    end
+  end
+
+  def recover
+    @success = true
+  end
+
+  def reset
+    @formatter = TestBuildFormatter.new(self)
+    @started = false
+    @finished = false
+    @targets = []
+    @tasks = []
+    @success = false
+    @errors = []
+    @throw_error = false
+    @prompt = ''
+  end
+
+  def output()
+    return @formatter.output
+  end
+
+  def clear()
+    @formatter.clear()
+  end
+
+  def error?
+    return @errors.length > 0
+  end
+
+end
+
+class TestBuildFormatter
+
+  attr_reader :verbose
+  attr_reader :output
+
+  def initialize(listener)
+    @listener = listener
+    @verbose = false
+    @output = ''
   end
 
   def print(text)
@@ -59,4 +103,8 @@ class TestBuildListener
     @output << text + "\n"
   end
 
+  def clear()
+    @output = ''
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bee_java
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Michel Casabianca
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-11 00:00:00 +02:00
+date: 2011-02-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.10.1
+        version: 0.11.0
     version: 
 description: 
 email: michel.casabianca@gmail.com
@@ -34,39 +34,50 @@ extra_rdoc_files:
 - build/README
 - LICENSE
 files: 
-- bin/bee2maven
+- bin/maven2bee
 - bin/beedoc
 - bin/gendeps
-- bin/maven2bee
-- lib/bee_task_java.rb
+- bin/bee2maven
 - lib/dependency_resolver.rb
+- lib/bee_task_java.rb
 - test/build.yml
+- test/manifest.erb
+- test/test/test/TestTest.java
+- test/test_build.rb
 - test/dependencies.xml
 - test/dependencies.yml
-- test/manifest.erb
 - test/pom.xml
-- test/src/test/Test.java
+- test/ts_bee_java.rb
+- test/test_build_listener.rb
 - test/tc_bee_task_java.rb
+- test/src/test/Test.java
 - test/tc_dependency_resolver.rb
-- test/test/test/TestTest.java
-- test/test_build.rb
-- test/test_build_listener.rb
-- test/ts_bee_java.rb
-- egg/lib/build.erb
+- egg/tiny.yml
+- egg/lib/test.erb
 - egg/lib/dependencies.yml
 - egg/lib/source.erb
-- egg/lib/test.erb
-- egg/lib.yml
-- egg/tiny/build.erb
-- egg/tiny/source.erb
-- egg/tiny.yml
+- egg/lib/build.erb
 - egg/xmlrpc/build.yml
 - egg/xmlrpc/dependencies.yml
-- egg/xmlrpc/src/test/Client.java
 - egg/xmlrpc/src/test/handlers.properties
 - egg/xmlrpc/src/test/Server.java
+- egg/xmlrpc/src/test/Client.java
 - egg/xmlrpc/src/test/TestHandler.java
+- egg/servlet.yml
+- egg/tiny/source.erb
+- egg/tiny/build.erb
+- egg/lib.yml
 - egg/xmlrpc.yml
+- egg/servlet/tomcat-server.xml
+- egg/servlet/tomcat-users.xml
+- egg/servlet/build.yml
+- egg/servlet/tomcat-web.xml
+- egg/servlet/dependencies.yml
+- egg/servlet/ServletTest.java
+- egg/servlet/MANIFEST.MF
+- egg/servlet/Servlet.java
+- egg/servlet/tomcat.yml
+- egg/servlet/web.xml
 - build/README
 - LICENSE
 has_rdoc: true