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/08/27 01:19:55 UTC

[1/9] git commit: reverting to an older Jacob snapshot.

Updated Branches:
  refs/heads/master 31a0648db -> a39f8db9b


reverting to an older Jacob snapshot.


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

Branch: refs/heads/master
Commit: 392a180dc4fe7de7f71c9b3e9c469b607b145561
Parents: 31a0648
Author: Tammo van Lessen <tv...@gmail.com>
Authored: Tue Aug 27 00:02:24 2013 +0200
Committer: Tammo van Lessen <tv...@gmail.com>
Committed: Tue Aug 27 00:02:24 2013 +0200

----------------------------------------------------------------------
 dependencies.rb | 2 +-
 repositories.rb | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ode/blob/392a180d/dependencies.rb
----------------------------------------------------------------------
diff --git a/dependencies.rb b/dependencies.rb
index 07db197..9f1aa7c 100644
--- a/dependencies.rb
+++ b/dependencies.rb
@@ -71,7 +71,7 @@ GERONIMO            = struct(
 HIBERNATE           = [ "org.hibernate:hibernate-core:jar:3.3.2.GA", "javassist:javassist:jar:3.4.GA", "antlr:antlr:jar:2.7.6",
                         "asm:asm:jar:1.5.3", "cglib:cglib:jar:2.1_3", "net.sf.ehcache:ehcache:jar:1.2.3" ]
 HSQLDB              = "hsqldb:hsqldb:jar:1.8.0.7"
-JACOB               = "org.apache.ode:jacob:jar:2.0-SNAPSHOT"
+JACOB               = "org.apache.ode:jacob:jar:2.0a-SNAPSHOT"
 JAVAX               = struct(
   :activation       =>"javax.activation:activation:jar:1.1",
   #:activation       =>"geronimo-spec:geronimo-spec-activation:jar:1.0.2-rc4",

http://git-wip-us.apache.org/repos/asf/ode/blob/392a180d/repositories.rb
----------------------------------------------------------------------
diff --git a/repositories.rb b/repositories.rb
index 5e988d5..18fbbaf 100644
--- a/repositories.rb
+++ b/repositories.rb
@@ -19,6 +19,7 @@ repositories.remote << "http://repo1.maven.org/maven2"
 repositories.remote << "http://people.apache.org/repo/m2-snapshot-repository"
 repositories.remote << "http://download.java.net/maven/2"
 repositories.remote << "http://svn.apache.org/repos/asf/servicemix/m2-repo"
+repositories.remote << "https://repository.apache.org/content/groups/snapshots"
 repositories.remote << "http://www.aqute.biz/repo" # TODO: remove me
 repositories.remote << "http://www.intalio.org/public/maven2" # TODO: remove me
 repositories.release_to[:url] ||= "sftp://guest@localhost/home/guest"


[8/9] git commit: fixes ODE-999

Posted by va...@apache.org.
fixes ODE-999


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

Branch: refs/heads/master
Commit: 498d645ea1acf844dd288362e29f8554ab889bf6
Parents: 19854fb
Author: Tammo van Lessen <tv...@gmail.com>
Authored: Mon Aug 26 20:42:31 2013 +0200
Committer: Tammo van Lessen <tv...@gmail.com>
Committed: Tue Aug 27 01:04:34 2013 +0200

----------------------------------------------------------------------
 Rakefile                                                     | 3 ++-
 bpel-obj/src/main/java/org/apache/ode/bpel/o/Serializer.java | 2 +-
 jbi-karaf/src/main/resources/features.xml                    | 5 +++++
 3 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ode/blob/498d645e/Rakefile
----------------------------------------------------------------------
diff --git a/Rakefile b/Rakefile
index ca91737..10eb055 100644
--- a/Rakefile
+++ b/Rakefile
@@ -558,8 +558,9 @@ define "ode" do
       # embedd *.xsd, *.xml, xmlbeans* from ode libs
       embedres = ode_libs.map {|pkg| ['**.xsd', '**.xml', 'schemaorg_apache_xmlbeans/**'].map {|x| '@' + pkg.to_s + '!/' + x}}.join(', ')
       bnd['Export-Package'] = "org.apache.ode*;version=#{VERSION_NUMBER};-split-package:=merge-first"
-      bnd['Import-Package'] = '!com.sun.mirror*, !org.apache.axis2.client*, !org.apache.ode*, javax.jbi*;version="1.0", javax.transaction*;version="[1.1,1.2)", javax.xml.stream;version="[1.0,2)", org.apache.axiom.om.impl.dom;resolution:=optional, org.apache.axis2*;resolution:=optional, org.apache.commons.beanutils;version="[1.8,2)", org.apache.commons.collections*;version="[3.2,4)", org.apache.commons.httpclient*;version="[3,4]", org.apache.commons.io;version="[1.4,2)", org.apache.commons.lang;version="[2.4,3)", org.apache.commons.logging*;version="[1.1,1.2)", org.apache.derby.jdbc;resolution:=optional, org.apache.geronimo.transaction.manager;version="[2,3)", org.apache.openjpa.jdbc.kernel;version="1.2.1", org.springframework.osgi.service.exporter.support, org.osgi.service.cm, org.springframework.osgi.compendium.cm, com.ibm.wsdl*;version="[1.6,2)", org.apache.xmlbeans.impl.schema;version="[2.5,3)", org.apache.xmlbeans*;version="[2.5,3)", org.hibernate*;resolution:=optional, org.hsql
 db.jdbc;resolution:=optional, org.osgi.framework;version="[1.5,2)", org.osgi.util.tracker;version="[1.4,2)", org.springframework.beans.factory*;version="[2.5,4)", org.springframework.context*;version="[2.5,4)", org.springframework.osgi.context;version="[1.2,2)", net.sf.saxon.event;version="[9.1,9.2)", net.sf.saxon*;version="[9.1,9.2)",javax.wsdl*;version="[1.2,2)",javax.resource*;version="[1.5, 2]",org.apache.geronimo.connector.outbound*;version="[2.1,3)",org.apache.log4j*;version="[1.2,2)",org.apache.openjpa*;version="[1.2,2)",*'
+      bnd['Import-Package'] = '!com.sun.mirror*, !org.apache.axis2.client*, !org.apache.ode*, javax.jbi*;version="1.0", javax.transaction*;version="[1.1,1.2)", javax.xml.stream;version="[1.0,2)", org.apache.axiom*;resolution:=optional, org.apache.axis2*;resolution:=optional, org.apache.commons.beanutils;version="[1.8,2)", org.apache.commons.collections*;version="[3.2,4)", org.apache.commons.httpclient*;resolution:=optional, org.apache.commons.io;version="[1.4,2)", org.apache.commons.lang;version="[2.4,3)", org.apache.commons.logging*;version="[1.1,1.2)", org.apache.derby.jdbc;resolution:=optional, org.apache.geronimo.transaction.manager;version="[2,3)", org.apache.openjpa.jdbc.kernel;version="1.2.1", org.springframework.osgi.service.exporter.support, org.osgi.service.cm, org.springframework.osgi.compendium.cm, com.ibm.wsdl*;version="[1.6,2)", org.apache.xmlbeans.impl.schema;version="[2.5,3)", org.apache.xmlbeans*;version="[2.5,3)", org.hibernate*;resolution:=optional, org.hsqldb.jdb
 c;resolution:=optional, org.osgi.framework;version="[1.5,2)", org.osgi.util.tracker;version="[1.4,2)", org.springframework.beans.factory*;version="[2.5,4)", org.springframework.context*;version="[2.5,4)", org.springframework.osgi.context;version="[1.2,2)", net.sf.saxon.event;version="[9.1,9.2)", net.sf.saxon*;version="[9.1,9.2)",javax.wsdl*;version="[1.2,2)",javax.resource*;version="[1.5, 2]",org.apache.geronimo.connector.outbound*;version="[2.1,3)",org.apache.log4j*;version="[1.2,2)",org.apache.openjpa*;version="[1.2,2)",*'
       bnd['Embed-Dependency'] = '*;inline=**.xsd|schemaorg_apache_xmlbeans/**|**.xml'
+      bnd['DynamicImport-Package'] = '*'
       bnd['Include-Resource'] = [embedres, _('src/main/resources'), inlines].flatten.join(', ')
       bnd['Bundle-Vendor'] = 'Apache Software Foundation'
       bnd['Bundle-License'] = 'http://www.apache.org/licenses/LICENSE-2.0'

http://git-wip-us.apache.org/repos/asf/ode/blob/498d645e/bpel-obj/src/main/java/org/apache/ode/bpel/o/Serializer.java
----------------------------------------------------------------------
diff --git a/bpel-obj/src/main/java/org/apache/ode/bpel/o/Serializer.java b/bpel-obj/src/main/java/org/apache/ode/bpel/o/Serializer.java
index aab73eb..5c3e653 100644
--- a/bpel-obj/src/main/java/org/apache/ode/bpel/o/Serializer.java
+++ b/bpel-obj/src/main/java/org/apache/ode/bpel/o/Serializer.java
@@ -134,7 +134,7 @@ public class Serializer  {
         try {
             oprocess = (OProcess) ois.readObject();
         } catch (ClassNotFoundException e) {
-            throw new IOException("DataStream Error");
+            throw new IOException("DataStream Error", e);
         } finally {
             try {
                 if (ois != null)

http://git-wip-us.apache.org/repos/asf/ode/blob/498d645e/jbi-karaf/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/jbi-karaf/src/main/resources/features.xml b/jbi-karaf/src/main/resources/features.xml
index 102619a..cf757eb 100644
--- a/jbi-karaf/src/main/resources/features.xml
+++ b/jbi-karaf/src/main/resources/features.xml
@@ -19,11 +19,13 @@
 <features>
     <feature name="ode-core-deps" version="${ode.version}">
         <feature>transaction</feature>
+        <feature>jbi</feature>
         <bundle>mvn:commons-collections/commons-collections/${commons.collections.version}</bundle>
         <bundle>mvn:commons-beanutils/commons-beanutils/1.8.2</bundle>
         <bundle>mvn:commons-io/commons-io/1.4</bundle>
         <bundle>wrap:mvn:jaxen/jaxen/1.1.1</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/9.1.0.8_1</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/2.0.0</bundle>
         <bundle>mvn:org.apache.geronimo.components/geronimo-connector/2.1.3</bundle>
     </feature>
     <feature name="ode-core" version="${ode.version}">
@@ -74,14 +76,17 @@
         <bundle>mvn:org.apache.ode/ode-jbi-karaf-commands/${ode.version}</bundle>
     </feature>
     <feature name="ode-pmapi-httpbinding" version="${ode.version}">
+        <feature>servicemix-cxf-bc</feature>
         <bundle>mvn:org.apache.ode/ode-jbi-karaf-pmapi-httpbinding/${ode.version}</bundle>
     </feature>
     <feature name="examples-ode-ping-pong" version="${ode.version}">
         <feature version="${ode.version}">ode</feature>
+        <feature>servicemix-cxf-bc</feature>
         <bundle>mvn:org.apache.ode.examples/ping-pong-bundle/${ode.version}</bundle>
     </feature>
     <feature name="examples-ode-helloworld" version="${ode.version}">
         <feature version="${ode.version}">ode</feature>
+        <feature>servicemix-cxf-bc</feature>
         <bundle>mvn:org.apache.ode.examples/helloworld-bundle/${ode.version}</bundle>
     </feature>
 


[2/9] git commit: improve logging

Posted by va...@apache.org.
improve logging

sets the commons logging factory explicitly back to its default in order to NOT use GeronimoLog, which renders the classname information in logs completely useless.


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

Branch: refs/heads/master
Commit: ce03197fa727364014973b42566ab252271080c0
Parents: 392a180
Author: Tammo van Lessen <tv...@gmail.com>
Authored: Fri Aug 23 19:37:30 2013 +0200
Committer: Tammo van Lessen <tv...@gmail.com>
Committed: Tue Aug 27 00:09:38 2013 +0200

----------------------------------------------------------------------
 Rakefile                                                  |  2 +-
 .../services/org.apache.commons.logging.LogFactory        |  1 +
 axis2-war/src/test/resources/test-log4j.properties        | 10 +++++-----
 .../services/org.apache.commons.logging.LogFactory        |  2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ode/blob/ce03197f/Rakefile
----------------------------------------------------------------------
diff --git a/Rakefile b/Rakefile
index 7802806..64eef30 100644
--- a/Rakefile
+++ b/Rakefile
@@ -126,7 +126,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'], "org.apache.ode.scheduler.deleteJobsOnStart" => "true", "org.apache.ode.autoRetireProcess"=>"true" } #, :java_args=>['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=6001', '-Xmx2048m', '-XX:MaxPermSize=256m']
+    test.using :testng, :forkmode=>'perTest', :properties=>{ "org.apache.commons.logging.LogFactory" => "org.apache.commons.logging.impl.LogFactoryImpl", "log4j.configuration"=>"test-log4j.properties", "test.ports" => ENV['TEST_PORTS'], "org.apache.ode.scheduler.deleteJobsOnStart" => "true", "org.apache.ode.autoRetireProcess"=>"true" } #, :java_args=>['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=6001', '-Xmx2048m', '-XX:MaxPermSize=256m']
     test.with projects("tools"), libs, AXIS2_MODULES.mods, AXIOM, JAVAX.servlet, Buildr::Jetty::REQUIRES, HIBERNATE, DOM4J, H2::REQUIRES, SPRING_TEST
     webapp_dir = "#{test.compile.target}/webapp"
     test.setup task(:prepare_webapp) do |task|

http://git-wip-us.apache.org/repos/asf/ode/blob/ce03197f/axis2-war/src/main/webapp/WEB-INF/classes/META-INF/services/org.apache.commons.logging.LogFactory
----------------------------------------------------------------------
diff --git a/axis2-war/src/main/webapp/WEB-INF/classes/META-INF/services/org.apache.commons.logging.LogFactory b/axis2-war/src/main/webapp/WEB-INF/classes/META-INF/services/org.apache.commons.logging.LogFactory
new file mode 100644
index 0000000..c617f1c
--- /dev/null
+++ b/axis2-war/src/main/webapp/WEB-INF/classes/META-INF/services/org.apache.commons.logging.LogFactory
@@ -0,0 +1 @@
+org.apache.commons.logging.impl.LogFactoryImpl
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ode/blob/ce03197f/axis2-war/src/test/resources/test-log4j.properties
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/resources/test-log4j.properties b/axis2-war/src/test/resources/test-log4j.properties
index 58d69a4..09b8e7c 100644
--- a/axis2-war/src/test/resources/test-log4j.properties
+++ b/axis2-war/src/test/resources/test-log4j.properties
@@ -33,9 +33,9 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} | %-5p | %-10t | %-24.24c{1} | %-30.30C %4L | %m%n
 
-log4j.category.httpclient=INFO
-log4j.category.httpclient.Wire=INFO
+log4j.category.httpclient=WARN
+log4j.category.httpclient.Wire=WARN
 log4j.category.org.apache.ode=INFO
-log4j.category.hibernate=INFO
-log4j.category.org.hibernate=INFO
-log4j.category.org.apache.axis2=INFO
+log4j.category.hibernate=WARN
+log4j.category.org.hibernate=WARN
+log4j.category.org.apache.axis2=INFO
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ode/blob/ce03197f/bpel-test/src/test/resources/META-INF/services/org.apache.commons.logging.LogFactory
----------------------------------------------------------------------
diff --git a/bpel-test/src/test/resources/META-INF/services/org.apache.commons.logging.LogFactory b/bpel-test/src/test/resources/META-INF/services/org.apache.commons.logging.LogFactory
index c0589c9..c617f1c 100644
--- a/bpel-test/src/test/resources/META-INF/services/org.apache.commons.logging.LogFactory
+++ b/bpel-test/src/test/resources/META-INF/services/org.apache.commons.logging.LogFactory
@@ -1 +1 @@
-org.apache.commons.logging.impl.Log4JLogger
\ No newline at end of file
+org.apache.commons.logging.impl.LogFactoryImpl
\ No newline at end of file


[6/9] git commit: fixing ODE-302

Posted by va...@apache.org.
fixing ODE-302


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

Branch: refs/heads/master
Commit: 558b2c67ab45dd39e9da982cb9cb3cc32debabbc
Parents: 64be6dc
Author: Tammo van Lessen <tv...@gmail.com>
Authored: Tue Aug 27 00:19:32 2013 +0200
Committer: Tammo van Lessen <tv...@gmail.com>
Committed: Tue Aug 27 00:19:32 2013 +0200

----------------------------------------------------------------------
 Rakefile                                            |  2 +-
 .../main/java/org/apache/ode/jbi/OdeContext.java    | 12 +++++++++++-
 .../main/java/org/apache/ode/jbi/OdeLifeCycle.java  | 16 +++++++++++++++-
 3 files changed, 27 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ode/blob/558b2c67/Rakefile
----------------------------------------------------------------------
diff --git a/Rakefile b/Rakefile
index d5744f4..ca91737 100644
--- a/Rakefile
+++ b/Rakefile
@@ -396,7 +396,7 @@ define "ode" do
   define "jbi" do
     compile.with projects("bpel-api", "bpel-connector", "bpel-dao", "bpel-epr", "bpel-obj",
       "bpel-runtime", "scheduler-simple", "bpel-schemas", "bpel-store", "utils", "agents"),
-      AXIOM, COMMONS.pool, JAVAX.transaction, JBI, WSDL4J, XERCES, SLF4J, LOG4J
+      AXIOM, COMMONS.logging, COMMONS.pool, JAVAX.transaction, GERONIMO.transaction, JBI, SLF4J, LOG4J, WSDL4J, XERCES
 
     package(:jar)
     package(:jbi).tap do |jbi|

http://git-wip-us.apache.org/repos/asf/ode/blob/558b2c67/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java
----------------------------------------------------------------------
diff --git a/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java b/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java
index ef2c67a..3fabd87 100644
--- a/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java
+++ b/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java
@@ -75,6 +75,8 @@ final public class OdeContext {
     private static OdeContext __self;
 
     private ComponentContext _context;
+    
+    private TransactionManager _txm;
 
     private Map<QName, Document> _descriptorCache = new ConcurrentHashMap<QName, Document>();
 
@@ -171,7 +173,15 @@ final public class OdeContext {
     }
 
     public TransactionManager getTransactionManager() {
-        return (TransactionManager) getContext().getTransactionManager();
+        if (_txm != null) {
+            return (TransactionManager) getContext().getTransactionManager();
+        }
+        
+        return _txm;
+    }
+    
+    public void setTransactionManager(TransactionManager txm) {
+        _txm = txm;
     }
 
     public synchronized MyEndpointReference activateEndpoint(QName pid, Endpoint endpoint) throws Exception {

http://git-wip-us.apache.org/repos/asf/ode/blob/558b2c67/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java
----------------------------------------------------------------------
diff --git a/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java b/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java
index 46fbce9..40fb044 100644
--- a/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java
+++ b/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java
@@ -33,12 +33,12 @@ import javax.transaction.TransactionManager;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
 import org.apache.ode.bpel.connector.BpelServerConnector;
 import org.apache.ode.bpel.dao.BpelDAOConnectionFactoryJDBC;
 import org.apache.ode.bpel.engine.BpelServerImpl;
 import org.apache.ode.bpel.engine.ProcessAndInstanceManagementMBean;
 import org.apache.ode.bpel.extvar.jdbc.JdbcExternalVariableModule;
-
 import org.apache.ode.bpel.iapi.BpelEventListener;
 import org.apache.ode.bpel.intercept.MessageExchangeInterceptor;
 import org.apache.ode.il.dbutil.Database;
@@ -180,6 +180,20 @@ public class OdeLifeCycle implements ComponentLifeCycle {
     }
 
     private void initDataSource() throws JBIException {
+        switch (_ode._config.getDbMode()) {
+        case EMBEDDED:
+        case INTERNAL:
+            try {
+                TransactionManager txm = new GeronimoTransactionManager();
+                _ode.setTransactionManager(txm);
+            } catch (Exception e) {
+                throw new RuntimeException("Unable to create Geronimo Transaction Manager", e);
+            }
+            break;
+        default:
+            break;
+        }
+        
         _db = Database.create(_ode._config);
         _db.setTransactionManager(_ode.getTransactionManager());
         _db.setWorkRoot(new File(_ode.getContext().getInstallRoot()));


[5/9] git commit: import bpel-scripts correctly in eclipse.

Posted by va...@apache.org.
import bpel-scripts correctly in eclipse.


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

Branch: refs/heads/master
Commit: 64be6dcefd6e37e107c845cb8aea096491343a99
Parents: d3e0e7a
Author: Tammo van Lessen <tv...@gmail.com>
Authored: Mon Aug 26 00:15:06 2013 +0200
Committer: Tammo van Lessen <tv...@gmail.com>
Committed: Tue Aug 27 00:10:15 2013 +0200

----------------------------------------------------------------------
 Rakefile | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ode/blob/64be6dce/Rakefile
----------------------------------------------------------------------
diff --git a/Rakefile b/Rakefile
index 64eef30..d5744f4 100644
--- a/Rakefile
+++ b/Rakefile
@@ -251,6 +251,8 @@ define "ode" do
 
   desc "ODE BPEL Test Script Files"
   define "bpel-scripts" do
+    eclipse.natures = :java
+
     package :jar
   end
 


[3/9] git commit: ODE-997: Throw an exception if an external datasource is configured but no JTA transaction manager is passed in (which is needed to let ODE do its work properly).

Posted by va...@apache.org.
ODE-997: Throw an exception if an external datasource is configured but no JTA transaction manager is passed in (which is needed to let ODE do its work properly).


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

Branch: refs/heads/master
Commit: 4a281a73c9645b2fd1b92659b999a1371ecfb9b0
Parents: ce03197
Author: Tammo van Lessen <tv...@gmail.com>
Authored: Fri Aug 23 19:38:51 2013 +0200
Committer: Tammo van Lessen <tv...@gmail.com>
Committed: Tue Aug 27 00:09:52 2013 +0200

----------------------------------------------------------------------
 axis2/src/main/java/org/apache/ode/axis2/ODEServer.java | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ode/blob/4a281a73/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java b/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
index 8237acc..7ed6483 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
@@ -73,6 +73,7 @@ import org.apache.ode.bpel.intercept.MessageExchangeInterceptor;
 import org.apache.ode.bpel.memdao.BpelDAOConnectionFactoryImpl;
 import org.apache.ode.bpel.pmapi.InstanceManagement;
 import org.apache.ode.bpel.pmapi.ProcessManagement;
+import org.apache.ode.il.config.OdeConfigProperties;
 import org.apache.ode.il.dbutil.Database;
 import org.apache.ode.scheduler.simple.JdbcDelegate;
 import org.apache.ode.scheduler.simple.SimpleScheduler;
@@ -416,6 +417,11 @@ public class ODEServer {
 
     @SuppressWarnings("unchecked")
      private void initTxMgr() throws ServletException {
+        if (_odeConfig.getDbMode().equals(OdeConfigProperties.DatabaseMode.EXTERNAL) &&
+                _odeConfig.getTxFactoryClass().equals(OdeConfigProperties.DEFAULT_TX_FACTORY_CLASS_NAME)) {
+            throw new ServletException("No external transaction manager factory configured. Please use the INTERNAL mode or configure an external transaction manager that is associated with external datasource.");
+        }
+        
         String txFactoryName = _odeConfig.getTxFactoryClass();
         __log.debug("Initializing transaction manager using " + txFactoryName);
         try {


[4/9] git commit: fixing ODE-461, thanks to Alexey Ousov for the patch.

Posted by va...@apache.org.
fixing ODE-461, thanks to Alexey Ousov 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/d3e0e7ad
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/d3e0e7ad
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/d3e0e7ad

Branch: refs/heads/master
Commit: d3e0e7adc6ce0c2d6634fa54434de885cd4b7006
Parents: 4a281a7
Author: Tammo van Lessen <tv...@gmail.com>
Authored: Fri Aug 23 20:49:14 2013 +0200
Committer: Tammo van Lessen <tv...@gmail.com>
Committed: Tue Aug 27 00:10:00 2013 +0200

----------------------------------------------------------------------
 axis2/src/main/java/org/apache/ode/axis2/OdeFault.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ode/blob/d3e0e7ad/axis2/src/main/java/org/apache/ode/axis2/OdeFault.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/OdeFault.java b/axis2/src/main/java/org/apache/ode/axis2/OdeFault.java
index d24000e..424a9a4 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/OdeFault.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/OdeFault.java
@@ -28,7 +28,7 @@ import org.apache.axis2.AxisFault;
  */
 public class OdeFault extends AxisFault {
 
-    public static final QName FAULT = new QName("http://incubator.apache.org/ode", "Fault");
+    public static final QName FAULT = new QName("http://ode.apache.org", "Fault", "ode");
 
     public OdeFault(String message) {
         super(FAULT, message, null);


[9/9] git commit: fix SMX HelloWorld example.

Posted by va...@apache.org.
fix SMX HelloWorld example.


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

Branch: refs/heads/master
Commit: a39f8db9b95b8b722b73b13d965a7334b09c0869
Parents: 498d645
Author: Tammo van Lessen <tv...@gmail.com>
Authored: Mon Aug 26 20:42:48 2013 +0200
Committer: Tammo van Lessen <tv...@gmail.com>
Committed: Tue Aug 27 01:04:52 2013 +0200

----------------------------------------------------------------------
 .../src/main/resources/HelloWorld2.bpel                 | 12 ++++++------
 .../helloworld2-osgi/src/main/resources/deploy.xml      |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ode/blob/a39f8db9/distro/src/examples-jbi/maven2/helloworld2-osgi/src/main/resources/HelloWorld2.bpel
----------------------------------------------------------------------
diff --git a/distro/src/examples-jbi/maven2/helloworld2-osgi/src/main/resources/HelloWorld2.bpel b/distro/src/examples-jbi/maven2/helloworld2-osgi/src/main/resources/HelloWorld2.bpel
index 71f07c2..e3b9a72 100644
--- a/distro/src/examples-jbi/maven2/helloworld2-osgi/src/main/resources/HelloWorld2.bpel
+++ b/distro/src/examples-jbi/maven2/helloworld2-osgi/src/main/resources/HelloWorld2.bpel
@@ -17,10 +17,10 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<process name="HelloWorld2"
-         targetNamespace="urn:/HeaderTest.bpel"
+<process name="HelloWorld"
+         targetNamespace="urn:/jbiTest.bpel"
          xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
-         xmlns:tns="urn:/HeaderTest.bpel"
+         xmlns:tns="urn:/jbiTest.bpel"
          xmlns:hello="urn:/HelloWorld2.wsdl"
          xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 
@@ -51,14 +51,14 @@
                 
         <assign name="assign1">
             <copy>
-                <from>$request.body/hello:text</from>
+                <from>$request.body/text</from>
                 <to variable="text"/>
             </copy>
             <copy>
                 <from>
                     <literal>
                         <hello:HelloResponse>
-                            <hello:text/>
+                            <text xmlns=""/>
                         </hello:HelloResponse>
                     </literal>
                 </from>
@@ -66,7 +66,7 @@
             </copy>
             <copy>
                 <from>concat($text,' World')</from>
-                <to>$response.body/hello:text</to>
+                <to>$response.body/text</to>
             </copy>
         </assign>
         

http://git-wip-us.apache.org/repos/asf/ode/blob/a39f8db9/distro/src/examples-jbi/maven2/helloworld2-osgi/src/main/resources/deploy.xml
----------------------------------------------------------------------
diff --git a/distro/src/examples-jbi/maven2/helloworld2-osgi/src/main/resources/deploy.xml b/distro/src/examples-jbi/maven2/helloworld2-osgi/src/main/resources/deploy.xml
index 680271c..49470ac 100644
--- a/distro/src/examples-jbi/maven2/helloworld2-osgi/src/main/resources/deploy.xml
+++ b/distro/src/examples-jbi/maven2/helloworld2-osgi/src/main/resources/deploy.xml
@@ -17,11 +17,11 @@
   ~ under the License.
   -->
 <deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
-        xmlns:pns="urn:/HeaderTest.bpel"
+        xmlns:pns="urn:/jbiTest.bpel"
         xmlns:sns="urn:/HelloWorld2.wsdl" >
 
 
-	<process name="pns:HelloWorld2">
+	<process name="pns:HelloWorld">
 		<active>true</active>
 		<provide partnerLink="helloPartnerLink">
 			<service name="sns:HelloService" port="HelloPort"/>


[7/9] git commit: fixing a bug for ODE-302

Posted by va...@apache.org.
fixing a bug for ODE-302


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

Branch: refs/heads/master
Commit: 19854fb90bc4393ca179099de185a91ec70998e9
Parents: 558b2c6
Author: Tammo van Lessen <tv...@gmail.com>
Authored: Tue Aug 27 01:02:51 2013 +0200
Committer: Tammo van Lessen <tv...@gmail.com>
Committed: Tue Aug 27 01:02:51 2013 +0200

----------------------------------------------------------------------
 jbi/src/main/java/org/apache/ode/jbi/OdeContext.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ode/blob/19854fb9/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java
----------------------------------------------------------------------
diff --git a/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java b/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java
index 3fabd87..f1ac60d 100644
--- a/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java
+++ b/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java
@@ -173,7 +173,7 @@ final public class OdeContext {
     }
 
     public TransactionManager getTransactionManager() {
-        if (_txm != null) {
+        if (_txm == null) {
             return (TransactionManager) getContext().getTransactionManager();
         }