bee_java 0.0.3 → 0.0.4

data/bin/bee2maven

@@ -23,12 +23,14 @@ HELP = 'Usage: bee2maven file'
 TEMPLATE = ERB.new("<project>
   <dependencies>
 % for dependency in dependencies
+%   if dependency['group']
     <dependency>
       <groupId><%= dependency['group'] %></groupId>
       <artifactId><%= dependency['artifact'] %></artifactId>
       <version><%= dependency['version'] %></version>
       <type><%= dependency['type'] || 'jar' %></type>
     </dependency>
+%   end
 % end
   </dependencies>
 </project>

data/bin/gendeps

@@ -18,30 +18,72 @@
 
 require 'erb'
 
-TEMPLATE = ERB.new('- group:    <%= group %>
-  artifact: <%= artifact %>
-  version:  <%= version %>
+DEFAULT_REPOSITORY = 'http://mirrors.ibiblio.org/pub/mirrors/maven2'
+
+TEMPLATE = ERB.new('- group:      "<%= group %>"
+  artifact:   "<%= artifact %>"
+  version:    "<%= version %>"
 % if type
-  type:     <%= type %>
+  type:       "<%= type %>"
 % end
-% if scope
-  scope:    <%= scope %>
+% if scopes
+%   if scopes.length > 1
+  scope:      [<%= scopes.map{|s| "\"#{s}\""}.join(", ") %>]
+%   else
+  scope:      "<%= scopes[0] %>"
+%   end
 % end
 % if classifier
-  classifier: <%= classifier %>
+  classifier: "<%= classifier %>"
+% end
+% if path
+  path:       "<%= path %>"
 % end
 
 ', nil, '%')
 
-lines = `mvn dependency:list`
-for line in lines.split("\n")
-  if line =~ /^\[INFO\]    ([^:]+):([^:]+):([^:]+):([^:]+):([^:]+)\s*$/
-    group = $1
-    artifact = $2
-    type = $3
-    version = $4
-    scope = $5
-    classifier = nil
-    puts TEMPLATE.result(binding)
+DEFAULT_SCOPE = 'compile'
+
+# scope availability: list for a given dependency scope the implied classpath
+# scopes
+SCOPE_AVAILABILITY = {
+  'compile'  => ['compile', 'test', 'runtime'],
+  'provided' => ['compile', 'test'],
+  'runtime'  => ['test', 'runtime'],
+  'test'     => ['test'],
+  'system'   => ['compile', 'test', 'runtime'],
+}
+
+def error(message)
+  $stderr.puts message
+  exit(1)
+end
+
+def main
+  lines = `mvn dependency:list`
+  puts "- repository: \"#{DEFAULT_REPOSITORY}\""
+  puts
+  for line in lines.split("\n")
+    if line =~ /^\[INFO\]    ([^:]+):([^:]+):([^:]+):([^:]+):([^:]+)\s*$/
+      group = $1
+      artifact = $2
+      type = $3
+      version = $4
+      scope = $5 || DEFAULT_SCOPE
+      classifier = nil
+      error("Unknown dependency scope '#{scope}'") if
+        !SCOPE_AVAILABILITY.keys.include?(scope)
+      scopes = SCOPE_AVAILABILITY[scope]
+      scopes = nil if scope == 'compile'
+      if scope == 'system'
+        $stderr.puts "Set path for system dependency '#{group}:#{artifact}:#{version}'"
+        path = 'TODO'
+      else
+        path = nil
+      end
+      puts TEMPLATE.result(binding)
+    end
   end
 end
+
+main

data/bin/maven2bee

@@ -29,7 +29,11 @@ TEMPLATE = ERB.new('- group:    <%= group %>
   type:     <%= type %>
 % end
 % if scope
-  scope:    <%= scope %>
+%   if scope.length > 1
+  scope:    [<%= scope.join(", ") %>]
+%   else
+  scope:    <%= scope[0] %>
+%   end
 % end
 % if classifier
   classifier: <%= classifier %>
@@ -37,9 +41,24 @@ TEMPLATE = ERB.new('- group:    <%= group %>
 
 ', nil, '%')
 
+# scope availability: list for a given dependency scope the implied classpath scopes
+SCOPE_AVAILABILITY = {
+  'compile'  => ['compile', 'test', 'runtime'],
+  'provided' => ['compile', 'test'],
+  'runtime'  => ['test', 'runtime'],
+  'test'     => ['test'],
+}
+
 def deps_to_yaml(file)
   result = ''
   document = REXML::Document.new(File.read(ARGV[0]))
+  # load maven properties
+  properties = {}
+  REXML::XPath.each(document, '/project/properties/*') do |property|
+    name = property.name
+    value = property.text.strip
+    properties[name] = value
+  end
   REXML::XPath.each(document, '//dependency') do |dependency|
     group = dependency.elements['groupId'].text.strip
     artifact = dependency.elements['artifactId'].text.strip
@@ -51,6 +70,7 @@ def deps_to_yaml(file)
     end
     if dependency.elements['scope'] and dependency.elements['scope'].text
       scope = dependency.elements['scope'].text.strip
+      scope = SCOPE_AVAILABILITY[scope]
     else
       scope = nil
     end
@@ -59,11 +79,30 @@ def deps_to_yaml(file)
     else
       classifier = nil
     end
+    # replace properties references with their values
+    group = evaluate(group, properties)
+    artifact = evaluate(artifact, properties)
+    version = evaluate(version, properties)
+    type = evaluate(type, properties)
+    scope = evaluate(scope, properties)
+    classifier = evaluate(classifier, properties)
+    # build the dependency entry
     result += TEMPLATE.result(binding)
   end
   return result
 end
 
+def evaluate(value, properties)
+  return nil if value == nil
+  if value =~ /\$\{.+\}/
+    name = value[2...-1]
+    raise "Property '#{name}' not found" if !properties.has_key?(name)
+    return properties[name]
+  else
+    return value
+  end
+end
+
 if ARGV.length < 1
   puts HELP
   exit

data/build/README

@@ -20,4 +20,4 @@ or go to URL http://www.apache.org/licenses/LICENSE-2.0).
 
 = Copyright
 
-Bee_java version 0.0.3 (C) Michel Casabianca - 2008-2010
+Bee_java version 0.0.4 (C) Michel Casabianca - 2008-2012

data/egg/lib/build.erb

@@ -1,54 +1,8 @@
 - build:       <%= name %>
-  default:     all
   description: Build file for project <%= name.capitalize %>
+  extends:     ":java:java.yml"
 
 - properties:
-    name:         "<%= name %>"
-    version:      "0.0.1"
-    src:          "src"
-    tst:          "test"
-    lib:          "lib"
-    build:        "build"
-    classes:      "#{build}/classes"
-    test_classes: "#{build}/tst-classes"
-    jar:          "#{build}/#{name}-#{version}.jar"
-
-- target:      compile
-  description: Compile Java source files
-  script:
-  - java.javac:
-      src:  :src
-      dest: :classes
-
-- target:      test
-  depends:     compile
-  description: Run unit tests
-  script:
-  - java.classpath:
-      classpath:   classpath
-      directories: [:classes, :test_classes]
-  - java.javac:
-      src:       :tst
-      dest:      :test_classes
-      classpath: :classpath
-  - java.junit:
-      src:       :tst
-      classpath: :classpath
-
-- target:      jar
-  depends:     test
-  description: Generate JAR archive
-  script:
-  - java.jar:
-      src:  :classes
-      dest: :jar
-
-- target:      clean
-  description: Clean generated files
-  script:
-  - rmdir: :build
-
-- target:      all
-  depends:     [clean, jar]
-  description: Clean generated files
-
+    name:       "<%= name %>"
+    version:    "0.0.1"
+    jv_main:    "<%= main %>"

data/egg/lib/dependencies.yml

@@ -1,5 +1,6 @@
-- repository: http://www.ibiblio.org/maven2
+- repository: http://mirrors.ibiblio.org/pub/mirrors/maven2
 
-- group:    junit
-  artifact: junit
-  version:  4.3
+- group:    "junit"
+  artifact: "junit"
+  version:  "4.10"
+  scope:    "test"

data/egg/lib/source.erb

@@ -6,4 +6,8 @@ public class <%= File.basename(main.gsub(/\./, '/')) %> {
         return "Hello "+who+"!";
     }
 
+    public static void main(String[] args) {
+        System.out.println(hello("World"));
+    }
+
 }

data/egg/lib.yml

@@ -12,25 +12,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- build: tiny
-  default: all
+- build:       tiny
+  default:     all
   description: "Generate a Java project for a library"
 
 - properties:
-    name: test
-    main: test.Test
+    name: lib
+    main: lib.Lib
     description: |
       This script will create Java project for a library. Build file has
       'compile', 'test' and 'jar' targets to compile, run unit tests, and
       generate JAR archive.
 
-- target: welcome
+- target:      welcome
   description: "Print information message"
   script:
   - print: :description
 
-- target: prompt
-  depends: welcome
+- target:      prompt
+  depends:     welcome
   description: "Prompt for project information"
   script:
   - print: "Please answer following questions to generate the project:"
@@ -43,8 +43,8 @@
       default: :main
       property: main
 
-- target: generate
-  depends: prompt
+- target:      generate
+  depends:     prompt
   description: "Generate project"
   script:
   - print: "Generating project..."
@@ -58,8 +58,8 @@
   - erb: { src: "#{base}/lib/build.erb", dest: "#{here}/#{name}/build.yml" }
   - cp:  { src: "#{base}/lib/dependencies.yml", dest: "#{here}/#{name}/dependencies.yml" }
 
-- target: customization
-  depends: generate
+- target:      customization
+  depends:     generate
   description: "Print information about project customization"
   script:
   - print: |
@@ -67,5 +67,5 @@
       print information about generated build file.
       Enjoy!
 
-- target: all
+- target:  all
   depends: [welcome, prompt, generate, customization]

data/egg/servlet/build.yml

@@ -1,80 +1,40 @@
 - build:       <%= name %>
-  default:     all
-  description: Build file for project Test
-  extends:     tomcat.yml
+  description: Build file for project <%= name.capitalize %>
+  extends:
+  - ":java:java.yml"
+  - tomcat.yml
 
 - properties:
-    name:         "<%= name %>"
-    version:      "0.0.1"
-    src:          "src"
-    test:         "test"
-    build:        "build"
-    classes:      "#{build}/classes"
-    test_classes: "#{build}/test-classes"
-    jar:          "#{build}/#{name}-#{version}.jar"
-    clean_dirs:
-    - :build
+    name:        "<%= name %>"
+    version:     "0.0.1"
+    tomcat_home: ~
+    jv_main:     "<%= main %>"
+    jv_clean_dirs:
+    - :jv_build_dir
     - "#{tomcat_base}/logs/*"
     - "#{tomcat_base}/work/*"
     - "#{tomcat_base}/temp/*"
-    clean_files:  []
-
-- target:      classpath
-  description: Build classpath
-  script:
-  - java.classpath:
-      classpath:   classpath
-      directories: [:classes, :test_classes]
-
-- target:      compile
-  depends:     classpath
-  description: Compile Java source files
-  script:
-  - java.javac:
-      src:       :src
-      dest:      :classes
-      classpath: :classpath
-
-- target:      test
-  depends:     compile
-  description: Run unit tests
-  script:
-  - java.javac:
-      src:       :test
-      dest:      :test_classes
-      classpath: :classpath
-  - java.junit:
-      src:       :test
-      classpath: :classpath
-
-- target:      jar
-  depends:     test
-  description: Generate JAR archive
-  script:
-  - java.jar:
-      src:  :classes
-      dest: :jar
 
 - target:      web
-  depends:     jar
+  depends:     jv_jar
   description: Generate web archive
   script:
-  - mkdir: "#{build}/web"
+  - mkdir: "#{jv_build_dir}/web"
   - copy:
       root: web
-      dest: "#{build}/web"
-  - mkdir: "#{build}/web/WEB-INF/lib"
+      dest: "#{jv_build_dir}/web"
+  - mkdir: "#{jv_build_dir}/web/WEB-INF/lib"
   - cp:
-      src:  :jar
-      dest: "#{build}/web/WEB-INF/lib"
+      src:  :jv_jar
+      dest: "#{jv_build_dir}/web/WEB-INF/lib"
 
 - target:      war
   depends:     web
   description: Build the WAR archive
   script:
   - zip:
-      root: "#{build}/web"
-      dest: "#{build}/#{name}-#{version}.war"
+      root: "#{jv_build_dir}/web"
+      dest: "#{jv_build_dir}/#{name}-#{version}.war"
 
 - target:      run
   depends:     [web, tomcat_restart]
@@ -84,13 +44,3 @@
   description: Print Tomcat logs on the console
   script:
   - "tail -f tomcat/logs/catalina.out"
-
-- target:      clean
-  description: Clean generated files
-  script:
-  - rmdir: :clean_dirs
-  - rm:    :clean_files
-
-- target:      all
-  depends:     [clean, run]
-  description: Clean and run application

data/egg/servlet/dependencies.yml

@@ -1,8 +1,9 @@
-- repository: http://www.ibiblio.org/maven2
+- repository: http://mirrors.ibiblio.org/pub/mirrors/maven2
 
 - group:    junit
   artifact: junit
   version:  4.3
+  scope:    test
 
 - group:    servletapi
   artifact: servletapi

data/egg/servlet/tomcat.yml

@@ -54,4 +54,3 @@
   - |
     #{tomcat_env}
     #{tomcat_script} start
-

data/egg/servlet/web.xml

@@ -3,7 +3,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">
+         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>
 

data/egg/servlet.yml

@@ -17,7 +17,7 @@
   description: Generate a Java project for a servlet
 
 - properties:
-    name:        hello
+    name:        servlet
     main:        hello.World
     description: |
       This script will create Java project for a servlet. Type 'bee -b' to

data/egg/tiny/build.erb

@@ -1,34 +1,8 @@
-- build: <%= name %>
-  default: all
+- build:       <%= name %>
   description: Build file for project <%= name.capitalize %>
+  extends:     ":java:java.yml"
 
 - properties:
-    name:      "<%= name %>"
-    src:       "src"
-    build:     "build"
-    classes:   "#{build}/classes"
-    main:      "<%= main %>"
-    classpath: :classes
-
-- target:      compile
-  description: Compile Java source files
-  script:
-  - java.javac:
-      src:  :src
-      dest: :classes
-
-- target:      run
-  depends:     compile
-  description: Run java program
-  script:
-  - java.java:
-      main:       :main
-      classpath:  :classes
-
-- target:      clean
-  description: Clean generated files
-  script:
-  - rmdir: :build
-
-- target: all
-  depends: [clean, compile, run]
+    name:       "<%= name %>"
+    version:    "0.0.1"
+    jv_main:    "<%= main %>"

data/egg/tiny/dependencies.yml

@@ -0,0 +1,6 @@
+- repository: http://mirrors.ibiblio.org/pub/mirrors/maven2
+
+#- group:    junit
+#  artifact: junit
+#  version:  4.3
+#  scope:    test

data/egg/tiny.yml

@@ -12,25 +12,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- build: tiny
-  default: all
+- build:       tiny
+  default:     all
   description: "Generate a tiny Java project"
 
 - properties:
-    name: test
+    name: tiny
     main: test.Test
     description: |
       This script will create a tiny Java project. Build file has targets
       'compile' and 'run' to compile and run Java source file. This is an
       accurate project to quickly test Java code.
 
-- target: welcome
+- target:      welcome
   description: "Print information message"
   script:
   - print: :description
 
-- target: prompt
-  depends: welcome
+- target:      prompt
+  depends:     welcome
   description: "Prompt for project information"
   script:
   - print: "Please answer following questions to generate the project:"
@@ -43,8 +43,8 @@
       default: :main
       property: main
 
-- target: generate
-  depends: prompt
+- target:      generate
+  depends:     prompt
   description: "Generate project"
   script:
   - print: "Generating project..."
@@ -54,9 +54,10 @@
   - mkdir: "#{here}/#{name}/src/#{File.dirname(main.gsub(/\./,'/'))}"
   - erb: { src: "#{base}/tiny/source.erb", dest: "#{here}/#{name}/src/#{main.gsub(/\./,'/')}.java" }
   - erb: { src: "#{base}/tiny/build.erb", dest: "#{here}/#{name}/build.yml" }
+  - cp: { src: "#{base}/tiny/dependencies.yml", dest: "#{here}/#{name}/" }
 
-- target: customization
-  depends: generate
+- target:      customization
+  depends:     generate
   description: "Print information about project customization"
   script:
   - print: |
@@ -64,5 +65,5 @@
       print information about generated build file.
       Enjoy!
 
-- target: all
+- target:  all
   depends: [welcome, prompt, generate, customization]

data/egg/xmlrpc/build.yml

@@ -1,56 +1,21 @@
 - build:       <%= name %>
-  default:     all
-  description: Build file for sample XML-RPC project
+  description: Build file for project <%= name.capitalize %>
+  extends:
+  - ":java:java.yml"
 
 - properties:
-    name:      "<%= name %>"
-    src:       "src"
-    build:     "build"
-    classes:   "#{build}/classes"
-    client:    "test.Client"
-    server:    "test.Server"
-    classpath: :classes
-
-- target:      depends
-  description: Get dependencies
-  script:
-  - java.classpath:
-      classpath: cp_compile
-  - rb: "cp_runtime = cp_compile + ':' + classes"
-
-- target:      compile
-  depends:     depends
-  description: Compile Java source files
-  script:
-  - java.javac:
-      src:       :src
-      dest:      :classes
-      classpath: :cp_compile
-  - copy:
-      root:     :src
+    name:         "<%= name %>"
+    version:      "0.0.1"
+    jv_main:      "test.Server"
+    jv_res:
+      root:     :jv_src
       includes: "**/*.properties"
-      dest:     :classes
+    client_main:  "test.Client"
 
 - target:      client
-  depends:     compile
+  depends:     jv_compile
   description: Run XML-RPC client
   script:
   - java.java:
-      main:       :client
-      classpath:  :cp_runtime
-
-- target:      server
-  depends:     compile
-  description: Run XML-RPC server
-  script:
-  - java.java:
-      main:       :server
-      classpath:  :cp_runtime
-
-- target:      clean
-  description: Clean generated files
-  script:
-  - rmdir: :build
-
-- target: all
-  depends: [clean, compile]
+      main:      :client_main
+      classpath: :jv_runtime_cp

data/egg/xmlrpc/dependencies.yml

@@ -1,4 +1,4 @@
-- repository: http://www.ibiblio.org/maven2
+- repository: http://mirrors.ibiblio.org/pub/mirrors/maven2
 
 - group:    org.apache.xmlrpc
   artifact: xmlrpc-common
@@ -23,4 +23,3 @@
 - group:    org.apache.ws.commons
   artifact: ws-commons-java5
   version:  1.0
-