|
From: Juergen H. <jho...@us...> - 2007-06-11 22:17:12
|
Update of /cvsroot/springframework/spring/test/org/springframework/scripting/jruby In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv30282/test/org/springframework/scripting/jruby Modified Files: Calculator.rb jrubyContext.xml jrubyContextForPrimitives.xml Printer.rb Messenger.rb jrubyContextForWrappers.xml jruby-with-xsd.xml Log Message: updated to JRuby 1.0 Index: jrubyContext.xml =================================================================== RCS file: /cvsroot/springframework/spring/test/org/springframework/scripting/jruby/jrubyContext.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** jrubyContext.xml 3 Mar 2007 15:32:36 -0000 1.7 --- jrubyContext.xml 11 Jun 2007 22:16:32 -0000 1.8 *************** *** 11,23 **** require 'java' ! include_class 'org.springframework.scripting.Calculator' ! ! class RubyCalculator < Calculator ! ! def add(x, y) ! x + y ! end ! end </value> </constructor-arg> --- 11,21 ---- require 'java' ! class RubyCalculator ! include org.springframework.scripting.Calculator ! def add(x, y) ! x + y ! end ! end </value> </constructor-arg> Index: Messenger.rb =================================================================== RCS file: /cvsroot/springframework/spring/test/org/springframework/scripting/jruby/Messenger.rb,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Messenger.rb 1 Mar 2007 21:39:54 -0000 1.3 --- Messenger.rb 11 Jun 2007 22:16:32 -0000 1.4 *************** *** 1,14 **** require 'java' ! include_class 'org.springframework.scripting.Messenger' ! ! class RubyMessenger < Messenger ! def setMessage(message) ! @@message = message ! end ! def getMessage ! @@message ! end end --- 1,13 ---- require 'java' ! class RubyMessenger ! include org.springframework.scripting.Messenger ! def setMessage(message) ! @@message = message ! end ! def getMessage ! @@message ! end end Index: Calculator.rb =================================================================== RCS file: /cvsroot/springframework/spring/test/org/springframework/scripting/jruby/Calculator.rb,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Calculator.rb 21 Jun 2006 16:50:58 -0000 1.2 --- Calculator.rb 11 Jun 2007 22:16:32 -0000 1.3 *************** *** 1,11 **** require 'java' ! include_class 'org.springframework.scripting.Calculator' ! ! class RubyCalculator < Calculator ! ! def add(x, y) ! x + y ! end ! end \ No newline at end of file --- 1,9 ---- require 'java' ! class RubyCalculator ! include org.springframework.scripting.Calculator ! def add(x, y) ! x + y ! end ! end Index: jrubyContextForWrappers.xml =================================================================== RCS file: /cvsroot/springframework/spring/test/org/springframework/scripting/jruby/jrubyContextForWrappers.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** jrubyContextForWrappers.xml 3 Mar 2007 15:32:37 -0000 1.2 --- jrubyContextForWrappers.xml 11 Jun 2007 22:16:32 -0000 1.3 *************** *** 11,17 **** require 'java' ! include_class 'org.springframework.scripting.jruby.WrapperAdder' ! ! class RubyWrapperAdder < WrapperAdder def addInts(x, y) --- 11,16 ---- require 'java' ! class RubyWrapperAdder ! include org.springframework.scripting.jruby.WrapperAdder def addInts(x, y) Index: Printer.rb =================================================================== RCS file: /cvsroot/springframework/spring/test/org/springframework/scripting/jruby/Printer.rb,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Printer.rb 25 Nov 2006 22:59:59 -0000 1.1 --- Printer.rb 11 Jun 2007 22:16:32 -0000 1.2 *************** *** 1,10 **** require 'java' ! include_class 'org.springframework.scripting.jruby.Printer' ! ! class RubyPrinter < Printer def print(obj) ! puts obj.getContent end ! end \ No newline at end of file --- 1,9 ---- require 'java' ! class RubyPrinter ! include org.springframework.scripting.jruby.Printer def print(obj) ! puts obj.getContent end ! end Index: jrubyContextForPrimitives.xml =================================================================== RCS file: /cvsroot/springframework/spring/test/org/springframework/scripting/jruby/jrubyContextForPrimitives.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** jrubyContextForPrimitives.xml 20 Jan 2007 20:43:35 -0000 1.2 --- jrubyContextForPrimitives.xml 11 Jun 2007 22:16:32 -0000 1.3 *************** *** 11,17 **** require 'java' ! include_class 'org.springframework.scripting.jruby.PrimitiveAdder' ! ! class RubyPrimitiveAdder < PrimitiveAdder def addInts(x, y) --- 11,16 ---- require 'java' ! class RubyPrimitiveAdder ! include org.springframework.scripting.jruby.PrimitiveAdder def addInts(x, y) Index: jruby-with-xsd.xml =================================================================== RCS file: /cvsroot/springframework/spring/test/org/springframework/scripting/jruby/jruby-with-xsd.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** jruby-with-xsd.xml 14 Mar 2007 16:22:24 -0000 1.6 --- jruby-with-xsd.xml 11 Jun 2007 22:16:32 -0000 1.7 *************** *** 21,34 **** script-interfaces="org.springframework.scripting.Calculator"> <lang:inline-script> ! require 'java' ! ! include_class 'org.springframework.scripting.Calculator' ! ! class RubyCalculator < Calculator ! def add(x, y) ! x + y ! end end </lang:inline-script> --- 21,32 ---- script-interfaces="org.springframework.scripting.Calculator"> <lang:inline-script> ! require 'java' ! class RubyCalculator ! include org.springframework.scripting.Calculator + def add(x, y) + x + y + end end </lang:inline-script> |