You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildr.apache.org by do...@apache.org on 2014/03/31 22:23:37 UTC
[1/5] git commit: If the output contains warnings then emit output
Repository: buildr
Updated Branches:
refs/heads/master 0b3d8a40f -> 9ad194a7d
If the output contains warnings then emit output
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/06869323
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/06869323
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/06869323
Branch: refs/heads/master
Commit: 06869323e2c2bfa5d313eafa38a155b77c34e04b
Parents: 8f76d43
Author: Peter Donald <pe...@realityforge.org>
Authored: Sun Mar 30 13:04:11 2014 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Tue Apr 1 07:21:47 2014 +1100
----------------------------------------------------------------------
addon/buildr/wsgen.rb | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/06869323/addon/buildr/wsgen.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/wsgen.rb b/addon/buildr/wsgen.rb
index 4404628..a68c76c 100644
--- a/addon/buildr/wsgen.rb
+++ b/addon/buildr/wsgen.rb
@@ -170,6 +170,9 @@ module Buildr
puts output
raise "Problem building webservices"
end
+ if output =~ /\[WARNING\]/
+ puts output
+ end
end
project.file(ws_dir).enhance([java_file])
end
[5/5] git commit: Record change
Posted by do...@apache.org.
Record change
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/9ad194a7
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/9ad194a7
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/9ad194a7
Branch: refs/heads/master
Commit: 9ad194a7d42311a5e5d48677472f7050538f9981
Parents: 0686932
Author: Peter Donald <pe...@realityforge.org>
Authored: Tue Apr 1 07:23:27 2014 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Tue Apr 1 07:23:27 2014 +1100
----------------------------------------------------------------------
CHANGELOG | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/9ad194a7/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index d234344..e136b95 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
1.4.16 (Pending)
* Fixed: Remove the projectname.ids file when rebuilding the idea
project file avoiding conflict with idea.
+* Fixed: Avoid passing duplicate -keep parameters to wsimport from
+ wsgen addon.
* Change: Improved the error handling when generating java from wsdl
in the wsgen addon.
* Change: Upgraded the Checkstyle plugin to use checkstyle 5.7 that
[4/5] git commit: Improved the error handling when generating java
from wsdl in the wsgen addon.
Posted by do...@apache.org.
Improved the error handling when generating java from wsdl in the wsgen addon.
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/7c8b3724
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/7c8b3724
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/7c8b3724
Branch: refs/heads/master
Commit: 7c8b37249d830dd1be9686503af412e49455549a
Parents: 6a75009
Author: Peter Donald <pe...@realityforge.org>
Authored: Sat Mar 29 16:06:40 2014 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Tue Apr 1 07:21:47 2014 +1100
----------------------------------------------------------------------
CHANGELOG | 2 ++
lib/buildr/ide/idea.rb | 4 ++++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/7c8b3724/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index d23a3e1..d234344 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
1.4.16 (Pending)
+* Fixed: Remove the projectname.ids file when rebuilding the idea
+ project file avoiding conflict with idea.
* Change: Improved the error handling when generating java from wsdl
in the wsgen addon.
* Change: Upgraded the Checkstyle plugin to use checkstyle 5.7 that
http://git-wip-us.apache.org/repos/asf/buildr/blob/7c8b3724/lib/buildr/ide/idea.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/ide/idea.rb b/lib/buildr/ide/idea.rb
index 3559528..1931a96 100644
--- a/lib/buildr/ide/idea.rb
+++ b/lib/buildr/ide/idea.rb
@@ -1086,6 +1086,10 @@ module Buildr #:nodoc:
end
mv temp_filename, ideafile.filename
end
+ if project.ipr?
+ filename = project._("#{project.ipr.name}.ids")
+ rm_rf filename if File.exists?(filename)
+ end
end
project.task("idea:clean") do
[3/5] git commit: Improved the error handling when generating java
from wsdl in the wsgen addon.
Posted by do...@apache.org.
Improved the error handling when generating java from wsdl in the wsgen addon.
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/6a750095
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/6a750095
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/6a750095
Branch: refs/heads/master
Commit: 6a750095c659e6c00af83aefb8c3fde7b236bb27
Parents: 0b3d8a4
Author: Peter Donald <pe...@realityforge.org>
Authored: Sat Mar 29 16:04:58 2014 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Tue Apr 1 07:21:47 2014 +1100
----------------------------------------------------------------------
CHANGELOG | 2 ++
addon/buildr/wsgen.rb | 10 ++++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/6a750095/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 3e5fae5..d23a3e1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
1.4.16 (Pending)
+* Change: Improved the error handling when generating java from wsdl
+ in the wsgen addon.
* Change: Upgraded the Checkstyle plugin to use checkstyle 5.7 that
improves Java 7 compatibility.
* Added: Add support for configuration of the schema-pattern,
http://git-wip-us.apache.org/repos/asf/buildr/blob/6a750095/addon/buildr/wsgen.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/wsgen.rb b/addon/buildr/wsgen.rb
index 1589d3d..f773f54 100644
--- a/addon/buildr/wsgen.rb
+++ b/addon/buildr/wsgen.rb
@@ -160,9 +160,15 @@ module Buildr
end
command << wsdl_file
- `#{command.join(' ')}`
- if $? != 0 || !File.exist?(java_file)
+ trace command.join(' ')
+ output = `#{command.join(' ')}`
+ if $? != 0
rm_rf java_file
+ puts output
+ raise "Problem building webservices"
+ end
+ unless File.exist?(java_file)
+ puts output
raise "Problem building webservices"
end
end
[2/5] git commit: Remove duplicate -keep parameter passed to the
underlying tool
Posted by do...@apache.org.
Remove duplicate -keep parameter passed to the underlying tool
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/8f76d43c
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/8f76d43c
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/8f76d43c
Branch: refs/heads/master
Commit: 8f76d43cf7cc6d1e5ac3dd8984113db4978d5852
Parents: 7c8b372
Author: Peter Donald <pe...@realityforge.org>
Authored: Sun Mar 30 13:03:27 2014 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Tue Apr 1 07:21:47 2014 +1100
----------------------------------------------------------------------
addon/buildr/wsgen.rb | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/8f76d43c/addon/buildr/wsgen.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/wsgen.rb b/addon/buildr/wsgen.rb
index f773f54..4404628 100644
--- a/addon/buildr/wsgen.rb
+++ b/addon/buildr/wsgen.rb
@@ -80,7 +80,6 @@ module Buildr
args << intermediate_dir
args << "-r"
args << "#{base_wsdl_dir}/META-INF/wsdl"
- args << "-keep"
args << "-s"
args << java_dir
args << "-cp"