You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mi...@apache.org on 2009/01/29 04:50:27 UTC
svn commit: r738742 - in /ode/branches/APACHE_ODE_1.X: ./
axis2-war/src/test/java/org/apache/ode/axis2/
axis2-war/src/test/resources/TestRampartPolicy/
axis2-war/src/test/resources/TestRampartPolicy/services/
Author: midon
Date: Thu Jan 29 03:50:25 2009
New Revision: 738742
URL: http://svn.apache.org/viewvc?rev=738742&view=rev
Log:
ODE-394: make the Rampart task DRYer
Conflicts:
Buildfile
Added:
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-sample01-policy.txt
- copied, changed from r738741, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-policy-sample01.txt
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-sample02-policy.txt
- copied, changed from r738741, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-policy-sample02.txt
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-sample03-policy.txt
- copied, changed from r738741, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-policy-sample03.txt
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-sample04-policy.txt
- copied, changed from r738741, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-policy-sample04.txt
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/sample01-policy.xml
- copied, changed from r738741, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample01.xml
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/sample02-policy.xml
- copied, changed from r738741, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample02.xml
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/sample03-policy.xml
- copied, changed from r738741, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample03.xml
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/sample04-policy.xml
- copied, changed from r738741, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample04.xml
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/sample01-policy.aar
- copied, changed from r738741, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample01.aar
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/sample02-policy.aar
- copied, changed from r738741, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample02.aar
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/sample03-policy.aar
- copied, changed from r738741, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample03.aar
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/sample04-policy.aar
- copied, changed from r738741, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample04.aar
Removed:
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-policy-sample01.txt
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-policy-sample02.txt
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-policy-sample03.txt
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-policy-sample04.txt
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample01.xml
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample02.xml
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample03.xml
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample04.xml
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample01.aar
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample02.aar
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample03.aar
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample04.aar
Modified:
ode/branches/APACHE_ODE_1.X/Rakefile
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/RampartBasicTest.java
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/RampartPolicyTest.java
Modified: ode/branches/APACHE_ODE_1.X/Rakefile
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/Rakefile?rev=738742&r1=738741&r2=738742&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/Rakefile (original)
+++ ode/branches/APACHE_ODE_1.X/Rakefile Thu Jan 29 03:50:25 2009
@@ -131,6 +131,38 @@
end
end
+def prepare_rampart_test(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
+ [config_file, "README-#{sample_name}.txt"].each{|f| cp f, 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
+
desc "Apache ODE"
#define "ode", :group=>"org.apache.ode", :version=>VERSION_NUMBER do
define "ode" do
@@ -213,75 +245,9 @@
test.setup unzip(_("target/test-classes/webapp/WEB-INF")=>project("dao-hibernate-db").package(:zip))
NativeDB.prepare_configs test, _(".")
-
- test.setup task(:prepare_rampart_policy_test) do |task|
- # test_dir will be the Axis2 Repo dir
- test_dir = _("target/test-classes/TestRampartPolicy")
- # 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["policy-sample*.xml"].each do |policy_file|
- sample_name = policy_file.gsub(".xml","")
- # create process directory
- proc_dir = "process-#{sample_name}"
- mkdir proc_dir unless File.directory? proc_dir
- # copy files
- [policy_file, "README-#{sample_name}.txt"].each{|f| cp f, 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|
- sample_id = sample_name[-2,2]
- l.gsub!("{sample.namespace}", "http://sample#{sample_id}.policy.samples.rampart.apache.org")
- l.gsub!("{sample.service.name}", sample_name)
- f<<l
- }
- }
- end
- end
- end
- end
-
- test.setup task(:prepare_rampart_basic_test) do |task|
- # test_dir will be the Axis2 Repo dir
- test_dir = _("target/test-classes/TestRampartBasic")
- # 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["sample*.axis2"].each do |axis2_file|
- sample_name = axis2_file.gsub(".axis2","")
- # create process directory
- proc_dir = "process-basic-#{sample_name}"
- mkdir proc_dir unless File.directory? proc_dir
- # copy files
- [axis2_file, "README-#{sample_name}.txt"].each{|f| cp f, proc_dir }
- # cp axis2_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|
- sample_id = sample_name[-2,2]
- l.gsub!("{sample.namespace}", "http://sample#{sample_id}.samples.rampart.apache.org")
- l.gsub!("{sample.service.name}", sample_name)
- f<<l
- }
- }
- end
- end
- end
- end
-
-
+
+ test.setup prepare_rampart_test(_("target/test-classes/TestRampartPolicy"), "sample*-policy.xml")
+ test.setup prepare_rampart_test(_("target/test-classes/TestRampartBasic"), "sample*.axis2")
end
Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/RampartBasicTest.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/RampartBasicTest.java?rev=738742&r1=738741&r2=738742&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/RampartBasicTest.java (original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/RampartBasicTest.java Thu Jan 29 03:50:25 2009
@@ -42,7 +42,7 @@
public Object[][] testPolicySamples() throws Exception {
File[] policies = new File(getClass().getClassLoader().getResource("TestRampartBasic").getFile()).listFiles(new FileFilter() {
public boolean accept(File pathname) {
- return pathname.isDirectory() && pathname.getName().matches("process-basic-sample\\d*");
+ return pathname.isDirectory() && pathname.getName().matches("process-sample\\d*");
}
});
Object[][] bundles = new Object[policies.length][];
@@ -81,4 +81,4 @@
server.undeployProcess(bundleName);
}
}
-}
\ No newline at end of file
+}
Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/RampartPolicyTest.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/RampartPolicyTest.java?rev=738742&r1=738741&r2=738742&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/RampartPolicyTest.java (original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/RampartPolicyTest.java Thu Jan 29 03:50:25 2009
@@ -38,7 +38,7 @@
public Object[][] testPolicySamples() throws Exception {
File[] policies = new File(getClass().getClassLoader().getResource("TestRampartPolicy").getFile()).listFiles(new FileFilter() {
public boolean accept(File pathname) {
- return pathname.isDirectory() && pathname.getName().matches("process-policy-sample\\d*");
+ return pathname.isDirectory() && pathname.getName().matches("process-sample\\d*\\-policy");
}
});
Object[][] bundles = new Object[policies.length][];
Copied: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-sample01-policy.txt (from r738741, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-policy-sample01.txt)
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-sample01-policy.txt?p2=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-sample01-policy.txt&p1=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-policy-sample01.txt&r1=738741&r2=738742&rev=738742&view=diff
==============================================================================
(empty)
Copied: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-sample02-policy.txt (from r738741, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-policy-sample02.txt)
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-sample02-policy.txt?p2=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-sample02-policy.txt&p1=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-policy-sample02.txt&r1=738741&r2=738742&rev=738742&view=diff
==============================================================================
(empty)
Copied: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-sample03-policy.txt (from r738741, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-policy-sample03.txt)
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-sample03-policy.txt?p2=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-sample03-policy.txt&p1=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-policy-sample03.txt&r1=738741&r2=738742&rev=738742&view=diff
==============================================================================
(empty)
Copied: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-sample04-policy.txt (from r738741, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-policy-sample04.txt)
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-sample04-policy.txt?p2=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-sample04-policy.txt&p1=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-policy-sample04.txt&r1=738741&r2=738742&rev=738742&view=diff
==============================================================================
(empty)
Copied: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/sample01-policy.xml (from r738741, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample01.xml)
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/sample01-policy.xml?p2=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/sample01-policy.xml&p1=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample01.xml&r1=738741&r2=738742&rev=738742&view=diff
==============================================================================
(empty)
Copied: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/sample02-policy.xml (from r738741, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample02.xml)
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/sample02-policy.xml?p2=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/sample02-policy.xml&p1=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample02.xml&r1=738741&r2=738742&rev=738742&view=diff
==============================================================================
(empty)
Copied: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/sample03-policy.xml (from r738741, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample03.xml)
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/sample03-policy.xml?p2=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/sample03-policy.xml&p1=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample03.xml&r1=738741&r2=738742&rev=738742&view=diff
==============================================================================
(empty)
Copied: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/sample04-policy.xml (from r738741, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample04.xml)
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/sample04-policy.xml?p2=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/sample04-policy.xml&p1=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample04.xml&r1=738741&r2=738742&rev=738742&view=diff
==============================================================================
(empty)
Copied: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/sample01-policy.aar (from r738741, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample01.aar)
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/sample01-policy.aar?p2=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/sample01-policy.aar&p1=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample01.aar&r1=738741&r2=738742&rev=738742&view=diff
==============================================================================
(empty)
Copied: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/sample02-policy.aar (from r738741, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample02.aar)
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/sample02-policy.aar?p2=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/sample02-policy.aar&p1=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample02.aar&r1=738741&r2=738742&rev=738742&view=diff
==============================================================================
(empty)
Copied: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/sample03-policy.aar (from r738741, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample03.aar)
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/sample03-policy.aar?p2=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/sample03-policy.aar&p1=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample03.aar&r1=738741&r2=738742&rev=738742&view=diff
==============================================================================
(empty)
Copied: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/sample04-policy.aar (from r738741, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample04.aar)
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/sample04-policy.aar?p2=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/sample04-policy.aar&p1=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample04.aar&r1=738741&r2=738742&rev=738742&view=diff
==============================================================================
(empty)