I've taken a peek through this to sanity check - there are some things that look like they've been removed that shouldn't have been, but I could be wrong and it could have been intentional. Can you confirm?

On 25/09/2006, at 10:40 AM, [EMAIL PROTECTED] wrote:

Added:
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/ maven/continuum/web/filter/ - copied from r448283, maven/continuum/branches/continuum- acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/ filter/ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/ maven/continuum/web/filter/FilterToComponentProxy.java - copied unchanged from r448283, maven/continuum/branches/ continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/ continuum/web/filter/FilterToComponentProxy.java

Isn't this only for Acegi?

Removed:
    maven/continuum/trunk/continuum-webapp/src/main/webapp/error.jsp

Isn't this needed?

-    ProjectGroup getDefaultProjectGroup()
-        throws ContinuumStoreException;
-

was this intentional?

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/ apache/maven/continuum/DefaultContinuum.java

-        try
-        {
- buildResults = new ArrayList ( store.getProjectWithBuilds( projectId ).getBuildResults() );
-        }
-        catch ( ContinuumObjectNotFoundException e )
-        {
-            return Collections.EMPTY_LIST;
-        }
-        catch ( ContinuumStoreException e )
-        {
- throw logAndCreateException( "Exception while getting build results for project.", e );
-        }
+ buildResults = new ArrayList ( store.getBuildResultsForProject( projectId, 0 ) );

was this intentional? If so, I assume all the other exception removals were too so that there is a catch all. I'm still not sure I like that, but something we can overall review later.

Modified: maven/continuum/trunk/continuum-webapp/src/main/filters/ filter.properties URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum- webapp/src/main/filters/filter.properties? view=diff&rev=449533&r1=449532&r2=449533 ====================================================================== ======== --- maven/continuum/trunk/continuum-webapp/src/main/filters/ filter.properties (original) +++ maven/continuum/trunk/continuum-webapp/src/main/filters/ filter.properties Sun Sep 24 17:40:23 2006
@@ -2,3 +2,37 @@
 # emails to the specified address
 # [EMAIL PROTECTED]
 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

Can we change this to the datasource based one, consistent with Archiva? Much nicer to externalise configuration from the webapp for distribution purposes.

- Brett

Reply via email to