Author: midon
Date: Thu May 28 18:35:53 2009
New Revision: 779718

URL: http://svn.apache.org/viewvc?rev=779718&view=rev
Log:
buildfile cleanup: move the wssecurity helper methods in a separate rakefile.

Added:
    ode/branches/APACHE_ODE_1.X/tasks/ws-security.rake
Modified:
    ode/branches/APACHE_ODE_1.X/Rakefile

Modified: ode/branches/APACHE_ODE_1.X/Rakefile
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/Rakefile?rev=779718&r1=779717&r2=779718&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/Rakefile (original)
+++ ode/branches/APACHE_ODE_1.X/Rakefile Thu May 28 18:35:53 2009
@@ -217,11 +217,11 @@
     
     NativeDB.prepare_configs test, _(".")
 
-    test.setup 
prepare_secured_services_tests("#{test.resources.target}/TestRampartBasic/secured-services",
 "sample*.axis2")
-    test.setup 
prepare_secured_services_tests("#{test.resources.target}/TestRampartPolicy/secured-services",
 "sample*-policy.xml")
+    test.setup 
WSSecurity.prepare_secure_services_tests("#{test.resources.target}/TestRampartBasic/secured-services",
 "sample*.axis2", AXIS2_MODULES.mods)
+    test.setup 
WSSecurity.prepare_secure_services_tests("#{test.resources.target}/TestRampartPolicy/secured-services",
 "sample*-policy.xml", AXIS2_MODULES.mods)
 
-    test.setup 
prepare_secured_processes_tests("#{test.resources.target}/TestRampartBasic/secured-processes")
-    test.setup 
prepare_secured_processes_tests("#{test.resources.target}/TestRampartPolicy/secured-processes")
+    test.setup 
WSSecurity.prepare_secure_processes_tests("#{test.resources.target}/TestRampartBasic/secured-processes",
 AXIS2_MODULES.mods)
+    test.setup 
WSSecurity.prepare_secure_processes_tests("#{test.resources.target}/TestRampartPolicy/secured-processes",
 AXIS2_MODULES.mods)
   end
 
   desc "ODE APIs"
@@ -611,52 +611,3 @@
   package(:zip, 
:id=>"#{id}-docs").include(javadoc(project("ode").projects).target) unless 
ENV["JAVADOC"] =~ /^(no|off|false|skip)$/i
 end
 
-# Helper methods 
-###################
-def prepare_secured_processes_tests(test_dir)
-  task(test_dir.to_sym) do
-    mkdir "#{test_dir}/modules" unless File.directory? "#{test_dir}/modules"
-    artifacts(AXIS2_MODULES.mods).map {|a| a.invoke }
-    cp AXIS2_MODULES.mods.map {|a| repositories.locate(a)} , 
_("#{test_dir}/modules")
-
-    Dir.chdir(test_dir) do
-      Dir['sample*-service.xml'].each do |service_file|
-        sample_name = service_file.split('-').first
-        proc_dir = "process-#{sample_name}"
-        cp_r "process-template/.", proc_dir
-        cp service_file, "#{proc_dir}/HelloService.axis2"
-      end
-    end
-  end
-end
-def prepare_secured_services_tests(test_dir, file_pattern)
-    task(test_dir.to_sym) do 
-      # copy the required modules
-      mkdir "#{test_dir}/modules" unless File.directory? "#{test_dir}/modules"
-      artifacts(AXIS2_MODULES.mods).map {|a| a.invoke }
-      cp AXIS2_MODULES.mods.map {|a| repositories.locate(a)} , 
_("#{test_dir}/modules")
-      # generate one process per test
-      Dir.chdir(test_dir) do
-        Dir[file_pattern].each do |config_file| 
-          sample_name = File.basename(config_file, 
"."+config_file.split('.').last)
-          # create process directory
-          proc_dir = "process-#{sample_name}"
-          mkdir proc_dir unless File.directory? proc_dir
-          # copy files
-          cp config_file, proc_dir
-          # copy files from template and replace variable names
-          Dir["process-template/*"].each do |file|
-            lines = IO.readlines(file)
-            # copy file and replace template values
-            File.open("#{proc_dir}/#{File.basename(file)}", 'w') { |f| 
-              lines.each { |l| 
-                l.gsub!("{sample.namespace}", 
"http://#{sample_name.gsub('-','.')}.samples.rampart.apache.org")
-                l.gsub!("{sample.service.name}", sample_name)
-                f<<l
-              }
-            }
-          end
-        end
-      end
-   end
-end

Added: ode/branches/APACHE_ODE_1.X/tasks/ws-security.rake
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/tasks/ws-security.rake?rev=779718&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/tasks/ws-security.rake (added)
+++ ode/branches/APACHE_ODE_1.X/tasks/ws-security.rake Thu May 28 18:35:53 2009
@@ -0,0 +1,55 @@
+
+
+module WSSecurity
+
+  class << self 
+    def prepare_secure_processes_tests(test_dir, modules)
+      task(test_dir.to_sym) do
+        mkdir "#{test_dir}/modules" unless File.directory? 
"#{test_dir}/modules"
+        Buildr.artifacts(modules).each(&:invoke)
+        cp modules.map {|a| Buildr.repositories.locate(a)} , 
"#{test_dir}/modules"
+
+        Dir.chdir(test_dir) do
+          Dir['sample*-service.xml'].each do |service_file|
+            sample_name = service_file.split('-').first
+            proc_dir = "process-#{sample_name}"
+            cp_r "process-template/.", proc_dir
+            cp service_file, "#{proc_dir}/HelloService.axis2"
+          end
+        end
+      end
+    end
+    def prepare_secure_services_tests(test_dir, file_pattern, modules)
+      task(test_dir.to_sym) do 
+        # copy the required modules
+        mkdir "#{test_dir}/modules" unless File.directory? 
"#{test_dir}/modules"
+        Buildr.artifacts(modules).each(&:invoke)
+        cp modules.map {|a| Buildr.repositories.locate(a)} , 
"#{test_dir}/modules"
+        # generate one process per test
+        Dir.chdir(test_dir) do
+          Dir[file_pattern].each do |config_file| 
+            sample_name = File.basename(config_file, 
"."+config_file.split('.').last)
+            # create process directory
+            proc_dir = "process-#{sample_name}"
+            mkdir proc_dir unless File.directory? proc_dir
+            # copy files
+            cp config_file, proc_dir
+            # copy files from template and replace variable names
+            Dir["process-template/*"].each do |file|
+              lines = IO.readlines(file)
+              # copy file and replace template values
+              File.open("#{proc_dir}/#{File.basename(file)}", 'w') { |f| 
+                lines.each { |l| 
+                  l.gsub!("{sample.namespace}", 
"http://#{sample_name.gsub('-','.')}.samples.rampart.apache.org")
+                  l.gsub!("{sample.service.name}", sample_name)
+                  f<<l
+                }
+              }
+            end
+          end
+        end
+      end
+    end
+  end
+end
+


Reply via email to