[Commits] (bcm) switch back to hsqldb for default db. this keeps cosmo from having any

[commits at osafoundation.org]

Commit by: bcm
Modified files:
server/build.xml 1.37 1.38
server/shared.properties 1.22 1.23

Log message:
switch back to hsqldb for default db. this keeps cosmo from having any
external dependencies. the install docs will discuss how to configure cosmo
for an external db.


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/server/build.xml.diff?r1=text&tr1=1.37&r2=text&tr2=1.38
http://cvs.osafoundation.org/index.cgi/server/shared.properties.diff?r1=text&tr1=1.22&r2=text&tr2=1.23

Index: server/build.xml
diff -u server/build.xml:1.37 server/build.xml:1.38
--- server/build.xml:1.37	Fri Apr 15 11:51:16 2005
+++ server/build.xml	Fri Apr 15 12:56:46 2005
@@ -190,6 +190,9 @@
         <pathelement location="${cosmo.dist.userdb.jar}"/>
       </classpath>
     </sql>
+    <move todir="${cosmo.dist.version}/data">
+      <fileset dir="${cosmo.home}/data"/>
+    </move>
   </target>
 
   <target name="dist"

Index: server/shared.properties
diff -u server/shared.properties:1.22 server/shared.properties:1.23
--- server/shared.properties:1.22	Wed Apr 13 16:50:23 2005
+++ server/shared.properties	Fri Apr 15 12:56:46 2005
@@ -96,15 +96,14 @@
 # distribution properties
 #
 
-cosmo.dist.userdb.schema=schema.mysql.sql
-cosmo.dist.userdb.dialect=net.sf.hibernate.dialect.MySQLDialect
-cosmo.dist.userdb.driver=com.mysql.jdbc.Driver
-cosmo.dist.userdb.dataSource=java:comp/env/jdbc/cosmo
-cosmo.dist.userdb.database=cosmo
-cosmo.dist.userdb.url=jdbc:mysql:///${cosmo.dist.userdb.database}
-cosmo.dist.userdb.username=cosmo
-cosmo.dist.userdb.password=cosmo
-cosmo.dist.userdb.jar=${mysql.jar}
+cosmo.dist.userdb.schema=schema.hsqldb.sql
+cosmo.dist.userdb.dialect=net.sf.hibernate.dialect.HSQLDialect
+cosmo.dist.userdb.driver=org.hsqldb.jdbcDriver
+cosmo.dist.userdb.database=userdb
+cosmo.dist.userdb.url=jdbc:hsqldb:file:data/db/${cosmo.dist.userdb.database}
+cosmo.dist.userdb.username=sa
+cosmo.dist.userdb.password=
+cosmo.dist.userdb.jar=${hsqldb.jar}
 
 #
 # test properties