Merge pull request LSIR#3 from UCSB-CS-RACELab/dunning-ranch-VS

Dunning ranch VS
kjorg50 · Nov 16, 2014 · e35c1ea · e35c1ea
2 parents 360b46d + bb34752
commit e35c1ea
Show file tree

Hide file tree

Showing 3 changed files with 103,999 additions and 3 deletions.
diff --git a/conf/gsn.xml b/conf/gsn.xml
@@ -23,10 +23,10 @@
 <access-control>false</access-control>
 <!-- Main Storage Database, Mandatory -->
 <!-- <storage user="sa" password="" driver="org.h2.Driver" url="jdbc:h2:mem:gsn_mem_db" />   -->
-<storage user="sa" password="" driver="org.h2.Driver" url="jdbc:h2:file:./GsnMemDb" />  
+<!--<storage user="sa" password="" driver="org.h2.Driver" url="jdbc:h2:file:./GsnMemDb" />  -->
 <!--<storage user="sa" password="" driver="org.h2.Driver" url="jdbc:h2:tcp://localhost/~/GsnMemDb" />-->  
-<!--<storage user="root" password="..." driver="com.mysql.jdbc.Driver" url="jdbc:mysql://localhost/gsn" /> --> 
-<!--<storage user="gsn" password="gsnpassword" driver="com.mysql.jdbc.Driver" url="jdbc:mysql://localhost/gsn" /> -->
+<!--<storage user="root" password="..." driver="com.mysql.jdbc.Driver" url="jdbc:mysql://localhost/gsn" /> -->
+<storage user="gsn" password="gsnpassword" driver="com.mysql.jdbc.Driver" url="jdbc:mysql://localhost/gsn" />
 <!-- <storage user="gsn" password="gsn" driver="net.sourceforge.jtds.jdbc.Driver" url="jdbc:jtds:sqlserver://192.168.51.14:12345/gsn;cachemetadata=true;prepareSQL=3" />-->
 <!--<storage user="root" password="" driver="com.mysql.jdbc.Driver" url="jdbc:mysql://localhost/gsn" /> --> 
 <!--  <storage user="admin" password="" driver="org.postgresql.Driver" url="jdbc:postgresql://localhost/gsn" /> -->