Author: dpp
Date: Wed Jan 7 12:56:32 2009
New Revision: 732485
URL: http://svn.apache.org/viewvc?rev=732485&view=rev
Log:
The JNDI data sourse will be the jndi.name property if defined, otherwise 'esme'
Modified:
incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
incubator/esme/trunk/server/src/main/scala/us/esme/model/User.scala
Modified:
incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
URL:
http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala?rev=732485&r1=732484&r2=732485&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
(original)
+++ incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala Wed
Jan 7 12:56:32 2009
@@ -41,7 +41,7 @@
*/
class Boot {
def boot {
- DefaultConnectionIdentifier.jndiName = "esme"
+ DefaultConnectionIdentifier.jndiName = Props.get("jndi.name") openOr "esme"
if (!DB.jndiJdbcConnAvailable_?)
DB.defineConnectionManager(DefaultConnectionIdentifier, DBVendor)
// where to search snippet
Modified: incubator/esme/trunk/server/src/main/scala/us/esme/model/User.scala
URL:
http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/us/esme/model/User.scala?rev=732485&r1=732484&r2=732485&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/us/esme/model/User.scala
(original)
+++ incubator/esme/trunk/server/src/main/scala/us/esme/model/User.scala Wed Jan
7 12:56:32 2009
@@ -61,7 +61,7 @@
case _ => Full(<lift:surround with="default" at="content">
<lift:bind /></lift:surround>)
}
-
+
/**
* The menu item for editing the user (make this "Empty" to disable)
*/
