You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by va...@apache.org on 2013/09/14 14:12:06 UTC
[1/2] git commit: fixing a rampart testcase.
Updated Branches:
refs/heads/master a8a1333ee -> 8bf25e167
fixing a rampart testcase.
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/7e24e599
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/7e24e599
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/7e24e599
Branch: refs/heads/master
Commit: 7e24e599124c28069cbfe157b05f9db122a27ac0
Parents: a8a1333
Author: Tammo van Lessen <tv...@gmail.com>
Authored: Wed Sep 11 00:55:46 2013 +0200
Committer: Tammo van Lessen <tv...@gmail.com>
Committed: Sat Sep 14 14:10:55 2013 +0200
----------------------------------------------------------------------
.../sample02-policy-for-service.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/7e24e599/axis2-war/src/test/resources/TestRampartPolicy/secured-processes/process-sample02_standalone_policy/sample02-policy-for-service.xml
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/resources/TestRampartPolicy/secured-processes/process-sample02_standalone_policy/sample02-policy-for-service.xml b/axis2-war/src/test/resources/TestRampartPolicy/secured-processes/process-sample02_standalone_policy/sample02-policy-for-service.xml
index 451b263..a6888f7 100644
--- a/axis2-war/src/test/resources/TestRampartPolicy/secured-processes/process-sample02_standalone_policy/sample02-policy-for-service.xml
+++ b/axis2-war/src/test/resources/TestRampartPolicy/secured-processes/process-sample02_standalone_policy/sample02-policy-for-service.xml
@@ -56,7 +56,7 @@
<ramp:signatureCrypto>
<ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">
<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
- <ramp:property name="org.apache.ws.security.crypto.merlin.file">service.jks</ramp:property>
+ <ramp:property name="org.apache.ws.security.crypto.merlin.file">TestRampartPolicy/secured-processes/service.jks</ramp:property>
<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">apache</ramp:property>
</ramp:crypto>
</ramp:signatureCrypto>
[2/2] git commit: fixing ODE-960, thanks Denis for the patch!
Posted by va...@apache.org.
fixing ODE-960, thanks Denis for the patch!
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/8bf25e16
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/8bf25e16
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/8bf25e16
Branch: refs/heads/master
Commit: 8bf25e167c1402ed7e1f58a88bb4e92b0c1f8dcd
Parents: 7e24e59
Author: Tammo van Lessen <tv...@gmail.com>
Authored: Sat Sep 14 14:06:19 2013 +0200
Committer: Tammo van Lessen <tv...@gmail.com>
Committed: Sat Sep 14 14:11:09 2013 +0200
----------------------------------------------------------------------
.../java/org/apache/ode/bpel/runtime/ASSIGN.java | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/8bf25e16/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java
index 3c22630..df923bd 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java
@@ -518,17 +518,23 @@ class ASSIGN extends ACTIVITY {
NodeList nl = src.getChildNodes();
for (int i = 0; i < nl.getLength(); ++i)
replacement.appendChild(doc.importNode(nl.item(i), true));
- NamedNodeMap attrs = src.getAttributes();
- for (int i = 0; i < attrs.getLength(); ++i) {
- Attr attr = (Attr)attrs.item(i);
- replacement.setAttributeNodeNS((Attr)doc.importNode(attr, true));
- }
+ copyAttributes(doc, ptr, replacement);
+ copyAttributes(doc, src, replacement);
parent.replaceChild(replacement, ptr);
DOMUtils.copyNSContext(ptr, replacement);
return (lval == ptr) ? replacement : lval;
}
+ private void copyAttributes(Document doc, Element original,
+ Element replacement) {
+ NamedNodeMap attrs = original.getAttributes();
+ for (int i = 0; i < attrs.getLength(); ++i) {
+ Attr attr = (Attr)attrs.item(i);
+ replacement.setAttributeNodeNS((Attr)doc.importNode(attr, true));
+ }
+ }
+
private Element copyInto(Element lval, Element ptr, Element src) {
ptr.appendChild(ptr.getOwnerDocument().importNode(src, true));
return lval;