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/11 00:56:24 UTC

[1/3] git commit: upgrade to latest log4j

Updated Branches:
  refs/heads/ode-1.3.6.x 0bd9b9952 -> 98f2c006c


upgrade to latest log4j


Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/66373ee7
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/66373ee7
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/66373ee7

Branch: refs/heads/ode-1.3.6.x
Commit: 66373ee7c4fb908bb3062cc217ef9feb1dc2f34c
Parents: 0bd9b99
Author: Tammo van Lessen <tv...@gmail.com>
Authored: Wed Sep 11 00:53:25 2013 +0200
Committer: Tammo van Lessen <tv...@gmail.com>
Committed: Wed Sep 11 00:53:25 2013 +0200

----------------------------------------------------------------------
 dependencies.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ode/blob/66373ee7/dependencies.rb
----------------------------------------------------------------------
diff --git a/dependencies.rb b/dependencies.rb
index 874b241..67b1e43 100644
--- a/dependencies.rb
+++ b/dependencies.rb
@@ -98,7 +98,7 @@ KARAF               = [
                         group("org.apache.felix.gogo.command","org.apache.felix.gogo.runtime",
                           :under=>"org.apache.felix", :version=>"0.6.1")
                       ]
-LOG4J               = "log4j:log4j:jar:1.2.13"
+LOG4J               = "log4j:log4j:jar:1.2.17"
 OPENJPA             = ["org.apache.openjpa:openjpa:jar:1.2.1",
                        "net.sourceforge.serp:serp:jar:1.13.1"]
 


[2/3] git commit: missed to backport that from trunk. It is related to the move to H2 for testing.

Posted by va...@apache.org.
missed to backport that from trunk. It is related to the move to H2 for testing.


Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/f178a39d
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/f178a39d
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/f178a39d

Branch: refs/heads/ode-1.3.6.x
Commit: f178a39da90bd4029d5d078c0c1a74bf8f50b487
Parents: 66373ee
Author: Tammo van Lessen <tv...@gmail.com>
Authored: Wed Sep 11 00:54:43 2013 +0200
Committer: Tammo van Lessen <tv...@gmail.com>
Committed: Wed Sep 11 00:54:43 2013 +0200

----------------------------------------------------------------------
 axis2/src/main/java/org/apache/ode/axis2/ODEService.java        | 1 +
 bpel-api/src/main/java/org/apache/ode/bpel/iapi/BpelServer.java | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ode/blob/f178a39d/axis2/src/main/java/org/apache/ode/axis2/ODEService.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/ODEService.java b/axis2/src/main/java/org/apache/ode/axis2/ODEService.java
index 46a8296..b43bd45 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/ODEService.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/ODEService.java
@@ -104,6 +104,7 @@ public class ODEService {
         try {
             _txManager.begin();
             if (__log.isDebugEnabled()) __log.debug("Starting transaction.");
+            _server.acquireTransactionLocks();
 
             // Creating message exchange
             String messageId = new GUID().toString();

http://git-wip-us.apache.org/repos/asf/ode/blob/f178a39d/bpel-api/src/main/java/org/apache/ode/bpel/iapi/BpelServer.java
----------------------------------------------------------------------
diff --git a/bpel-api/src/main/java/org/apache/ode/bpel/iapi/BpelServer.java b/bpel-api/src/main/java/org/apache/ode/bpel/iapi/BpelServer.java
index b81a930..56bd775 100644
--- a/bpel-api/src/main/java/org/apache/ode/bpel/iapi/BpelServer.java
+++ b/bpel-api/src/main/java/org/apache/ode/bpel/iapi/BpelServer.java
@@ -126,4 +126,5 @@ public interface BpelServer {
      */
     DebuggerContext getDebugger(QName pid) throws BpelEngineException;
 
+    void acquireTransactionLocks();
 }


[3/3] git commit: fixing a rampart testcase.

Posted by va...@apache.org.
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/98f2c006
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/98f2c006
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/98f2c006

Branch: refs/heads/ode-1.3.6.x
Commit: 98f2c006cfeeac6f1cd7b49050d724e365f8f120
Parents: f178a39
Author: Tammo van Lessen <tv...@gmail.com>
Authored: Wed Sep 11 00:55:46 2013 +0200
Committer: Tammo van Lessen <tv...@gmail.com>
Committed: Wed Sep 11 00:55:46 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/98f2c006/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>