Return-Path: 
 <dev-return-7060-apmail-continuum-dev-archive=continuum.apache.org@continuum.apache.org>
Delivered-To: apmail-continuum-dev-archive@www.apache.org
Received: (qmail 13909 invoked from network); 30 Jun 2008 12:23:08 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 30 Jun 2008 12:23:08 -0000
Received: (qmail 98979 invoked by uid 500); 30 Jun 2008 12:23:07 -0000
Delivered-To: apmail-continuum-dev-archive@continuum.apache.org
Received: (qmail 98895 invoked by uid 500); 30 Jun 2008 12:23:07 -0000
Mailing-List: contact dev-help@continuum.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@continuum.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@continuum.apache.org>
List-Post: <mailto:dev@continuum.apache.org>
List-Id: <dev.continuum.apache.org>
Reply-To: dev@continuum.apache.org
Delivered-To: mailing list dev@continuum.apache.org
Received: (qmail 98862 invoked by uid 99); 30 Jun 2008 12:23:07 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Jun 2008 05:23:07 -0700
X-ASF-Spam-Status: No, hits=1.2 required=10.0
	tests=SPF_NEUTRAL
X-Spam-Check-By: apache.org
Received-SPF: neutral (athena.apache.org: local policy)
Received: from [210.50.30.235] (HELO mx05.syd.iprimus.net.au) (210.50.30.235)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Jun 2008 12:22:15 +0000
X-IronPort-Anti-Spam-Filtered: true
X-IronPort-Anti-Spam-Result: AqUAAJdsaEjKQ1aR/2dsb2JhbAAIsAE
X-IronPort-AV: E=Sophos;i="4.27,727,1204462800";
   d="scan'208";a="127947356"
Received: from unknown (HELO [172.18.237.213]) ([202.67.86.145])
  by smtp05.syd.iprimus.net.au with ESMTP; 30 Jun 2008 22:22:32 +1000
Message-Id: <213ABD5F-20F4-4387-9DE9-D0FF76B4B1C4@apache.org>
From: Brett Porter <brett@apache.org>
To: dev@continuum.apache.org
In-Reply-To: <20080626225317.CDF8623889F3@eris.apache.org>
Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes
Content-Transfer-Encoding: 7bit
Mime-Version: 1.0 (Apple Message framework v924)
Subject: Re: svn commit: r672050 - in /continuum/trunk: ./ continuum-api/
 continuum-api/src/main/java/org/apache/maven/continuum/configuration/
 continuum-base/continuum-scm/
 continuum-commons/src/main/java/org/apache/maven/continuum/utils/
 continuum-configuration/ ...
Date: Mon, 30 Jun 2008 22:22:31 +1000
References: <20080626225317.CDF8623889F3@eris.apache.org>
X-Mailer: Apple Mail (2.924)
X-Virus-Checked: Checked by ClamAV on apache.org

Hi Olivier,

The new config looks good to me :)

Did I understand correctly that we will be able to port from the old  
database config to the new one through the model?

Quick thoughts/questions...

On 27/06/2008, at 8:53 AM, olamy@apache.org wrote:

> +    <dependency>
> +      <groupId>org.apache.continuum</groupId>
> +      <artifactId>continuum-api</artifactId>
> +    </dependency>

Not sure why -configuration needs the rest of the API? Isn't this  
passed into the API?

>
> Added: continuum/trunk/continuum-configuration/src/main/resources/ 
> META-INF/continuum/continuum-configuration.xml
> URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-configuration/src/main/resources/META-INF/continuum/continuum-configuration.xml?rev=672050&view=auto
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- continuum/trunk/continuum-configuration/src/main/resources/META- 
> INF/continuum/continuum-configuration.xml (added)
> +++ continuum/trunk/continuum-configuration/src/main/resources/META- 
> INF/continuum/continuum-configuration.xml Thu Jun 26 15:53:16 2008
> @@ -0,0 +1,29 @@
> +<?xml version="1.0"?>
> +
> +<!--
> +  ~ Licensed to the Apache Software Foundation (ASF) under one
> +  ~ or more contributor license agreements.  See the NOTICE file
> +  ~ distributed with this work for additional information
> +  ~ regarding copyright ownership.  The ASF licenses this file
> +  ~ to you under the Apache License, Version 2.0 (the
> +  ~ "License"); you may not use this file except in compliance
> +  ~ with the License.  You may obtain a copy of the License at
> +  ~
> +  ~   http://www.apache.org/licenses/LICENSE-2.0
> +  ~
> +  ~ Unless required by applicable law or agreed to in writing,
> +  ~ software distributed under the License is distributed on an
> +  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> +  ~ KIND, either express or implied.  See the License for the
> +  ~ specific language governing permissions and limitations
> +  ~ under the License.
> +  -->
> +
> +<configuration>
> +  <system/>
> +  <jndi prefix="java:comp/env" config-optional="true"/>
> +  <xml fileName="${appserver.base}/conf/continuum.xml" config- 
> optional="true"
> +       config-forceCreate="true" config-name="org.apache.continuum"/>
> +  <xml fileName="${user.home}/.m2/continuum.xml" config- 
> optional="true"
> +       config-forceCreate="true" config- 
> name="org.apache.continuum.user"/>
> +</configuration>
> \ No newline at end of file

Should this be in the webapp/bundle, rather than baked into the JAR?

Cheers,
Brett

--
Brett Porter
brett@apache.org
http://blogs.exist.com/bporter/