ode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From va...@apache.org
Subject [2/3] git commit: fixes ODE-999
Date Mon, 26 Aug 2013 18:43:14 GMT
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/de386fd6
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/de386fd6
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/de386fd6

Branch: refs/heads/ode-1.3.6.x
Commit: de386fd64aeeacc31920d8ae27c1894c458d8edd
Parents: 570ce78
Author: Tammo van Lessen <tvanlessen@gmail.com>
Authored: Mon Aug 26 20:42:31 2013 +0200
Committer: Tammo van Lessen <tvanlessen@gmail.com>
Committed: Mon Aug 26 20:42:31 2013 +0200

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


http://git-wip-us.apache.org/repos/asf/ode/blob/de386fd6/Rakefile
----------------------------------------------------------------------
diff --git a/Rakefile b/Rakefile
index 3f9b76b..765d351 100644
--- a/Rakefile
+++ b/Rakefile
@@ -579,8 +579,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/de386fd6/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
----------------------------------------------------------------------
diff --git a/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java b/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
index 689cd00..763679e 100644
--- a/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
+++ b/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
@@ -109,7 +109,7 @@ public class OdeConfigProperties {
     private Properties _props;
 
     /** Default defaults for the database embedded name and dao connection factory class.
*/
-    private static String __dbEmbName = "jpadb";
+    private static String __dbEmbName = "derby-jpadb";
     private static String __daoCfClass = "org.apache.ode.dao.jpa.BPELDAOConnectionFactoryImpl";
 
     static {

http://git-wip-us.apache.org/repos/asf/ode/blob/de386fd6/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 0be578e..f55a30f 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);
         }
             
         return oprocess;

http://git-wip-us.apache.org/repos/asf/ode/blob/de386fd6/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>
 


Mime
View raw message