You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by rr...@apache.org on 2010/07/07 12:24:18 UTC
svn commit: r961340 - in /ode/trunk: ./
axis2-war/src/test/java/org/apache/ode/axis2/
scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/
utils/src/main/java/org/apache/ode/utils/
Author: rr
Date: Wed Jul 7 10:24:17 2010
New Revision: 961340
URL: http://svn.apache.org/viewvc?rev=961340&view=rev
Log:
Axis2 War tests fix
Modified:
ode/trunk/Rakefile
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/SoapHeaderTest.java
ode/trunk/dependencies.rb
ode/trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/DatabaseDelegate.java
ode/trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/JdbcDelegate.java
ode/trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java
ode/trunk/utils/src/main/java/org/apache/ode/utils/LoggingInterceptor.java
Modified: ode/trunk/Rakefile
URL: http://svn.apache.org/viewvc/ode/trunk/Rakefile?rev=961340&r1=961339&r2=961340&view=diff
==============================================================================
--- ode/trunk/Rakefile (original)
+++ ode/trunk/Rakefile Wed Jul 7 10:24:17 2010
@@ -103,7 +103,7 @@ define "ode" do
end
end
- test.using :testng, :forkmode=>'perTest', :properties=>{ "log4j.debug" => true, "log4j.configuration"=>"test-log4j.properties", "test.ports" => ENV['TEST_PORTS'] }, :java_args=>['-Xmx1024M', '-XX:MaxPermSize=256m']
+ test.using :testng, :forkmode=>'perTest', :properties=>{ "log4j.debug" => true, "log4j.configuration"=>"test-log4j.properties", "test.ports" => ENV['TEST_PORTS'], "org.apache.ode.scheduler.deleteJobsOnStart" => "true" }
#:java_args=>['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=6001', '-Xmx1024M', '-XX:MaxPermSize=1024m']
test.with projects("tools"), libs, AXIS2_MODULES.mods, AXIOM, JAVAX.servlet, Buildr::Jetty::REQUIRES, HIBERNATE, DOM4J, SLF4J, LOG4J, H2::REQUIRES
webapp_dir = "#{test.compile.target}/webapp"
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/SoapHeaderTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/SoapHeaderTest.java?rev=961340&r1=961339&r2=961340&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/SoapHeaderTest.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/SoapHeaderTest.java Wed Jul 7 10:24:17 2010
@@ -85,7 +85,7 @@ public class SoapHeaderTest extends Axis
assertEquals("ConversationId", cidElemt.getLocalName());
assertEquals("ZZYV", cidElemt.getTextContent());
- server.undeployProcess("TestStructuredFault");
+ server.undeployProcess("TestSoapHeader");
}
}
Modified: ode/trunk/dependencies.rb
URL: http://svn.apache.org/viewvc/ode/trunk/dependencies.rb?rev=961340&r1=961339&r2=961340&view=diff
==============================================================================
--- ode/trunk/dependencies.rb (original)
+++ ode/trunk/dependencies.rb Wed Jul 7 10:24:17 2010
@@ -21,13 +21,13 @@ AXIOM = [ group("axiom-api
AXIS2_ALL = [group("axis2-kernel", "axis2-adb", "axis2-codegen", "axis2-java2wsdl",
"axis2-jibx", "axis2-saaj", "axis2-xmlbeans",
:under=>"org.apache.axis2",
- :version=>"1.5.1"),
+ :version=>"1.5"),
group("woden-api", "woden-impl-dom",
:under=>"org.apache.woden",
:version=>"1.0M8"),
- "org.apache.axis2:axis2-transport-base:jar:1.0.0",
- "org.apache.axis2:axis2-transport-http:jar:1.5.1",
- "org.apache.axis2:axis2-transport-local:jar:1.5.1",
+ "org.apache.axis2:axis2-transports:jar:1.0-i6",
+ "org.apache.axis2:axis2-transport-http:jar:1.5",
+ "org.apache.axis2:axis2-transport-local:jar:1.5",
"org.apache.axis2:axis2-transport-tcp:jar:1.0.0",
"org.apache.axis2:axis2-transport-jms:jar:1.0.0",
"org.apache.httpcomponents:httpcore:jar:4.0"]
@@ -54,7 +54,7 @@ COMMONS = struct(
:fileupload =>"commons-fileupload:commons-fileupload:jar:1.1.1",
:httpclient =>"commons-httpclient:commons-httpclient:jar:3.1",
:lang =>"commons-lang:commons-lang:jar:2.4",
- :logging =>"commons-logging:commons-logging:jar:1.1",
+ :logging =>"commons-logging:commons-logging:jar:1.1.1",
:io =>"commons-io:commons-io:jar:1.4",
:pool =>"commons-pool:commons-pool:jar:1.4",
:primitives =>"commons-primitives:commons-primitives:jar:1.0",
@@ -136,7 +136,7 @@ XERCES = "xerces:xercesImpl
WS_COMMONS = struct(
:axiom =>AXIOM,
:neethi =>"org.apache.neethi:neethi:jar:2.0.4",
- :xml_schema =>"org.apache.ws.commons.schema:XmlSchema:jar:1.4.3"
+ :xml_schema =>"org.apache.ws.commons.schema:XmlSchema:jar:1.3.2"
)
XBEAN = [
"org.apache.xbean:xbean-kernel:jar:3.3",
Modified: ode/trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/DatabaseDelegate.java
URL: http://svn.apache.org/viewvc/ode/trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/DatabaseDelegate.java?rev=961340&r1=961339&r2=961340&view=diff
==============================================================================
--- ode/trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/DatabaseDelegate.java (original)
+++ ode/trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/DatabaseDelegate.java Wed Jul 7 10:24:17 2010
@@ -105,4 +105,6 @@ public interface DatabaseDelegate {
int updateReassign(String oldnode, String newnode) throws DatabaseException;
public void acquireTransactionLocks();
+
+ public void deleteAllJobs();
}
Modified: ode/trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/JdbcDelegate.java
URL: http://svn.apache.org/viewvc/ode/trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/JdbcDelegate.java?rev=961340&r1=961339&r2=961340&view=diff
==============================================================================
--- ode/trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/JdbcDelegate.java (original)
+++ ode/trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/JdbcDelegate.java Wed Jul 7 10:24:17 2010
@@ -498,6 +498,25 @@ public class JdbcDelegate implements Dat
}
}
+ public void deleteAllJobs() {
+ Statement s = null;
+ Connection c = null;
+ try {
+ c = getConnection();
+ s = c.createStatement();
+ s.execute("delete from ODE_JOB");
+ } catch (Exception e) {
+ throw new RuntimeException("", e);
+ } finally {
+ try {
+ if (s != null) s.close();
+ if (c != null) c.close();
+ } catch (Exception e) {
+ throw new RuntimeException("", e);
+ }
+ }
+ }
+
enum Dialect {
DB2, DERBY, FIREBIRD, HSQL, MYSQL, ORACLE, SQLSERVER, SYBASE, SYBASE12, H2, UNKNOWN
}
Modified: ode/trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java
URL: http://svn.apache.org/viewvc/ode/trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java?rev=961340&r1=961339&r2=961340&view=diff
==============================================================================
--- ode/trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java (original)
+++ ode/trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java Wed Jul 7 10:24:17 2010
@@ -428,6 +428,23 @@ public class SimpleScheduler implements
if (_running)
return;
+ if (Boolean.parseBoolean(System.getProperty("org.apache.ode.scheduler.deleteJobsOnStart", "false"))) {
+ __log.debug("DeleteJobsOnStart");
+ try {
+ execTransaction(new Callable<Void>() {
+ public Void call() throws Exception {
+ _db.deleteAllJobs();
+ return null;
+ }
+ });
+ } catch (Exception ex) {
+ __log.error("", ex);
+ throw new ContextException("", ex);
+ }
+ } else {
+ __log.debug("no DeleteJobsOnStart");
+ }
+
if (_exec == null)
_exec = Executors.newCachedThreadPool();
Modified: ode/trunk/utils/src/main/java/org/apache/ode/utils/LoggingInterceptor.java
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/main/java/org/apache/ode/utils/LoggingInterceptor.java?rev=961340&r1=961339&r2=961340&view=diff
==============================================================================
--- ode/trunk/utils/src/main/java/org/apache/ode/utils/LoggingInterceptor.java (original)
+++ ode/trunk/utils/src/main/java/org/apache/ode/utils/LoggingInterceptor.java Wed Jul 7 10:24:17 2010
@@ -106,7 +106,9 @@ public class LoggingInterceptor<T> imple
print("Set isolation level to " + args[0]);
}
// JDBC Statement
- else if (method.getName().startsWith("execute")) {
+ else if (method.getName().startsWith("execute") && args != null && args.length == 1 && args[0] instanceof String) {
+ print(method.getName() + "(" + args[0] + "), " + getParams());
+ } else if (method.getName().startsWith("execute")) {
print(method.getName() + ", " + getParams());
} else if ("clearParameters".equals(method.getName())) {
_paramsByIdx.clear();