You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by ms...@apache.org on 2007/02/09 16:34:25 UTC

svn commit: r505326 - in /incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2: ODEConfigProperties.java ODEServer.java

Author: mszefler
Date: Fri Feb  9 07:34:24 2007
New Revision: 505326

URL: http://svn.apache.org/viewvc?view=rev&rev=505326
Log:
Added configuration of internal db url.

Modified:
    incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEConfigProperties.java
    incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java

Modified: incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEConfigProperties.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEConfigProperties.java?view=diff&rev=505326&r1=505325&r2=505326
==============================================================================
--- incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEConfigProperties.java (original)
+++ incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEConfigProperties.java Fri Feb  9 07:34:24 2007
@@ -38,6 +38,8 @@
     private static final String PROP_DB_MODE = "ode-axis2.db.mode";
     private static final String PROP_DB_EXTERNAL_DS = "ode-axis2.db.ext.dataSource";
     private static final String PROP_DB_EMBEDDED_NAME = "ode-axis2.db.emb.name";
+    private static final String PROP_DB_INTERNAL_URL = "ode-axis2.db.int.jdbcurl";
+    
     private static final String PROP_TX_FACTORY_CLASS = "ode-axis2.tx.factory.class";
     private static final String PROP_POOL_MAX = "ode-axis2.db.pool.max";
     private static final String PROP_POOL_MIN = "ode-axis2.db.pool.min";
@@ -102,6 +104,10 @@
         return getProperty(ODEConfigProperties.PROP_DB_EMBEDDED_NAME, "data");
     }
 
+    public String getDbIntenralJdbcUrl() {
+        return getProperty(ODEConfigProperties.PROP_DB_INTERNAL_URL, "jdbc:derby://localhost/ode");
+    }
+    
     /**
      * Possible database modes.
      */

Modified: incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java?view=diff&rev=505326&r1=505325&r2=505326
==============================================================================
--- incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java (original)
+++ incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java Fri Feb  9 07:34:24 2007
@@ -411,25 +411,14 @@
     }
 
     private void initInternalDb() throws ServletException {
-        throw new ServletException("internalDb not supported!");
+        __log.info("Using internal data source for JDBC URL: " + _odeConfig.getDbIntenralJdbcUrl());
+        initInternalDb(_odeConfig.getDbIntenralJdbcUrl());
+        
     }
 
-    /**
-     * Initialize embedded (DERBY) database.
-     */
-    private void initEmbeddedDb() throws ServletException {
-        __log.info("Using DataSource Derby");
-
-        String db = "jpadb";
-        String persistenceType = System.getProperty("ode.persistence");
-        if (persistenceType != null) {
-            if ("hibernate".equalsIgnoreCase(persistenceType))
-                db = "hibdb";
-        }
+    private void initInternalDb(String url) throws ServletException {
 
-        String url = "jdbc:derby:" + _workRoot + "/" + db + "/" + _odeConfig.getDbEmbeddedName();
-
-        __log.debug("creating Minerva pool for " + url);
+        __log.debug("Creating Minerva DataSource/Pool for " + url);
 
         _minervaPool = new MinervaPool();
         _minervaPool.setTransactionManager(_txMgr);
@@ -453,6 +442,24 @@
         if (__logSql.isDebugEnabled())
             _datasource = new LoggingDataSourceWrapper(_minervaPool.createDataSource(), __logSql);
         else _datasource = _minervaPool.createDataSource();
+        
+    }
+    /**
+     * Initialize embedded (DERBY) database.
+     */
+    private void initEmbeddedDb() throws ServletException {
+
+        String db = "jpadb";
+        String persistenceType = System.getProperty("ode.persistence");
+        if (persistenceType != null) {
+            if ("hibernate".equalsIgnoreCase(persistenceType))
+                db = "hibdb";
+        }
+
+        String url = "jdbc:derby:" + _workRoot + "/" + db + "/" + _odeConfig.getDbEmbeddedName();
+        __log.info("Using Embedded Derby: " + url);
+        initInternalDb(url);
+       
     }
 
     /**