Author: mriou
Date: Wed Feb 4 00:35:58 2009
New Revision: 740536
URL: http://svn.apache.org/viewvc?rev=740536&view=rev
Log:
Tying a few loose ends.
Modified:
ode/branches/restful/dao-jpa-db/src/main/descriptors/persistence.derby.xml
ode/branches/restful/dao-jpa-db/src/main/descriptors/persistence.mysql.xml
ode/branches/restful/dao-jpa-db/src/main/descriptors/persistence.oracle.xml
ode/branches/restful/dao-jpa-db/src/test/resources/META-INF/persistence.xml
ode/branches/restful/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageDAOImpl.java
ode/branches/restful/dao-jpa/src/main/resources/META-INF/persistence.xml
ode/branches/restful/il-common/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
ode/branches/restful/il-common/src/main/java/org/apache/ode/il/dbutil/Database.java
Modified:
ode/branches/restful/dao-jpa-db/src/main/descriptors/persistence.derby.xml
URL:
http://svn.apache.org/viewvc/ode/branches/restful/dao-jpa-db/src/main/descriptors/persistence.derby.xml?rev=740536&r1=740535&r2=740536&view=diff
==============================================================================
--- ode/branches/restful/dao-jpa-db/src/main/descriptors/persistence.derby.xml
(original)
+++ ode/branches/restful/dao-jpa-db/src/main/descriptors/persistence.derby.xml
Wed Feb 4 00:35:58 2009
@@ -31,6 +31,7 @@
<class>org.apache.ode.dao.jpa.PartnerLinkDAOImpl</class>
<class>org.apache.ode.dao.jpa.ProcessDAOImpl</class>
<class>org.apache.ode.dao.jpa.ProcessInstanceDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.ResourceRouteDAOImpl</class>
<class>org.apache.ode.dao.jpa.ScopeDAOImpl</class>
<class>org.apache.ode.dao.jpa.XmlDataDAOImpl</class>
Modified:
ode/branches/restful/dao-jpa-db/src/main/descriptors/persistence.mysql.xml
URL:
http://svn.apache.org/viewvc/ode/branches/restful/dao-jpa-db/src/main/descriptors/persistence.mysql.xml?rev=740536&r1=740535&r2=740536&view=diff
==============================================================================
--- ode/branches/restful/dao-jpa-db/src/main/descriptors/persistence.mysql.xml
(original)
+++ ode/branches/restful/dao-jpa-db/src/main/descriptors/persistence.mysql.xml
Wed Feb 4 00:35:58 2009
@@ -31,6 +31,7 @@
<class>org.apache.ode.dao.jpa.PartnerLinkDAOImpl</class>
<class>org.apache.ode.dao.jpa.ProcessDAOImpl</class>
<class>org.apache.ode.dao.jpa.ProcessInstanceDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.ResourceRouteDAOImpl</class>
<class>org.apache.ode.dao.jpa.ScopeDAOImpl</class>
<class>org.apache.ode.dao.jpa.XmlDataDAOImpl</class>
Modified:
ode/branches/restful/dao-jpa-db/src/main/descriptors/persistence.oracle.xml
URL:
http://svn.apache.org/viewvc/ode/branches/restful/dao-jpa-db/src/main/descriptors/persistence.oracle.xml?rev=740536&r1=740535&r2=740536&view=diff
==============================================================================
--- ode/branches/restful/dao-jpa-db/src/main/descriptors/persistence.oracle.xml
(original)
+++ ode/branches/restful/dao-jpa-db/src/main/descriptors/persistence.oracle.xml
Wed Feb 4 00:35:58 2009
@@ -31,6 +31,7 @@
<class>org.apache.ode.dao.jpa.PartnerLinkDAOImpl</class>
<class>org.apache.ode.dao.jpa.ProcessDAOImpl</class>
<class>org.apache.ode.dao.jpa.ProcessInstanceDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.ResourceRouteDAOImpl</class>
<class>org.apache.ode.dao.jpa.ScopeDAOImpl</class>
<class>org.apache.ode.dao.jpa.XmlDataDAOImpl</class>
Modified:
ode/branches/restful/dao-jpa-db/src/test/resources/META-INF/persistence.xml
URL:
http://svn.apache.org/viewvc/ode/branches/restful/dao-jpa-db/src/test/resources/META-INF/persistence.xml?rev=740536&r1=740535&r2=740536&view=diff
==============================================================================
--- ode/branches/restful/dao-jpa-db/src/test/resources/META-INF/persistence.xml
(original)
+++ ode/branches/restful/dao-jpa-db/src/test/resources/META-INF/persistence.xml
Wed Feb 4 00:35:58 2009
@@ -31,6 +31,7 @@
<class>org.apache.ode.dao.jpa.PartnerLinkDAOImpl</class>
<class>org.apache.ode.dao.jpa.ProcessDAOImpl</class>
<class>org.apache.ode.dao.jpa.ProcessInstanceDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.ResourceRouteDAOImpl</class>
<class>org.apache.ode.dao.jpa.ScopeDAOImpl</class>
<class>org.apache.ode.dao.jpa.XmlDataDAOImpl</class>
Modified:
ode/branches/restful/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageDAOImpl.java
URL:
http://svn.apache.org/viewvc/ode/branches/restful/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageDAOImpl.java?rev=740536&r1=740535&r2=740536&view=diff
==============================================================================
---
ode/branches/restful/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageDAOImpl.java
(original)
+++
ode/branches/restful/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageDAOImpl.java
Wed Feb 4 00:35:58 2009
@@ -58,7 +58,7 @@
}
public MessageDAOImpl(QName type, MessageExchangeDAOImpl me) {
- _type = type.toString();
+ if (_type != null) _type = type.toString();
}
public Element getData() {
Modified:
ode/branches/restful/dao-jpa/src/main/resources/META-INF/persistence.xml
URL:
http://svn.apache.org/viewvc/ode/branches/restful/dao-jpa/src/main/resources/META-INF/persistence.xml?rev=740536&r1=740535&r2=740536&view=diff
==============================================================================
--- ode/branches/restful/dao-jpa/src/main/resources/META-INF/persistence.xml
(original)
+++ ode/branches/restful/dao-jpa/src/main/resources/META-INF/persistence.xml
Wed Feb 4 00:35:58 2009
@@ -37,6 +37,7 @@
<class>org.apache.ode.dao.jpa.PartnerLinkDAOImpl</class>
<class>org.apache.ode.dao.jpa.ProcessDAOImpl</class>
<class>org.apache.ode.dao.jpa.ProcessInstanceDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.ResourceRouteDAOImpl</class>
<class>org.apache.ode.dao.jpa.ScopeDAOImpl</class>
<class>org.apache.ode.dao.jpa.XmlDataDAOImpl</class>
<class>org.apache.ode.dao.jpa.CorrSetProperty</class>
Modified:
ode/branches/restful/il-common/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
URL:
http://svn.apache.org/viewvc/ode/branches/restful/il-common/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java?rev=740536&r1=740535&r2=740536&view=diff
==============================================================================
---
ode/branches/restful/il-common/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
(original)
+++
ode/branches/restful/il-common/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
Wed Feb 4 00:35:58 2009
@@ -46,6 +46,8 @@
public static final String PROP_DB_EMBEDDED_NAME = "db.emb.name";
+ public static final String PROP_DB_EMBEDDED_CREATE = "db.emb.create";
+
public static final String PROP_DB_INTERNAL_URL = "db.int.jdbcurl";
public static final String PROP_DB_INTERNAL_DRIVER = "db.int.driver";
@@ -90,7 +92,7 @@
private Properties _props;
/** Default defaults for the database embedded name and dao connection
factory class. */
- private static String __dbEmbName = "jpadb";
+ public static String DEFAULT_DB_EMB_NAME = "jpadb";
private static String __daoCfClass =
"org.apache.ode.dao.jpa.BPELDAOConnectionFactoryImpl";
static {
@@ -98,7 +100,7 @@
if (odep != null &&
"hibernate".equalsIgnoreCase(odep)) {
__log.debug("Using HIBERNATE due to system property override!");
- __dbEmbName = "hibdb";
+ DEFAULT_DB_EMB_NAME = "hibdb";
__daoCfClass =
"org.apache.ode.daohib.bpel.BpelDAOConnectionFactoryImpl";
}
@@ -165,8 +167,11 @@
* @return db mode
*/
public String getDbEmbeddedName() {
- return getProperty(OdeConfigProperties.PROP_DB_EMBEDDED_NAME,
__dbEmbName);
+ return getProperty(OdeConfigProperties.PROP_DB_EMBEDDED_NAME,
DEFAULT_DB_EMB_NAME);
+ }
+ public boolean isDbEmbeddedCreate() {
+ return
Boolean.valueOf(getProperty(OdeConfigProperties.PROP_DB_EMBEDDED_CREATE,
"false"));
}
public DatabaseMode getDbMode() {
Modified:
ode/branches/restful/il-common/src/main/java/org/apache/ode/il/dbutil/Database.java
URL:
http://svn.apache.org/viewvc/ode/branches/restful/il-common/src/main/java/org/apache/ode/il/dbutil/Database.java?rev=740536&r1=740535&r2=740536&view=diff
==============================================================================
---
ode/branches/restful/il-common/src/main/java/org/apache/ode/il/dbutil/Database.java
(original)
+++
ode/branches/restful/il-common/src/main/java/org/apache/ode/il/dbutil/Database.java
Wed Feb 4 00:35:58 2009
@@ -227,6 +227,8 @@
String db = _odeConfig.getDbEmbeddedName();
String url = "jdbc:derby:" + _workRoot + "/" + db ;
+ if (_odeConfig.isDbEmbeddedCreate())
+ url += ";create=true";
__log.info("Using Embedded Derby: " + url);
_derbyUrl = url;
initInternalDb(url,
org.apache.derby.jdbc.EmbeddedDriver.class.getName(),"sa",null);
