Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 47754 invoked from network); 12 Sep 2006 18:12:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 12 Sep 2006 18:12:13 -0000 Received: (qmail 54490 invoked by uid 500); 12 Sep 2006 18:12:13 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 54460 invoked by uid 500); 12 Sep 2006 18:12:13 -0000 Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: continuum-dev@maven.apache.org Delivered-To: mailing list continuum-commits@maven.apache.org Received: (qmail 54449 invoked by uid 99); 12 Sep 2006 18:12:13 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (140.211.166.84) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Sep 2006 11:12:13 -0700 Authentication-Results: idunn.apache.osuosl.org smtp.mail=carlos@apache.org; spf=permerror X-ASF-Spam-Status: No, hits=-9.8 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received-SPF: error (idunn.apache.osuosl.org: domain apache.org from 140.211.166.113 cause and error) Received: from ([140.211.166.113:58559] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 2.1 r(10620)) with ESMTP id CB/30-04030-888F6054 for ; Tue, 12 Sep 2006 11:12:24 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 5368A1A981A; Tue, 12 Sep 2006 11:12:08 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r442663 - in /maven/continuum/branches/continuum-acegi/continuum-webapp/src/main: filters/filter.properties resources/META-INF/plexus/application.xml Date: Tue, 12 Sep 2006 18:12:08 -0000 To: continuum-commits@maven.apache.org From: carlos@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060912181208.5368A1A981A@eris.apache.org> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: carlos Date: Tue Sep 12 11:12:07 2006 New Revision: 442663 URL: http://svn.apache.org/viewvc?view=rev&rev=442663 Log: Move db configuration to properties filter Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/filters/filter.properties maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/filters/filter.properties URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/filters/filter.properties?view=diff&rev=442663&r1=442662&r2=442663 ============================================================================== --- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/filters/filter.properties (original) +++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/filters/filter.properties Tue Sep 12 11:12:07 2006 @@ -2,3 +2,37 @@ # emails to the specified address # nobody@localhost mail.override.to.address= + +# +# Database configuration +# + +# Derby +db.driverName=org.apache.derby.jdbc.EmbeddedDriver +db.url=jdbc:derby:${plexus.home}/database;create=true +db.userName=sa +db.password= +acl.sql=org/apache/maven/user/acegi/acl/acegi-acl-derby.sql + +# PostgreSQL +#db.driverName=org.postgresql.Driver +#db.url=jdbc:postgresql://localhost/continuum +#db.userName= +#db.password= +#acl.sql=not done yet + +# MySQL +#db.driverName=com.mysql.jdbc.Driver +#db.url=jdbc:mysql://localhost/test +#db.userName= +#db.password= +#acl.sql=org/apache/maven/user/acegi/acl/acegi-acl-mysql.sql + +# HSQLDB +# NOTE: NO NOT USE THIS CONFIGURATION FOR A PRODUCTION SYSTEM. +# HSQLDB keeps all data in memory at all times. +#db.driverName=org.hsqldb.jdbcDriver +#db.url=jdbc:hsqldb:${plexus.home}/database +#db.userName=sa +#db.password= +#acl.sql=not done yet Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml?view=diff&rev=442663&r1=442662&r2=442663 ============================================================================== --- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml (original) +++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml Tue Sep 12 11:12:07 2006 @@ -60,7 +60,7 @@ this address instead the address specified in the project configuration --> - + ${mail.override.to.address} @@ -198,82 +198,23 @@ org.jpox.autoStartMechanismMode Ignored - - - javax.jdo.option.ConnectionDriverName - org.apache.derby.jdbc.EmbeddedDriver - - - javax.jdo.option.ConnectionURL - jdbc:derby:${plexus.home}/database;create=true - - - javax.jdo.option.ConnectionUserName - sa - - - javax.jdo.option.ConnectionPassword - - - - javax.jdo.option.ConnectionDriverName - org.postgresql.Driver + ${db.driverName} javax.jdo.option.ConnectionURL - jdbc:postgresql://localhost/continuum + ${db.url} javax.jdo.option.ConnectionUserName - trygvis + ${db.userName} javax.jdo.option.ConnectionPassword - - - --> - - - - - - - - - - org.jpox.transactionIsolation - READ_UNCOMMITTED - + + - org.jpox.poid.transactionIsolation - READ_UNCOMMITTED + org.jpox.rdbms.stringDefaultLength + 255 + @@ -524,51 +463,30 @@ - - org/apache/maven/user/acegi/acl/acegi-acl-derby.sql - - + ${acl.sql} - org.codehaus.mojo.sql.SqlExecMojo org.codehaus.mojo.sql.SqlExecMojo - - org.apache.derby.jdbc.EmbeddedDriver - jdbc:derby:${plexus.home}/database;create=true - sa - - - - + ${db.driverName} + ${db.url} + ${db.userName} + ${db.password} continue - javax.sql.DataSource org.apache.commons.dbcp.BasicDataSource - - org.apache.derby.jdbc.EmbeddedDriver - jdbc:derby:${plexus.home}/database;create=true - sa - - + ${db.driverName} + ${db.url} + ${db.userName} + ${db.password}