From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 8 Mar 2013 12:27:32 +0000 (+0000)
Subject: Fix issues with PostgreSQL
X-Git-Tag: argeo-slc-2.1.7~430
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;ds=sidebyside;h=1fe017264684e1ec4ed104467f37fd595f3d44dc;p=gpl%2Fargeo-slc.git

Fix issues with PostgreSQL

git-svn-id: https://svn.argeo.org/slc/trunk@6109 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/demo/slc_demo_rap_pg.properties b/demo/slc_demo_rap_pg.properties
index 96deee53e..0dcbac5c1 100644
--- a/demo/slc_demo_rap_pg.properties
+++ b/demo/slc_demo_rap_pg.properties
@@ -27,11 +27,8 @@ org.argeo.server.catalina.start,\
 org.eclipse.equinox.http.registry,\
 org.springframework.osgi.web.extender,\
 
-
-slc.executionModules=org.argeo.slc.demo.ant,\
-org.argeo.slc.demo.basic,\
-org.argeo.slc.demo.minimal,\
-
+slc.repo.jcr.dbuser=argeo
+slc.repo.jcr.dbpassword=argeo
 slc.repo.jcr.configuration.java=osgibundle:repository-pg-java.xml
 
 org.argeo.security.ui.initialPerspective=org.argeo.security.ui.userHomePerspective
diff --git a/modules/org.argeo.slc.server.repo/repo.properties b/modules/org.argeo.slc.server.repo/repo.properties
index e996bd482..61e2fa752 100644
--- a/modules/org.argeo.slc.server.repo/repo.properties
+++ b/modules/org.argeo.slc.server.repo/repo.properties
@@ -11,9 +11,7 @@ slc.repo.jcr.dbpassword=
 slc.repo.jcr.maxPoolSize=10
 
 # Postgres
-slc.repo.jcr.dbuser=argeo
-slc.repo.jcr.dbpassword=argeo
-slc.repo.jcr.dburl.java=jdbc:postgresql://localhost/slc_java
-slc.repo.jcr.dburl.dist=jdbc:postgresql://localhost/slc_dist
-slc.repo.jcr.dburl.rpm=jdbc:postgresql://localhost/slc_rpm
-slc.repo.jcr.dburl.docs=jdbc:postgresql://localhost/slc_docs
+slc.repo.jcr.dburl.java=jdbc:postgresql://localhost/slc_repo_java
+slc.repo.jcr.dburl.dist=jdbc:postgresql://localhost/slc_repo_dist
+slc.repo.jcr.dburl.rpm=jdbc:postgresql://localhost/slc_repo_rpm
+slc.repo.jcr.dburl.docs=jdbc:postgresql://localhost/slc_repo_docs