svn commit: r1533156 - in /buildr/trunk: CHANGELOG addon/buildr/jaxb_xjc.rb spec/addon/jaxb_xjc_spec.rb

[do...@apache.org]

Author: donaldp
Date: Thu Oct 17 17:01:13 2013
New Revision: 1533156

URL: http://svn.apache.org/r1533156
Log:
Update the default output directory used in the jaxb_xjc addon to use Maven conventions.

Modified:
    buildr/trunk/CHANGELOG
    buildr/trunk/addon/buildr/jaxb_xjc.rb
    buildr/trunk/spec/addon/jaxb_xjc_spec.rb

Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1533156&r1=1533155&r2=1533156&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Thu Oct 17 17:01:13 2013
@@ -1,4 +1,6 @@
 1.4.15 (Pending)
+* Change: Update the default output directory used in the jaxb_xjc
+          addon to use Maven conventions.
 * Fixed:  Bug in IdeaProject.partition_dependencies resulted in
           projects being rebuilt if artifacts were added to the
           project with dependencies on the current project.

Modified: buildr/trunk/addon/buildr/jaxb_xjc.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/addon/buildr/jaxb_xjc.rb?rev=1533156&r1=1533155&r2=1533156&view=diff
==============================================================================
--- buildr/trunk/addon/buildr/jaxb_xjc.rb (original)
+++ buildr/trunk/addon/buildr/jaxb_xjc.rb Thu Oct 17 17:01:13 2013
@@ -47,7 +47,7 @@ module Buildr
       args = args.dup
       files = Array === files ? files.flatten : [files]
 
-      target_dir = options[:directory] || path_to(:target, :generated, :jaxb)
+      target_dir = File.expand_path(options[:directory] || _(:target, :generated, :jaxb, 'main/java'))
       timestamp_file = File.expand_path("#{target_dir}/jaxb-#{options[:id] || 1}.cache")
 
       file(target_dir => timestamp_file)

Modified: buildr/trunk/spec/addon/jaxb_xjc_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/addon/jaxb_xjc_spec.rb?rev=1533156&r1=1533155&r2=1533156&view=diff
==============================================================================
--- buildr/trunk/spec/addon/jaxb_xjc_spec.rb (original)
+++ buildr/trunk/spec/addon/jaxb_xjc_spec.rb Thu Oct 17 17:01:13 2013
@@ -110,10 +110,10 @@ describe Buildr::JaxbXjc do
     end
 
     it "produce .java files in the correct location" do
-      File.should be_exist(@foo._("target/generated/jaxb/org/foo/api/Agency.java"))
-      File.should be_exist(@foo._("target/generated/jaxb/org/foo/api/LatLongCoordinate.java"))
-      File.should be_exist(@foo._("target/generated/jaxb/org/foo/api/ObjectFactory.java"))
-      File.should be_exist(@foo._("target/generated/jaxb/org/foo/api/Wildfire.java"))
+      File.should be_exist(@foo._("target/generated/jaxb/main/java/org/foo/api/Agency.java"))
+      File.should be_exist(@foo._("target/generated/jaxb/main/java/org/foo/api/LatLongCoordinate.java"))
+      File.should be_exist(@foo._("target/generated/jaxb/main/java/org/foo/api/ObjectFactory.java"))
+      File.should be_exist(@foo._("target/generated/jaxb/main/java/org/foo/api/Wildfire.java"))
     end
 
     it "produce .class files in the correct location" do