Added:
/trunk/src/services.properties.template
Deleted:
/trunk/src/services.properties
Modified:
/trunk/.classpath
=======================================
--- /dev/null
+++ /trunk/src/services.properties.template Wed Dec 15 10:52:07 2010
@@ -0,0 +1,17 @@
+# services.properties
+jdbc.driver = org.postgresql.Driver
+db.protocol = jdbc:postgresql
+db.host = bg.berkeley.edu
+db.dbname = bgwb2
+db.user = postgres
+db.password = napoleon
+userplacesdb.protocol = jdbc:postgresql
+userplacesdb.host = bg.berkeley.edu
+userplacesdb.dbname = userplaces
+userplacesdb.user = postgres
+userplacesdb.password = napoleon
+placenamesdb.protocol = jdbc:postgresql
+placenamesdb.host = bg.berkeley.edu
+placenamesdb.dbname = worldplaces3
+placenamesdb.user = postgres
+placenamesdb.password = napoleon
=======================================
--- /trunk/src/services.properties Sat Sep 29 13:19:50 2007
+++ /dev/null
@@ -1,17 +0,0 @@
-# services.properties
-jdbc.driver = org.postgresql.Driver
-db.protocol = jdbc:postgresql
-db.host = bg.berkeley.edu
-db.dbname = bgwb2
-db.user = postgres
-db.password = napoleon
-userplacesdb.protocol = jdbc:postgresql
-userplacesdb.host = bg.berkeley.edu
-userplacesdb.dbname = userplaces
-userplacesdb.user = postgres
-userplacesdb.password = napoleon
-placenamesdb.protocol = jdbc:postgresql
-placenamesdb.host = bg.berkeley.edu
-placenamesdb.dbname = worldplaces3
-placenamesdb.user = postgres
-placenamesdb.password = napoleon
=======================================
--- /trunk/.classpath Sun Sep 19 17:57:37 2010
+++ /trunk/.classpath Wed Dec 15 10:52:07 2010
@@ -11,8 +11,12 @@
<classpathentry kind="lib" path="lib/mvzlib-0.5.4.jar"/>
<classpathentry kind="lib" path="lib/ostermillerutils_1_06_00.jar"/>
<classpathentry kind="lib" path="lib/postgresql-8.2dev-503.jdbc3.jar"/>
+<<<<<<< .mine
+ <classpathentry kind="lib" path="lib/biogeomancer-core-1.1.7.jar"/>
+=======
<classpathentry kind="lib" path="lib/gwt-maps.jar"/>
<classpathentry kind="lib" path="lib/biogeomancer-core-1.1.7.jar"/>
<classpathentry kind="con"
path="com.google.gwt.eclipse.core.GWT_CONTAINER/GWT"/>
+>>>>>>> .r471
<classpathentry kind="output" path="bin"/>
</classpath>