Return-Path: 
 <ace-commits-return-1032-apmail-incubator-ace-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-ace-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-ace-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id E9BD4761A
	for <apmail-incubator-ace-commits-archive@minotaur.apache.org>;
 Mon, 29 Aug 2011 14:21:19 +0000 (UTC)
Received: (qmail 67639 invoked by uid 500); 29 Aug 2011 14:21:19 -0000
Delivered-To: apmail-incubator-ace-commits-archive@incubator.apache.org
Received: (qmail 67614 invoked by uid 500); 29 Aug 2011 14:21:19 -0000
Mailing-List: contact ace-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:ace-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:ace-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:ace-commits@incubator.apache.org>
List-Id: <ace-commits.incubator.apache.org>
Reply-To: ace-dev@incubator.apache.org
Delivered-To: mailing list ace-commits@incubator.apache.org
Received: (qmail 67606 invoked by uid 99); 29 Aug 2011 14:21:19 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Aug 2011 14:21:19 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Aug 2011 14:21:15 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 3BC1B23888FD;
	Mon, 29 Aug 2011 14:20:54 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1162825 - in /incubator/ace/trunk: ./ ace-features/
 ace-features/src/main/resources/ ace-karaf-features/
 ace-karaf-features/src/ ace-karaf-features/src/main/
 ace-karaf-features/src/main/resources/
Date: Mon, 29 Aug 2011 14:20:54 -0000
To: ace-commits@incubator.apache.org
From: jbonofre@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110829142054.3BC1B23888FD@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jbonofre
Date: Mon Aug 29 14:20:53 2011
New Revision: 1162825

URL: http://svn.apache.org/viewvc?rev=1162825&view=rev
Log:
[ACE-146] Add configfile support via the Karaf features descriptor

Added:
    incubator/ace/trunk/ace-karaf-features/
    incubator/ace/trunk/ace-karaf-features/pom.xml
      - copied, changed from r1162804, incubator/ace/trunk/ace-features/pom.xml
    incubator/ace/trunk/ace-karaf-features/src/
    incubator/ace/trunk/ace-karaf-features/src/main/
    incubator/ace/trunk/ace-karaf-features/src/main/resources/
    incubator/ace/trunk/ace-karaf-features/src/main/resources/features.xml
      - copied, changed from r1162804, incubator/ace/trunk/ace-features/src/main/resources/features.xml
Modified:
    incubator/ace/trunk/ace-features/pom.xml
    incubator/ace/trunk/ace-features/src/main/resources/features.xml
    incubator/ace/trunk/pom.xml

Copied: incubator/ace/trunk/ace-karaf-features/pom.xml (from r1162804, incubator/ace/trunk/ace-features/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-karaf-features/pom.xml?p2=incubator/ace/trunk/ace-karaf-features/pom.xml&p1=incubator/ace/trunk/ace-features/pom.xml&r1=1162804&r2=1162825&rev=1162825&view=diff
==============================================================================
--- incubator/ace/trunk/ace-features/pom.xml (original)
+++ incubator/ace/trunk/ace-karaf-features/pom.xml Mon Aug 29 14:20:53 2011
@@ -28,14 +28,15 @@
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
+    <groupId>org.apache.ace.karaf</groupId>
     <artifactId>apache-ace</artifactId>
     <packaging>pom</packaging>
-    <name>Apache ACE :: Features</name>
+    <name>Apache ACE :: Karaf Features</name>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-features</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-features</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-features</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-karaf-features</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-karaf-features</developerConnection>
+        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-karaf-features</url>
     </scm>
 
     <build>

Copied: incubator/ace/trunk/ace-karaf-features/src/main/resources/features.xml (from r1162804, incubator/ace/trunk/ace-features/src/main/resources/features.xml)
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-karaf-features/src/main/resources/features.xml?p2=incubator/ace/trunk/ace-karaf-features/src/main/resources/features.xml&p1=incubator/ace/trunk/ace-features/src/main/resources/features.xml&r1=1162804&r2=1162825&rev=1162825&view=diff
==============================================================================
--- incubator/ace/trunk/ace-features/src/main/resources/features.xml (original)
+++ incubator/ace/trunk/ace-karaf-features/src/main/resources/features.xml Mon Aug 29 14:20:53 2011
@@ -22,11 +22,11 @@
     <feature name="ace-common" version="${project.version}" resolver="(obr)">
         <feature>eventadmin</feature>
         <feature>http</feature>
-        <bundle>mvn:org.apache.felix/org.apache.felix.metatype/${felix.metatype.version}</bundle>
-        <bundle>mvn:org.apache.felix/org.apache.felix.dependencymanager/${felix.dependencymanager.version}</bundle>
-        <bundle>mvn:org.apache.felix/org.apache.felix.dependencymanager.shell/${felix.dependencymanager.version}</bundle>
-        <bundle>mvn:org.apache.felix/org.apache.felix.deploymentadmin/${felix.deploymentadmin.version}</bundle>
-        <bundle>mvn:org.apache.felix/org.apache.felix.prefs/${felix.prefs.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.felix/org.apache.felix.metatype/${felix.metatype.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.felix/org.apache.felix.dependencymanager/${felix.dependencymanager.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.felix/org.apache.felix.dependencymanager.shell/${felix.dependencymanager.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.felix/org.apache.felix.deploymentadmin/${felix.deploymentadmin.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.felix/org.apache.felix.prefs/${felix.prefs.version}</bundle>
         <bundle>mvn:org.apache.ace/org.apache.ace.log/${project.version}</bundle>
         <bundle>mvn:org.apache.ace/org.apache.ace.log.servlet/${project.version}</bundle>
         <bundle>mvn:org.apache.ace/org.apache.ace.consolelogger/${project.version}</bundle>
@@ -48,6 +48,9 @@
 
     <feature name="ace-configurator" version="${project.version}" resolver="(obr)">
         <feature version="${project.version}">ace-common</feature>
+        <configfile finalname="/etc/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg">
+            mvn:org.apache.ace.karaf/apache-ace/${project.version}/cfg/UpdateUserAdminTask
+        </configfile>
         <bundle>mvn:org.apache.ace/org.apache.ace.configurator/${project.version}</bundle>
         <bundle>mvn:org.apache.ace/org.apache.ace.configurator.serveruseradmin/${project.version}</bundle>
         <bundle>mvn:org.apache.ace/org.apache.ace.configurator.useradmin.task/${project.version}</bundle>
@@ -58,40 +61,70 @@
         <bundle>mvn:org.apache.ace/org.apache.ace.deployment.deploymentadmin/${project.version}</bundle>
         <bundle>mvn:org.apache.ace/org.apache.ace.deployment.task/${project.version}</bundle>
         <bundle>mvn:org.apache.ace/org.apache.ace.deployment.provider.api/${project.version}</bundle>
+        <configfile finalname="/etc/org.apache.ace.deployment.provider.repositorybased.cfg">
+            mvn:org.apache.ace.karaf/apache-ace/${project.version}/cfg/deployment-provider-repositorybased
+        </configfile>
         <bundle>mvn:org.apache.ace/org.apache.ace.deployment.provider.repositorybased/${project.version}</bundle>
+        <configfile finalname="/etc/org.apache.ace.deployment.servlet.cfg">
+            mvn:org.apache.ace.karaf/apache-ace/${project.version}/cfg/deployment-servlet
+        </configfile>
         <bundle>mvn:org.apache.ace/org.apache.ace.deployment.servlet/${project.version}</bundle>
         <bundle>mvn:org.apache.ace/org.apache.ace.deployment.streamgenerator/${project.version}</bundle>
         <bundle>mvn:org.apache.ace/org.apache.ace.resourceprocessor.useradmin/${project.version}</bundle>
     </feature>
 
     <feature name="ace-discovery" version="${project.version}" resolver="(obr)">
+        <configfile finalname="/etc/org.apache.ace.discovery.property.cfg">
+            mvn:org.apache.ace.karaf/apache-ace/${project.version}/cfg/discovery-property
+        </configfile>
         <bundle>mvn:org.apache.ace/org.apache.ace.discovery.api/${project.version}</bundle>
         <bundle>mvn:org.apache.ace/org.apache.ace.discovery.property/${project.version}</bundle>
     </feature>
 
     <feature name="ace-nodelauncher" version="${project.version}" resolver="(obr)">
         <bundle>mvn:org.apache.ace/org.apache.ace.nodelauncher.api/${project.version}</bundle>
+        <configfile name="/etc/org.apache.ace.nodelauncher.amazon.cfg">
+            mvn:org.apache.ace.karaf/apache-ace/${project.version}/cfg/nodelauncher-amazon
+        </configfile>
         <bundle>mvn:org.apache.ace/org.apache.ace.nodelauncher.amazon/${project.version}</bundle>
         <bundle>mvn:org.apache.ace/org.apache.ace.nodelauncher.ui/${project.version}</bundle>
     </feature>
 
     <feature name="ace-obr" version="${project.version}" resolver="(obr)">
         <bundle>mvn:org.apache.ace/org.apache.ace.obr.metadata/${project.version}</bundle>
+        <configfile finalname="/etc/org.apache.ace.obr.storage.file.cfg">
+            mvn:org.apache.ace.karaf/apache-ace/${project.version}/cfg/obr-storage-file
+        </configfile>
         <bundle>mvn:org.apache.ace/org.apache.ace.obr.storage/${project.version}</bundle>
+        <configfile finalname="/etc/org.apache.ace.obr.servlet.cfg">
+            mvn:org.apache.ace.karaf/apache-ace/${project.version}/cfg/obr-servlet
+        </configfile>
         <bundle>mvn:org.apache.ace/org.apache.ace.obr.servlet/${project.version}</bundle>
     </feature>
 
     <feature name="ace-repository" version="${project.version}" resolver="(obr)">
         <bundle>mvn:org.apache.ace/org.apache.ace.repository.impl/${project.version}</bundle>
+        <configfile finalname="/etc/org.apache.ace.repository.servlet.RepositoryServlet.cfg">
+            mvn:org.apache.ace.karaf/apache-ace/${project.version}/cfg/repository-servlet
+        </configfile>
+        <configfile finalname="/etc/org.apache.ace.repository.servlet.RepositoryReplicationServlet.cfg">
+            mvn:org.apache.ace.karaf/apache-ace/${project.version}/cfg/repository-replication-servlet
+        </configfile>
         <bundle>mvn:org.apache.ace/org.apache.ace.repository.servlet/${project.version}</bundle>
     </feature>
 
     <feature name="ace-scheduler" version="${project.version}" resolver="(obr)">
+        <configfile finalname="/etc/org.apache.ace.scheduler.cfg">
+            mvn:org.apache.ace.karaf/apache-ace/${project.version}/cfg/scheduler
+        </configfile>
         <bundle>mvn:org.apache.ace/org.apache.ace.scheduler/${project.version}</bundle>
     </feature>
 
     <feature name="ace-webconsole" version="${project.version}" resolver="(obr)">
         <feature>war</feature>
+        <configfile finalname="/etc/org.apache.ace.webui.vaadin.cfg">
+            mvn:org.apache.ace.karaf/apache-ace/${project.version}/cfg/vaadin
+        </configfile>
         <bundle>mvn:com.vaadin/vaadin/${vaadin.version}</bundle>
         <bundle>mvn:org.apache.ace/org.apache.ace.webconsole.plugin/${project.version}</bundle>
         <bundle>mvn:org.apache.ace/org.apache.ace.tageditor/${project.version}</bundle>

Modified: incubator/ace/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/pom.xml?rev=1162825&r1=1162824&r2=1162825&view=diff
==============================================================================
--- incubator/ace/trunk/pom.xml (original)
+++ incubator/ace/trunk/pom.xml Mon Aug 29 14:20:53 2011
@@ -117,7 +117,7 @@
         <module>ace-managementagent</module>
         <module>ace-launcher</module>
 
-        <module>ace-features</module>
+        <module>ace-karaf-features</module>
 
         <module>ace-target-defaults</module>
         <module>ace-target-devgateway</module>