Changed the default persistent store to use H2. Updated the README, classpaths and property files to reflect this. Also removed the default connection dictionary from the model because we are relying on properties to set the connection dictionary.

Signed-off-by: David Holt <[email protected]>

Author: David Holt

README

@@ -1,25 +1,29 @@
-This is a simple blog app that was created in the spirit of the 'WO in
-15 minutes' movie created by Jonathan ‘Wolf’ Rentzsch.
+This is a simple blog app that is being created in the spirit of
+updating the blog application created in the 'WO in 15 minutes' movie
+made by Jonathan ‘Wolf’ Rentzsch.
 
-This example application has been designed to showcase ERModernLook
-development as well as demonstrate some lesser known page level and
-property level components available to the D2W developer in ERModernLook
-and the broader ERD2W framework. I hope it will eventually show the
-progression of building up and customizing a D2W application. Emphasis will
-be on building up the administrative interface.
+SimpleBlog has been designed to showcase ERModernLook development as
+well as demonstrate some lesser known page level and property level
+components available to the D2W developer in ERModernLook and the
+broader ERD2W framework. I hope it will eventually show the progression
+of building up and customizing a D2W application. Emphasis will be on
+building up the administrative interface.
 
-ERRest integration is now being added to show how it might be used
-to create a front-end with several desirable features such as nice URLs.
+ERRest integration is being added to show how it might be used to create
+a front-end with several desirable features such as nice URLs.
 
-It depends on ERModernDirectToWeb modifications that are currently
+SimpleBlog depends on ERModernDirectToWeb modifications that are currently
 located in my Wonder fork but may end up in Wonder proper.
 
-The application also depends on a FrontBase database. This may change in the
-future and/or you may want to change your properties file to point to a
-database from a different vendor.
+SimpleBlog depends on a H2 database. The file H2 uses is located in
+/tmp which will be deleted on restart. You may want to change the
+property to point to a more permanent location if you want the database
+to persist.
 
-The database you create should be named 'simpleblog' and will start up
-with a user with login credentials:
+You may want to change your properties file to point to a database from
+a different vendor.
+
+The database will start up with a user with login credentials:
 
 username: test password: test
 

SimpleBlog/.classpath

@@ -24,5 +24,6 @@
 	<classpathentry kind="con" path="WOFramework/WOLips"/>
 	<classpathentry kind="con" path="WOFramework/SimpleBlogLogic"/>
 	<classpathentry kind="con" path="WOFramework/ERRest"/>
+	<classpathentry kind="con" path="WOFramework/H2PlugIn"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

SimpleBlog/Resources/Properties

@@ -15,18 +15,26 @@ er.extensions.ERXEnterpriseObject.updateInverseRelationships=true
 # you have these settings in your WebObjects.properties or your Application properties
 # Note that you *should* include the ones that are empty to stomp over any settings
 # in the ERCoreBusinessLogic.eomodeld
-#dbConnectURLGLOBAL = <my jdbc url>
-#dbConnectUserGLOBAL = <my database user>
+dbConnectURLGLOBAL =
+dbConnectUserGLOBAL = 
 dbConnectDriverGLOBAL =
 #dbConnectPasswordGLOBAL = <my database password>
 dbConnectPluginGLOBAL =
 dbConnectJDBCInfoGLOBAL = 
 
 # FrontBase Connection Dictionary
-dbConnectUserGLOBAL=_system
-dbConnectPasswordGLOBAL=
-dbConnectURLGLOBAL=jdbc:FrontBase://localhost/simpleblog
-er.extensions.ERXSQLHelper$FrontBaseSQLHelper
+# To use a different database than FrontBase, add the appropriate plugin to the build path
+# and change the default connection dictionary to use the correct prototypes
+# and remove the H2 plugin from the build path and comment out the H2 related
+# properties below
+# dbConnectUserGLOBAL=_system
+# dbConnectPasswordGLOBAL=
+# dbConnectURLGLOBAL=jdbc:FrontBase://localhost/simpleblog
+# er.extensions.ERXSQLHelper$FrontBaseSQLHelper
+
+# H2 Connection Dictionary
+dbConnectURLGLOBAL = jdbc:h2:file:/tmp/ERBlog
+dbConnectPluginGLOBAL = H2PlugIn
 
 # Migrations
 er.migration.migrateAtStartup=true

SimpleBlogLogic/.classpath

@@ -13,6 +13,6 @@
 	<classpathentry kind="con" path="WOFramework/JavaWebObjects"/>
 	<classpathentry kind="con" path="WOFramework/JavaXML"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="WOFramework/FrontBasePlugIn"/>
+	<classpathentry kind="con" path="WOFramework/H2PlugIn"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

SimpleBlogLogic/Resources/SimpleBlog.eomodeld/index.eomodeld

@@ -1,7 +1,6 @@
 {
     EOModelVersion = "2.1"; 
     adaptorName = JDBC; 
-    connectionDictionary = {URL = "jdbc:FrontBase://127.0.0.1/DatabaseName"; }; 
     entities = (
         {className = "com.wowodc.model.BlogCategory"; name = BlogCategory; }, 
         {className = EOGenericRecord; name = BlogCategoryEntry; }, 
@@ -10,16 +9,4 @@
         {className = "com.wowodc.model.Role"; name = Role; }, 
         {className = EOGenericRecord; name = XPersonRole; }
     ); 
-    userInfo = {
-        "_EntityModeler" = {
-            activeDatabaseConfigName = Default; 
-            databaseConfigs = {
-                Default = {
-                    adaptorName = JDBC; 
-                    connectionDictionary = {URL = "jdbc:FrontBase://127.0.0.1/DatabaseName"; }; 
-                    prototypeEntityName = EOJDBCFrontBasePrototypes; 
-                }; 
-            }; 
-        }; 
-    }; 
 }