diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/SimpleDataSourceFactory.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/SimpleDataSourceFactory.java
new file mode 100644
index 0000000000000000000000000000000000000000..bf3dd1d4684534aa647ba6fe76d2ae9bf9e07762
--- /dev/null
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/SimpleDataSourceFactory.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2010 ETH Zuerich, CISD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.systemsx.cisd.openbis.dss.generic.shared;
+
+import java.util.Properties;
+
+import javax.sql.DataSource;
+
+import ch.systemsx.cisd.dbmigration.SimpleDatabaseConfigurationContext;
+
+/**
+ * Creates a commons-dbcp {@link DataSource} using its standard properties.
+ * 
+ * @author Kaloyan Enimanev
+ */
+public class SimpleDataSourceFactory implements IDataSourceFactory
+{
+
+    public DataSource create(Properties dbProps)
+    {
+        SimpleDatabaseConfigurationContext context =
+                new SimpleDatabaseConfigurationContext(dbProps);
+
+        return context.getDataSource();
+    }
+}