You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by br...@apache.org on 2008/04/04 05:27:52 UTC
svn commit: r644598 -
/continuum/trunk/continuum-webapp/src/jetty-env-mysql.xml
Author: brett
Date: Thu Apr 3 20:27:51 2008
New Revision: 644598
URL: http://svn.apache.org/viewvc?rev=644598&view=rev
Log:
putting back the original version. The new one had the wrong password, and when I tried to use two databases with ref's it didn't work. It's important to have separate user database for development since you regularly nuke the Continuum one and don't want to have to adjust the users again
Modified:
continuum/trunk/continuum-webapp/src/jetty-env-mysql.xml
Modified: continuum/trunk/continuum-webapp/src/jetty-env-mysql.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/jetty-env-mysql.xml?rev=644598&r1=644597&r2=644598&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/jetty-env-mysql.xml (original)
+++ continuum/trunk/continuum-webapp/src/jetty-env-mysql.xml Thu Apr 3 20:27:51 2008
@@ -43,29 +43,49 @@
</Arg>
</New>
-
-<New id="continuumDataSource" class="com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource">
- <Set name="serverName">localhost</Set>
- <Set name="databaseName">continuum</Set>
- <Set name="user">postgres</Set>
- <Set name="password">sparky</Set>
-</New>
-
<New id="continuum" class="org.mortbay.jetty.plus.naming.Resource">
- <Arg>jdbc/users</Arg>
- <Arg><Ref id="continuumDataSource"/></Arg>
+ <Arg>jdbc/continuum</Arg>
+ <Arg>
+ <New class="com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource">
+ <Set name="serverName">localhost</Set>
+ <Set name="databaseName">continuum</Set>
+ <Set name="user">root</Set>
+ <Set name="password"></Set>
+ </New>
+ </Arg>
</New>
<New id="continuum_shutdown" class="org.mortbay.jetty.plus.naming.Resource">
- <Arg>jdbc/users_shutdown</Arg>
- <Arg><Ref id="continuumDataSource"/></Arg>
+ <Arg>jdbc/continuum_shutdown</Arg>
+ <Arg>
+ <New class="com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource">
+ <Set name="serverName">localhost</Set>
+ <Set name="databaseName">continuum</Set>
+ <Set name="user">root</Set>
+ <Set name="password"></Set>
+ </New>
+ </Arg>
</New>
<New id="users" class="org.mortbay.jetty.plus.naming.Resource">
<Arg>jdbc/users</Arg>
- <Arg><Ref id="continuumDataSource"/></Arg>
+ <Arg>
+ <New class="com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource">
+ <Set name="serverName">localhost</Set>
+ <Set name="databaseName">users</Set>
+ <Set name="user">root</Set>
+ <Set name="password"></Set>
+ </New>
+ </Arg>
</New>
<New id="users_shutdown" class="org.mortbay.jetty.plus.naming.Resource">
<Arg>jdbc/users_shutdown</Arg>
- <Arg><Ref id="continuumDataSource"/></Arg>
+ <Arg>
+ <New class="com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource">
+ <Set name="serverName">localhost</Set>
+ <Set name="databaseName">users</Set>
+ <Set name="user">root</Set>
+ <Set name="password"></Set>
+ </New>
+ </Arg>
</New>
</Configure>