You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by sa...@apache.org on 2014/10/13 07:44:05 UTC
git commit: ODE-1021: All rampart testcases fixed
Repository: ode
Updated Branches:
refs/heads/ode-1.3.x 66bcc3293 -> 6c0a99579
ODE-1021: All rampart testcases fixed
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/6c0a9957
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/6c0a9957
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/6c0a9957
Branch: refs/heads/ode-1.3.x
Commit: 6c0a99579314dd471080313b89d6d30df6214256
Parents: 66bcc32
Author: sathwik <sa...@apache.org>
Authored: Mon Oct 13 11:13:33 2014 +0530
Committer: sathwik <sa...@apache.org>
Committed: Mon Oct 13 11:13:33 2014 +0530
----------------------------------------------------------------------
Rakefile | 10 +++++-----
.../secured-services/sample08.axis2 | 2 +-
.../secured-services/sample09.axis2 | 5 +++--
.../secured-services/services/sample09.aar | Bin 13330 -> 15306 bytes
4 files changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/6c0a9957/Rakefile
----------------------------------------------------------------------
diff --git a/Rakefile b/Rakefile
index ba00554..3ab9325 100644
--- a/Rakefile
+++ b/Rakefile
@@ -152,14 +152,14 @@ define "ode" do
test.setup unzip("#{webapp_dir}/WEB-INF"=>project("dao-jpa-ojpa-derby").package(:zip))
test.setup unzip("#{webapp_dir}/WEB-INF"=>project("dao-hibernate-db").package(:zip))
test.exclude('*') if ENV["notestng"]
- test.exclude 'org.apache.ode.axis2.rampart.policy.SecuredProcessesTest','org.apache.ode.axis2.rampart.policy.SecuredServicesTest'
+
NativeDB.prepare_configs test, _(".")
- #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 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 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)
+ 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"
http://git-wip-us.apache.org/repos/asf/ode/blob/6c0a9957/axis2-war/src/test/resources/TestRampartBasic/secured-services/sample08.axis2
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/resources/TestRampartBasic/secured-services/sample08.axis2 b/axis2-war/src/test/resources/TestRampartBasic/secured-services/sample08.axis2
index 503e46c..d681ef2 100644
--- a/axis2-war/src/test/resources/TestRampartBasic/secured-services/sample08.axis2
+++ b/axis2-war/src/test/resources/TestRampartBasic/secured-services/sample08.axis2
@@ -23,7 +23,7 @@
<parameter name="OutflowSecurity">
<action>
- <items>Timestamp Signature NoSerialization</items>
+ <items>Timestamp Signature</items>
<user>client</user>
<passwordCallbackClass>org.apache.rampart.samples.sample08.PWCBHandler</passwordCallbackClass>
<signatureKeyIdentifier>DirectReference</signatureKeyIdentifier>
http://git-wip-us.apache.org/repos/asf/ode/blob/6c0a9957/axis2-war/src/test/resources/TestRampartBasic/secured-services/sample09.axis2
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/resources/TestRampartBasic/secured-services/sample09.axis2 b/axis2-war/src/test/resources/TestRampartBasic/secured-services/sample09.axis2
index ab93f9c..99b586d 100644
--- a/axis2-war/src/test/resources/TestRampartBasic/secured-services/sample09.axis2
+++ b/axis2-war/src/test/resources/TestRampartBasic/secured-services/sample09.axis2
@@ -24,9 +24,9 @@
<items>Encrypt</items>
<user>client</user>
<encryptionKeyIdentifier>EmbeddedKeyName</encryptionKeyIdentifier>
- <EmbeddedKeyCallbackClass>org.apache.rampart.samples.sample09.PWCBHandler</EmbeddedKeyCallbackClass>
+ <embeddedKeyCallbackClass>org.apache.rampart.samples.sample09.PWCBHandler</embeddedKeyCallbackClass>
<encryptionPropFile>TestRampartBasic/secured-services/client.properties</encryptionPropFile>
- <EmbeddedKeyName>SessionKey</EmbeddedKeyName>
+ <embeddedKeyName>SessionKey</embeddedKeyName>
</action>
</parameter>
@@ -35,6 +35,7 @@
<items>Encrypt</items>
<passwordCallbackClass>org.apache.rampart.samples.sample09.PWCBHandler</passwordCallbackClass>
<decryptionPropFile>TestRampartBasic/secured-services/client.properties</decryptionPropFile>
+ <isBSPCompliant>false</isBSPCompliant>
</action>
</parameter>
http://git-wip-us.apache.org/repos/asf/ode/blob/6c0a9957/axis2-war/src/test/resources/TestRampartBasic/secured-services/services/sample09.aar
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/resources/TestRampartBasic/secured-services/services/sample09.aar b/axis2-war/src/test/resources/TestRampartBasic/secured-services/services/sample09.aar
index d204a18..0d22c20 100644
Binary files a/axis2-war/src/test/resources/TestRampartBasic/secured-services/services/sample09.aar and b/axis2-war/src/test/resources/TestRampartBasic/secured-services/services/sample09.aar differ