You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ca...@apache.org on 2008/04/04 04:42:58 UTC
svn commit: r644584 - in /continuum/trunk/continuum-webapp/src: jetty-env-mysql.xml jetty-env-postgres.xml

Author: carlos
Date: Thu Apr  3 19:42:58 2008
New Revision: 644584

URL: http://svn.apache.org/viewvc?rev=644584&view=rev
Log:
No need to have 4 different insances of the datasource

Modified:
    continuum/trunk/continuum-webapp/src/jetty-env-mysql.xml
    continuum/trunk/continuum-webapp/src/jetty-env-postgres.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=644584&r1=644583&r2=644584&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/jetty-env-mysql.xml (original)
+++ continuum/trunk/continuum-webapp/src/jetty-env-mysql.xml Thu Apr  3 19:42:58 2008
@@ -43,49 +43,29 @@
   </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/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>
+  <Arg>jdbc/users</Arg>
+  <Arg><Ref id="continuumDataSource"/></Arg>
 </New>
 <New id="continuum_shutdown" class="org.mortbay.jetty.plus.naming.Resource">
-  <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>
+  <Arg>jdbc/users_shutdown</Arg>
+  <Arg><Ref id="continuumDataSource"/></Arg>
 </New>
 <New id="users" class="org.mortbay.jetty.plus.naming.Resource">
   <Arg>jdbc/users</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>
+  <Arg><Ref id="continuumDataSource"/></Arg>
 </New>
 <New id="users_shutdown" class="org.mortbay.jetty.plus.naming.Resource">
   <Arg>jdbc/users_shutdown</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>
+  <Arg><Ref id="continuumDataSource"/></Arg>
 </New>
 
 </Configure>

Modified: continuum/trunk/continuum-webapp/src/jetty-env-postgres.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/jetty-env-postgres.xml?rev=644584&r1=644583&r2=644584&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/jetty-env-postgres.xml (original)
+++ continuum/trunk/continuum-webapp/src/jetty-env-postgres.xml Thu Apr  3 19:42:58 2008
@@ -43,49 +43,28 @@
   </Arg>
 </New>
 
+<New id="continuumDataSource" class="org.postgresql.ds.PGPoolingDataSource">
+  <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>
-    <New class="org.postgresql.ds.PGPoolingDataSource">
-      <Set name="serverName">localhost</Set>
-      <Set name="databaseName">continuum</Set>
-      <Set name="user">postgres</Set>
-      <Set name="password">sparky</Set>
-    </New>
-  </Arg>
+  <Arg><Ref id="continuumDataSource"/></Arg>
 </New>
 <New id="continuum_shutdown" class="org.mortbay.jetty.plus.naming.Resource">
   <Arg>jdbc/users_shutdown</Arg>
-  <Arg>
-    <New class="org.postgresql.ds.PGPoolingDataSource">
-      <Set name="serverName">localhost</Set>
-      <Set name="databaseName">continuum</Set>
-      <Set name="user">postgres</Set>
-      <Set name="password">sparky</Set>  
-    </New>
-  </Arg>
+  <Arg><Ref id="continuumDataSource"/></Arg>
 </New>
 <New id="users" class="org.mortbay.jetty.plus.naming.Resource">
   <Arg>jdbc/users</Arg>
-  <Arg>
-    <New class="org.postgresql.ds.PGPoolingDataSource">
-      <Set name="serverName">localhost</Set>
-      <Set name="databaseName">users</Set>
-      <Set name="user">postgres</Set>
-      <Set name="password">sparky</Set>
-    </New>
-  </Arg>
+  <Arg><Ref id="continuumDataSource"/></Arg>
 </New>
 <New id="users_shutdown" class="org.mortbay.jetty.plus.naming.Resource">
   <Arg>jdbc/users_shutdown</Arg>
-  <Arg>
-    <New class="org.postgresql.ds.PGPoolingDataSource">
-      <Set name="serverName">localhost</Set>
-      <Set name="databaseName">users</Set>
-      <Set name="user">postgres</Set>
-      <Set name="password">sparky</Set>  
-    </New>
-  </Arg>
+  <Arg><Ref id="continuumDataSource"/></Arg>
 </New>
 
 </Configure>