Return-Path: 
 <ace-commits-return-631-apmail-incubator-ace-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-ace-commits-archive@minotaur.apache.org
Received: (qmail 82426 invoked from network); 28 Feb 2011 16:30:05 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 28 Feb 2011 16:30:05 -0000
Received: (qmail 22127 invoked by uid 500); 28 Feb 2011 16:30:05 -0000
Delivered-To: apmail-incubator-ace-commits-archive@incubator.apache.org
Received: (qmail 22090 invoked by uid 500); 28 Feb 2011 16:30:04 -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 22080 invoked by uid 99); 28 Feb 2011 16:30:03 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Feb 2011 16:30:03 +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, 28 Feb 2011 16:29:56 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id F00412388903; Mon, 28 Feb 2011 16:29:33 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1075411 - in /incubator/ace/trunk:
 ace-client-automation/
 ace-client-repository-api/ ace-client-repository-helper-base/
 ace-client-repository-helper-bundle/
 ace-client-repository-helper-configuration/
 ace-client-repository-helper-user/ ace...
Date: Mon, 28 Feb 2011 16:29:33 -0000
To: ace-commits@incubator.apache.org
From: jbonofre@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110228162933.F00412388903@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jbonofre
Date: Mon Feb 28 16:29:30 2011
New Revision: 1075411

URL: http://svn.apache.org/viewvc?rev=1075411&view=rev
Log:
[ACE-121] Start the use of POM bundle configuration in place of the osgi.bnd file.

Removed:
    incubator/ace/trunk/ace-client-automation/osgi.bnd
    incubator/ace/trunk/ace-client-repository-api/osgi.bnd
    incubator/ace/trunk/ace-client-repository-helper-base/osgi.bnd
    incubator/ace/trunk/ace-client-repository-helper-bundle/osgi.bnd
    incubator/ace/trunk/ace-client-repository-helper-configuration/osgi.bnd
    incubator/ace/trunk/ace-client-repository-helper-user/osgi.bnd
    incubator/ace/trunk/ace-client-repository-impl/osgi.bnd
    incubator/ace/trunk/ace-client-repository-useradmin/osgi.bnd
    incubator/ace/trunk/ace-configurator-serveruseradmin/osgi.bnd
    incubator/ace/trunk/ace-configurator-useradmin-task/osgi.bnd
    incubator/ace/trunk/ace-configurator/osgi.bnd
    incubator/ace/trunk/ace-consolelogger/osgi.bnd
    incubator/ace/trunk/ace-deployment-api/osgi.bnd
    incubator/ace/trunk/ace-deployment-deploymentadmin/osgi.bnd
    incubator/ace/trunk/ace-deployment-provider-api/osgi.bnd
    incubator/ace/trunk/ace-deployment-provider-filebased/osgi.bnd
    incubator/ace/trunk/ace-deployment-provider-repositorybased/osgi.bnd
    incubator/ace/trunk/ace-deployment-servlet/osgi.bnd
    incubator/ace/trunk/ace-deployment-streamgenerator/osgi.bnd
    incubator/ace/trunk/ace-deployment-task/osgi.bnd
    incubator/ace/trunk/ace-discovery-api/osgi.bnd
    incubator/ace/trunk/ace-discovery-property/osgi.bnd
    incubator/ace/trunk/ace-discovery-upnp/osgi.bnd
    incubator/ace/trunk/ace-gateway-log-store/osgi.bnd
    incubator/ace/trunk/ace-gateway-log/osgi.bnd
    incubator/ace/trunk/ace-httplistener/osgi.bnd
    incubator/ace/trunk/ace-identification-api/osgi.bnd
    incubator/ace/trunk/ace-identification-ifconfig/osgi.bnd
    incubator/ace/trunk/ace-identification-property/osgi.bnd
    incubator/ace/trunk/ace-location-upnp/osgi.bnd
    incubator/ace/trunk/ace-log-listener/osgi.bnd
    incubator/ace/trunk/ace-log-servlet/osgi.bnd
    incubator/ace/trunk/ace-log-task/osgi.bnd
    incubator/ace/trunk/ace-log/osgi.bnd
    incubator/ace/trunk/ace-managementagent/osgi.bnd
    incubator/ace/trunk/ace-obr-metadata/osgi.bnd
    incubator/ace/trunk/ace-obr-servlet/osgi.bnd
    incubator/ace/trunk/ace-obr-storage/osgi.bnd
    incubator/ace/trunk/ace-range-api/osgi.bnd
    incubator/ace/trunk/ace-repository-api/osgi.bnd
    incubator/ace/trunk/ace-repository-impl/osgi.bnd
    incubator/ace/trunk/ace-repository-servlet/osgi.bnd
    incubator/ace/trunk/ace-repository-task/osgi.bnd
    incubator/ace/trunk/ace-resourceprocessor-useradmin/osgi.bnd
Modified:
    incubator/ace/trunk/ace-client-automation/pom.xml
    incubator/ace/trunk/ace-client-repository-api/pom.xml
    incubator/ace/trunk/ace-client-repository-helper-base/pom.xml
    incubator/ace/trunk/ace-client-repository-helper-bundle/pom.xml
    incubator/ace/trunk/ace-client-repository-helper-configuration/pom.xml
    incubator/ace/trunk/ace-client-repository-helper-user/pom.xml
    incubator/ace/trunk/ace-client-repository-impl/pom.xml
    incubator/ace/trunk/ace-client-repository-useradmin/pom.xml
    incubator/ace/trunk/ace-configurator-serveruseradmin/pom.xml
    incubator/ace/trunk/ace-configurator-useradmin-task/pom.xml
    incubator/ace/trunk/ace-configurator/pom.xml
    incubator/ace/trunk/ace-consolelogger/pom.xml
    incubator/ace/trunk/ace-deployment-api/pom.xml
    incubator/ace/trunk/ace-deployment-deploymentadmin/pom.xml
    incubator/ace/trunk/ace-deployment-provider-api/pom.xml
    incubator/ace/trunk/ace-deployment-provider-filebased/pom.xml
    incubator/ace/trunk/ace-deployment-provider-repositorybased/pom.xml
    incubator/ace/trunk/ace-deployment-servlet/pom.xml
    incubator/ace/trunk/ace-deployment-streamgenerator/pom.xml
    incubator/ace/trunk/ace-deployment-task/pom.xml
    incubator/ace/trunk/ace-discovery-api/pom.xml
    incubator/ace/trunk/ace-discovery-property/pom.xml
    incubator/ace/trunk/ace-discovery-upnp/pom.xml
    incubator/ace/trunk/ace-gateway-log-store/pom.xml
    incubator/ace/trunk/ace-gateway-log/pom.xml
    incubator/ace/trunk/ace-httplistener/pom.xml
    incubator/ace/trunk/ace-identification-api/pom.xml
    incubator/ace/trunk/ace-identification-ifconfig/pom.xml
    incubator/ace/trunk/ace-identification-property/pom.xml
    incubator/ace/trunk/ace-location-upnp/pom.xml
    incubator/ace/trunk/ace-log-listener/pom.xml
    incubator/ace/trunk/ace-log-servlet/pom.xml
    incubator/ace/trunk/ace-log-task/pom.xml
    incubator/ace/trunk/ace-log/pom.xml
    incubator/ace/trunk/ace-managementagent/pom.xml
    incubator/ace/trunk/ace-obr-metadata/pom.xml
    incubator/ace/trunk/ace-obr-servlet/pom.xml
    incubator/ace/trunk/ace-obr-storage/pom.xml
    incubator/ace/trunk/ace-range-api/pom.xml
    incubator/ace/trunk/ace-repository-api/pom.xml
    incubator/ace/trunk/ace-repository-impl/pom.xml
    incubator/ace/trunk/ace-repository-servlet/pom.xml
    incubator/ace/trunk/ace-repository-task/pom.xml
    incubator/ace/trunk/ace-resourceprocessor-useradmin/pom.xml
    incubator/ace/trunk/pom/pom.xml

Modified: incubator/ace/trunk/ace-client-automation/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-automation/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-automation/pom.xml (original)
+++ incubator/ace/trunk/ace-client-automation/pom.xml Mon Feb 28 16:29:30 2011
@@ -33,10 +33,15 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Client :: Automation</name>
+    <description></description>
 
     <properties>
-        <bundle.symbolicName>${namespace}.client.automation</bundle.symbolicName>
-        <bundle.namespace>${namespace}.client.automation</bundle.namespace>
+        <import.package>
+            org.apache.ace.client.repository;version=${project.version},
+            org.apache.ace.client.repository.repository;version=${project.version},
+            org.apache.ace.client.repository.stateful;version=${project.version},
+            *
+        </import.package>
     </properties>
 
     <dependencies>
@@ -60,7 +65,6 @@
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.dependencymanager</artifactId>
         </dependency>
-
     </dependencies>
 
 </project>
\ No newline at end of file

Modified: incubator/ace/trunk/ace-client-repository-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-api/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-api/pom.xml (original)
+++ incubator/ace/trunk/ace-client-repository-api/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,21 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Client :: Repository :: API</name>
+    <description></description>
 
     <properties>
-        <bundle.symbolicName>${namespace}.client.repository.api</bundle.symbolicName>
-        <bundle.namespace>${namespace}.client.repository</bundle.namespace>
+        <import.package>
+            org.apache.ace.log;version=${project.version},
+            *
+        </import.package>
+        <export.package>
+            org.apache.ace.client.repository;version=${project.version},
+            org.apache.ace.client.repository.helper;version=${project.version},
+            org.apache.ace.client.repository.helper.bundle;version=${project.version},
+            org.apache.ace.client.repository.object;version=${project.version},
+            org.apache.ace.client.repository.repository;version=${project.version},
+            org.apache.ace.client.repository.stateful;version=${project.version}
+        </export.package>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-client-repository-helper-base/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-helper-base/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-helper-base/pom.xml (original)
+++ incubator/ace/trunk/ace-client-repository-helper-base/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,57 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Client :: Repository :: Helper :: Base</name>
+    <description></description>
 
     <properties>
-        <bundle.symbolicName>${namespace}.client.repository.helper.base</bundle.symbolicName>
-        <bundle.namespace>${namespace}.client.repository.helper.base</bundle.namespace>
+        <export.package>
+            org.apache.ace.client.repository.helper.base;version=${project.version}
+        </export.package>
+        <import.package>
+	        !javax.security.auth,
+	        !javax.swing.plaf,
+	        !javax.xml.parsers,
+	        !javax.xml.stream,
+	        !javax.xml.transform.sax,
+	        !net.sf.cglib.proxy,
+	        !nu.xom,
+	        !org.codehaus.jettison.mapped,
+	        !org.dom4j,
+	        !org.dom4j.io,
+	        !org.dom4j.tree,
+	        !org.jdom,
+	        !org.jdom.input,
+	        !org.joda.time,
+	        !org.joda.time.format,
+	        !org.w3c.dom,
+	        !org.xml.sax,
+	        !org.xml.sax.helpers,
+	        !sun.misc,
+	        !sun.reflect,
+	        !com.werken.xpath,
+	        !javax.naming,
+	        !javax.servlet,
+	        !javax.servlet.http,
+	        !javax.sql,
+	        !org.apache.commons.collections,
+	        !org.apache.commons.collections.map,
+	        !org.apache.commons.lang,
+	        !org.apache.commons.lang.builder,
+	        !org.apache.commons.lang.text,
+	        !org.apache.commons.logging,
+	        !org.apache.log,
+	        !org.apache.log.format,
+	        !org.apache.log.output.io,
+	        !org.apache.log4j,
+	        !org.apache.oro.text.perl,
+	        !org.apache.tools.ant,
+	        !org.apache.tools.ant.taskdefs,
+	        !org.jdom.output,
+	        org.apache.ace.client.repository.helper;version=${project.version}
+        </import.package>
+        <embed.dependency>
+            velocity, xpp3, commons-collections, commons-lang
+        </embed.dependency>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-client-repository-helper-bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-helper-bundle/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-helper-bundle/pom.xml (original)
+++ incubator/ace/trunk/ace-client-repository-helper-bundle/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,23 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Client :: Repository :: Helper :: Bundle</name>
+    <description></description>
 
     <properties>
-        <bundle.symbolicName>${namespace}.client.repository.helper.bundle</bundle.symbolicName>
-        <bundle.namespace>${namespace}.client.repository.helper.bundle</bundle.namespace>
+        <bundle.activator>org.apache.ace.client.repository.helper.bundle.impl.Activator</bundle.activator>
+        <private.package>
+            org.apache.ace.client.repository.helper.bundle.impl,
+            org.apache.ace.util
+        </private.package>
+        <export.package>
+            org.apache.ace.client.repository.helper.bundle;version=${project.version}
+        </export.package>
+        <import.package>
+            org.apache.ace.client.repository;version=${project.version},
+            org.apache.ace.client.repository.helper;version=${project.version},
+            org.apache.ace.client.repository.object;version=${project.version},
+            *
+        </import.package>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-client-repository-helper-configuration/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-helper-configuration/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-helper-configuration/pom.xml (original)
+++ incubator/ace/trunk/ace-client-repository-helper-configuration/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,25 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Client :: Repository :: Helper :: Configuration</name>
+    <description></description>
 
     <properties>
-        <bundle.symbolicName>${namespace}.client.repository.helper.configuration</bundle.symbolicName>
-        <bundle.namespace>${namespace}.client.repository.helper.configuration</bundle.namespace>
+        <bundle.activator>org.apache.ace.client.repository.helper.configuration.impl.Activator</bundle.activator>
+        <export.package>
+            org.apache.ace.client.repository.helper.configuration;version=${project.version}
+        </export.package>
+        <import.package>
+            org.apache.ace.client.repository.helper;version=${project.version},
+            org.apache.ace.client.repository.helper.base;version=${project.version},
+            org.apache.ace.client.repository.object;version=${project.version},
+            *
+        </import.package>
+        <private.package>
+            org.apache.ace.client.repository.helper.configuration.impl
+        </private.package>
+        <deployment.providesresourceprocessor>
+            org.osgi.deployment.rp.autoconf
+        </deployment.providesresourceprocessor>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-client-repository-helper-user/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-helper-user/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-helper-user/pom.xml (original)
+++ incubator/ace/trunk/ace-client-repository-helper-user/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,24 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Client :: Repository :: Helper :: User</name>
+    <description></description>
 
     <properties>
-        <bundle.symbolicName>${namespace}.client.repository.helper.user</bundle.symbolicName>
-        <bundle.namespace>${namespace}.client.repository.helper.user</bundle.namespace>
+        <export.package>
+            org.apache.ace.client.repository.helper.user;version=${project.version}
+        </export.package>
+        <import.package>
+            org.apache.ace.client.repository.helper;version=${project.version},
+            org.apache.ace.client.repository.helper.base;version=${project.version},
+            org.apache.ace.client.repository.object;version=${project.version},
+            *
+        </import.package>
+        <private.package>
+            org.apache.ace.client.repository.helper.user.impl
+        </private.package>
+        <bundle.activator>
+            org.apache.ace.client.repository.helper.user.impl.Activator
+        </bundle.activator>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-client-repository-impl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-impl/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-impl/pom.xml (original)
+++ incubator/ace/trunk/ace-client-repository-impl/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,49 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Client :: Repository :: Implementation</name>
+    <description></description>
 
     <properties>
-        <bundle.symbolicName>${namespace}.client.repository.impl</bundle.symbolicName>
-        <bundle.namespace>${namespace}.client.repository.impl</bundle.namespace>
+        <export.package>
+            org.apache.ace.client.repository;version=${project.version},
+            org.apache.ace.client.repository.object;version=${project.version},
+            org.apache.ace.client.repository.repository;version=${project.version},
+            org.apache.ace.client.repository.helper;version=${project.version},
+            org.apache.ace.client.repository.stateful;version=${project.version},
+            org.apache.ace.server.log.store;version=${project.version}
+        </export.package>
+        <import.package>
+	        !javax.security.auth,
+	        !javax.swing.plaf,
+	        !javax.xml.parsers,
+	        !javax.xml.stream,
+	        !javax.xml.transform.sax,
+	        !net.sf.cglib.proxy,
+	        !nu.xom,
+	        !org.codehaus.jettison.mapped,
+	        !org.dom4j,
+	        !org.dom4j.io,
+	        !org.dom4j.tree,
+	        !org.jdom,
+	        !org.jdom.input,
+	        !org.joda.time,
+	        !org.joda.time.format,
+	        !org.w3c.dom,
+	        !org.xml.sax,
+	        !org.xml.sax.helpers,
+	        !sun.misc,
+	        !sun.reflect,
+	        *
+        </import.package>
+        <private.package>
+            org.apache.ace.client.repository.impl,
+            org.apache.ace.util,
+            org.apache.ace.repository.ext,
+            org.apache.ace.repository.ext.impl,
+            org.apache.ace.client.repository.stateful.impl
+        </private.package>
+        <bundle.activator>org.apache.ace.client.repository.impl.Activator</bundle.activator>
+        <embed.dependency>xstream, xpp3</embed.dependency>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-client-repository-useradmin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-useradmin/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-useradmin/pom.xml (original)
+++ incubator/ace/trunk/ace-client-repository-useradmin/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,42 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Client :: Repository :: UserAdmin</name>
+    <description></description>
 
     <properties>
-        <bundle.symbolicName>${namespace}.client.repositoryuseradmin</bundle.symbolicName>
-        <bundle.namespace>${namespace}.client.repositoryuseradmin</bundle.namespace>
+        <export.package>
+            org.apache.ace.client.repositoryuseradmin;version=${project.version}
+        </export.package>
+        <import.package>
+            !javax.security.auth,
+	        !javax.swing.plaf,
+	        !javax.xml.parsers,
+	        !javax.xml.stream,
+	        !javax.xml.transform.sax,
+	        !net.sf.cglib.proxy,
+	        !nu.xom,
+	        !org.codehaus.jettison.mapped,
+	        !org.dom4j,
+	        !org.dom4j.io,
+	        !org.dom4j.tree,
+	        !org.jdom,
+	        !org.jdom.input,
+	        !org.joda.time,
+	        !org.joda.time.format,
+	        !org.w3c.dom,
+	        !org.xml.sax,
+	        !org.xml.sax.helpers,
+	        !sun.misc,
+	        !sun.reflect,
+	        *
+        </import.package>
+        <private.package>
+            org.apache.ace.client.repositoryuseradmin.impl,
+            org.apache.ace.repository.ext,
+            org.apache.ace.repository.ext.impl
+        </private.package>
+        <bundle.activator>org.apache.ace.client.repositoryuseradmin.impl.Activator</bundle.activator>
+        <embed.dependency>xstream, xpp3</embed.dependency>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-configurator-serveruseradmin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-configurator-serveruseradmin/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-configurator-serveruseradmin/pom.xml (original)
+++ incubator/ace/trunk/ace-configurator-serveruseradmin/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,16 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Configurator :: Server UserAdmin</name>
+    <description></description>
 
     <properties>
-        <bundle.symbolicName>${namespace}.configurator.serveruseradmin</bundle.symbolicName>
-        <bundle.namespace>${namespace}.configurator.serveruseradmin</bundle.namespace>
+        <import.package>
+            *
+        </import.package>
+        <private.package>
+            org.apache.ace.configurator.serveruseradmin
+        </private.package>
+        <bundle.activator>org.apache.ace.configurator.serveruseradmin.Activator</bundle.activator>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-configurator-useradmin-task/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-configurator-useradmin-task/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-configurator-useradmin-task/pom.xml (original)
+++ incubator/ace/trunk/ace-configurator-useradmin-task/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,21 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Configurator :: UserAdmin :: Task</name>
+    <description></description>
 
     <properties>
-        <bundle.symbolicName>${namespace}.configurator.useradmin.task</bundle.symbolicName>
-        <bundle.namespace>${namespace}.configurator.useradmin.task</bundle.namespace>
+        <import.package>
+            org.apache.ace.range;version=${project.version},
+            org.apache.ace.repository;version=${project.version},
+            org.apache.ace.resourceprocessor.useradmin;version=${project.version},
+            *
+        </import.package>
+        <private.package>
+            org.apache.ace.configurator.useradmin.task,
+            org.apache.ace.repository.ext,
+            org.apache.ace.repository.ext.impl
+        </private.package>
+        <bundle.activator>org.apache.ace.configurator.useradmin.task.Activator</bundle.activator>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-configurator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-configurator/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-configurator/pom.xml (original)
+++ incubator/ace/trunk/ace-configurator/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,14 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Configurator</name>
+    <description></description>
     
     <properties>
-        <bundle.symbolicName>${namespace}.configurator</bundle.symbolicName>
-        <bundle.namespace>${namespace}.configurator</bundle.namespace>
+        <import.package>*</import.package>
+        <private.package>
+            org.apache.ace.configurator
+        </private.package>
+        <bundle.activator>org.apache.ace.configurator.Activator</bundle.activator>
     </properties>
 
      <dependencies>

Modified: incubator/ace/trunk/ace-consolelogger/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-consolelogger/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-consolelogger/pom.xml (original)
+++ incubator/ace/trunk/ace-consolelogger/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,16 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: ConsoleLogger</name>
+    <description></description>
 
     <properties>
-        <bundle.symbolicName>${namespace}.consolelogger</bundle.symbolicName>
-        <bundle.namespace>${namespace}.consolelogger</bundle.namespace>
+        <import.package>
+            *
+        </import.package>
+        <private.package>
+            org.apache.ace.consolelogger
+        </private.package>
+        <bundle.activator>org.apache.ace.consolelogger.Activator</bundle.activator>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-deployment-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-api/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-deployment-api/pom.xml (original)
+++ incubator/ace/trunk/ace-deployment-api/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,15 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Deployment :: API</name>
+    <description></description>
 
     <properties>
-        <bundle.symbolicName>${namespace}.deployment.api</bundle.symbolicName>
-        <bundle.namespace>${namespace}.deployment</bundle.namespace>
+        <export.package>
+            org.apache.ace.deployment;version=${project.version}
+        </export.package>
+        <import.package>
+            *
+        </import.package>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-deployment-deploymentadmin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-deploymentadmin/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-deployment-deploymentadmin/pom.xml (original)
+++ incubator/ace/trunk/ace-deployment-deploymentadmin/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,17 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Deployment :: DeploymentAdmin Based</name>
+    <description></description>
     
     <properties>
-        <bundle.symbolicName>${namespace}.deployment.deploymentadmin</bundle.symbolicName>
-        <bundle.namespace>${namespace}.deployment.deploymentadmin</bundle.namespace>
+        <import.package>
+            org.apache.ace.deployment;version=${project.version},
+            *
+        </import.package>
+        <private.package>
+            org.apache.ace.deployment.deploymentadmin
+        </private.package>
+        <bundle.activator>org.apache.ace.deployment.deploymentadmin.Activator</bundle.activator>
     </properties>
 
      <dependencies>

Modified: incubator/ace/trunk/ace-deployment-provider-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-provider-api/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-deployment-provider-api/pom.xml (original)
+++ incubator/ace/trunk/ace-deployment-provider-api/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,12 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Deployment :: Provider :: API</name>
+    <description></description>
     
     <properties>
-        <bundle.symbolicName>${namespace}.deployment.provider.api</bundle.symbolicName>
-        <bundle.namespace>${namespace}.deployment.provider</bundle.namespace>
+        <export.package>
+            org.apache.ace.deployment.provider;version=${project.version}
+        </export.package>
     </properties>
 
 </project>
\ No newline at end of file

Modified: incubator/ace/trunk/ace-deployment-provider-filebased/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-provider-filebased/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-deployment-provider-filebased/pom.xml (original)
+++ incubator/ace/trunk/ace-deployment-provider-filebased/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,18 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Deployment :: Provider :: Filebased</name>
+    <description></description>
 
     <properties>
-        <bundle.symbolicName>${namespace}.deployment.provider.filebased</bundle.symbolicName>
-        <bundle.namespace>${namespace}.deployment.provider.filebased</bundle.namespace>
+        <export.package>
+            org.apache.ace.deployment.provider.filebased;version=${project.version}
+        </export.package>
+        <import.package>
+            org.apache.ace.deployment.provider;version=${project.version},
+            org.apache.ace.deployment.provider.impl;version=${project.version},
+            *
+        </import.package>
+        <bundle.activator>org.apache.ace.deployment.provider.filebased.Activator</bundle.activator>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-deployment-provider-repositorybased/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-provider-repositorybased/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-deployment-provider-repositorybased/pom.xml (original)
+++ incubator/ace/trunk/ace-deployment-provider-repositorybased/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,22 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Deployment :: Provider :: Repositorybased</name>
+    <description></description>
 
     <properties>
-        <bundle.symbolicName>${namespace}.deployment.provider.repositorybased</bundle.symbolicName>
-        <bundle.namespace>${namespace}.deployment.provider.repositorybased</bundle.namespace>
+        <import.package>
+            org.apache.ace.deployment.provider;version=${project.version},
+            org.apache.ace.range;version=${project.version},
+            org.apache.ace.repository;version=${project.version},
+            *
+        </import.package>
+        <private.package>
+            org.apache.ace.deployment.provider.repositorybased,
+            org.apache.ace.deployment.provider.impl,
+            org.apache.ace.repository.ext,
+            org.apache.ace.repository.ext.impl
+        </private.package>
+        <bundle.activator>org.apache.ace.deployment.provider.repositorybased.Activator</bundle.activator>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-deployment-servlet/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-servlet/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-deployment-servlet/pom.xml (original)
+++ incubator/ace/trunk/ace-deployment-servlet/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,18 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Deployment :: Servlet</name>
+    <description></description>
 
     <properties>
-        <bundle.symbolicName>${namespace}.deployment.servlet</bundle.symbolicName>
-        <bundle.namespace>${namespace}.deployment.servlet</bundle.namespace>
+        <import.package>
+            org.apache.ace.deployment.provider;version=${project.version},
+            org.apache.ace.deployment.streamgenerator;version=${project.version},
+            *
+        </import.package>
+        <private.package>
+            org.apache.ace.deployment.servlet
+        </private.package>
+        <bundle.activator>org.apache.ace.deployment.servlet.Activator</bundle.activator>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-deployment-streamgenerator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-streamgenerator/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-deployment-streamgenerator/pom.xml (original)
+++ incubator/ace/trunk/ace-deployment-streamgenerator/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,20 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Deployment :: Streamgenerator</name>
+    <description></description>
 
     <properties>
-        <bundle.symbolicName>${namespace}.deployment.streamgenerator</bundle.symbolicName>
-        <bundle.namespace>${namespace}.deployment.streamgenerator</bundle.namespace>
+        <export.package>
+            org.apache.ace.deployment.streamgenerator;version=${project.version}
+        </export.package>
+        <import.package>
+            org.apache.ace.deployment.provider;version=${project.version},
+            *
+        </import.package>
+        <private.package>
+            org.apache.ace.deployment.streamgenerator.impl
+        </private.package>
+        <bundle.activator>org.apache.ace.deployment.streamgenerator.impl.Activator</bundle.activator>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-deployment-task/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-task/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-deployment-task/pom.xml (original)
+++ incubator/ace/trunk/ace-deployment-task/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,19 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Deployment :: Task</name>
+    <description></description>
 
     <properties>
-        <bundle.symbolicName>${namespace}.deployment.task</bundle.symbolicName>
-        <bundle.namespace>${namespace}.deployment.task</bundle.namespace>
+        <import.package>
+            org.apache.ace.deployment;version=${project.version},
+            org.apache.ace.discovery;version=${project.version},
+            org.apache.ace.identification;version=${project.version},
+            *
+        </import.package>
+        <private.package>
+            org.apache.ace.deployment.task
+        </private.package>
+        <bundle.activator>org.apache.ace.deployment.task.Activator</bundle.activator>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-discovery-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-discovery-api/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-discovery-api/pom.xml (original)
+++ incubator/ace/trunk/ace-discovery-api/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,12 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Discovery :: API</name>
+    <description></description>
     
     <properties>
-        <bundle.symbolicName>${namespace}.discovery.api</bundle.symbolicName>
-        <bundle.namespace>${namespace}.discovery</bundle.namespace>
+        <export.package>
+            org.apache.ace.discovery;version=${project.version}
+        </export.package>
     </properties>
 
 </project>
\ No newline at end of file

Modified: incubator/ace/trunk/ace-discovery-property/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-discovery-property/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-discovery-property/pom.xml (original)
+++ incubator/ace/trunk/ace-discovery-property/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,17 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Discovery :: Property Based</name>
+    <description></description>
 
     <properties>
-        <bundle.symbolicName>${namespace}.discovery.property</bundle.symbolicName>
-        <bundle.namespace>${namespace}.discovery.property</bundle.namespace>
+        <import.package>
+            org.apache.ace.discovery;version=${project.version},
+            *
+        </import.package>
+        <private.package>
+            org.apache.ace.discovery.property
+        </private.package>
+        <bundle.activator>org.apache.ace.discovery.property.Activator</bundle.activator>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-discovery-upnp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-discovery-upnp/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-discovery-upnp/pom.xml (original)
+++ incubator/ace/trunk/ace-discovery-upnp/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,17 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Discovery :: UPNP</name>
+    <description></description>
     
     <properties>
-        <bundle.symbolicName>${namespace}.discovery.upnp</bundle.symbolicName>
-        <bundle.namespace>${namespace}.discovery.upnp</bundle.namespace>
+        <export.package>
+            org.apache.ace.discovery.upnp;version=${project.version}
+        </export.package>
+        <import.package>
+            org.apache.ace.discovery;version=${project.version},
+            *
+        </import.package>
+        <bundle.activator>org.apache.ace.discovery.upnp.Activator</bundle.activator>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-gateway-log-store/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-gateway-log-store/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-gateway-log-store/pom.xml (original)
+++ incubator/ace/trunk/ace-gateway-log-store/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,21 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Gateway :: Log :: Store</name>
+    <description></description>
     
     <properties>
-        <bundle.symbolicName>${namespace}.gateway.log.store</bundle.symbolicName>
-        <bundle.namespace>${namespace}.gateway.log.store</bundle.namespace>
+        <export.package>
+            org.apache.ace.gateway.log.store;version=${project.version}
+        </export.package>
+        <import.package>
+            org.apache.ace.identification;version=${project.version},
+            org.apache.ace.log;version=${project.version},
+            *
+        </import.package>
+        <private.package>
+            org.apache.ace.gateway.log.store.impl
+        </private.package>
+        <bundle.activator>org.apache.ace.gateway.log.store.impl.Activator</bundle.activator>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-gateway-log/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-gateway-log/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-gateway-log/pom.xml (original)
+++ incubator/ace/trunk/ace-gateway-log/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,21 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Gateway :: Log</name>
+    <description></description>
     
     <properties>
-        <bundle.symbolicName>${namespace}.gateway.log</bundle.symbolicName>
-        <bundle.namespace>${namespace}.gateway.log</bundle.namespace>
+        <import.package>
+            org.apache.ace.discovery;version=${project.version},
+            org.apache.ace.gateway.log.store;version=${project.version},
+            org.apache.ace.gateway.log.task;version=${project.version},
+            org.apache.ace.identification;version=${project.version},
+            org.apache.ace.log;version=${project.version},
+            *
+        </import.package>
+        <private.package>
+            org.apache.ace.gateway.log
+        </private.package>
+        <bundle.activator>org.apache.ace.gateway.log.Activator</bundle.activator>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-httplistener/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-httplistener/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-httplistener/pom.xml (original)
+++ incubator/ace/trunk/ace-httplistener/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,17 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: HttpListener</name>
+    <description></description>
 
     <properties>
-        <bundle.symbolicName>${namespace}.http.listener</bundle.symbolicName>
-        <bundle.namespace>${namespace}.http.listener</bundle.namespace>
+        <export.package>
+            org.apache.ace.http.listener;version=${project.version},
+            org.apache.ace.http.listener.constants;version=${project.version}
+        </export.package>
+        <import.package>
+            *
+        </import.package>
+        <bundle.activator>org.apache.ace.http.listener.Activator</bundle.activator>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-identification-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-identification-api/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-identification-api/pom.xml (original)
+++ incubator/ace/trunk/ace-identification-api/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,12 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Identification :: API</name>
+    <description></description>
     
     <properties>
-        <bundle.symbolicName>${namespace}.identification.api</bundle.symbolicName>
-        <bundle.namespace>${namespace}.identification</bundle.namespace>
+        <export.package>
+            org.apache.ace.identification;version=${project.version}
+        </export.package>
     </properties>
 
 </project>
\ No newline at end of file

Modified: incubator/ace/trunk/ace-identification-ifconfig/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-identification-ifconfig/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-identification-ifconfig/pom.xml (original)
+++ incubator/ace/trunk/ace-identification-ifconfig/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,13 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Identification :: Ifconfig</name>
+    <description></description>
 
     <properties>
-        <bundle.symbolicName>${namespace}.identification.ifconfig</bundle.symbolicName>
-        <bundle.namespace>${namespace}.identification.ifconfig</bundle.namespace>
+        <import.package>
+            org.apache.ace.identification.ifconfig
+        </import.package>
+        <bundle.activator>org.apache.ace.identification.ifconfig.Activator</bundle.activator>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-identification-property/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-identification-property/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-identification-property/pom.xml (original)
+++ incubator/ace/trunk/ace-identification-property/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,17 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Identification :: Property Based</name>
+    <description></description>
     
     <properties>
-        <bundle.symbolicName>${namespace}.identification.property</bundle.symbolicName>
-        <bundle.namespace>${namespace}.identification.property</bundle.namespace>
+        <import.package>
+            org.apache.ace.identification;version=${project.version},
+            *
+        </import.package>
+        <private.package>
+            org.apache.ace.identification.property
+        </private.package>
+        <bundle.activator>org.apache.ace.identification.property.Activator</bundle.activator>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-location-upnp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-location-upnp/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-location-upnp/pom.xml (original)
+++ incubator/ace/trunk/ace-location-upnp/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,18 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Location :: UPNP Service</name>
+    <description></description>
 
     <properties>
-        <bundle.symbolicName>${namespace}.location.upnp</bundle.symbolicName>
-        <bundle.namespace>${namespace}.location.upnp</bundle.namespace>
+        <export.package>
+            org.apache.ace.location;version=${project.version},
+            org.apache.ace.location.upnp;version=${project.version},
+            org.apache.ace.location.upnp.actions;version=${project.version},
+            org.apache.ace.location.upnp.util;version=${project.version}
+        </export.package>
+        <import.package>
+            *
+        </import.package>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-log-listener/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-log-listener/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-log-listener/pom.xml (original)
+++ incubator/ace/trunk/ace-log-listener/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,17 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Log :: Listener</name>
+    <description></description>
 
     <properties>
-        <bundle.symbolicName>${namespace}.log.listener</bundle.symbolicName>
-        <bundle.namespace>${namespace}.log.listener</bundle.namespace>
+        <import.package>
+            org.apache.ace.log;version=${project.version},
+            *
+        </import.package>
+        <private.package>
+            org.apache.ace.log.listener
+        </private.package>
+        <bundle.activator>org.apache.ace.log.listener.Activator</bundle.activator>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-log-servlet/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-log-servlet/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-log-servlet/pom.xml (original)
+++ incubator/ace/trunk/ace-log-servlet/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,19 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Log :: Servlet</name>
+    <description></description>
 
     <properties>
-        <bundle.symbolicName>${namespace}.server.log.servlet</bundle.symbolicName>
-        <bundle.namespace>${namespace}.server.log.servlet</bundle.namespace>
+        <export.package>
+            org.apache.ace.server.log.servlet;version=${project.version}
+        </export.package>
+        <import.package>
+            org.apache.ace.log;version=${project.version},
+            org.apache.ace.range;version=${project.version},
+            org.apache.ace.server.log.store;version=${project.version},
+            *
+        </import.package>
+        <bundle.activator>org.apache.ace.server.log.servlet.Activator</bundle.activator>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-log-task/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-log-task/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-log-task/pom.xml (original)
+++ incubator/ace/trunk/ace-log-task/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,20 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Log :: Task</name>
+    <description></description>
 
     <properties>
-        <bundle.symbolicName>${namespace}.server.log.task</bundle.symbolicName>
-        <bundle.namespace>${namespace}.server.log.task</bundle.namespace>
+        <import.package>
+            org.apache.ace.discovery;version=${project.version},
+            org.apache.ace.log;version=${project.version},
+            org.apache.ace.range;version=${project.version},
+            org.apache.ace.server.log.store;version=${project.version},
+            *
+        </import.package>
+        <private.package>
+            org.apache.ace.server.log.task
+        </private.package>
+        <bundle.activator>org.apache.ace.server.log.task.Activator</bundle.activator>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-log/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-log/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-log/pom.xml (original)
+++ incubator/ace/trunk/ace-log/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,19 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Log</name>
+    <description></description>
     
     <properties>
-        <bundle.symbolicName>${namespace}.log</bundle.symbolicName>
-        <bundle.namespace>${namespace}.log</bundle.namespace>
+        <export.package>
+            org.apache.ace.log;version=${project.version}
+        </export.package>
+        <import.package>
+            org.apache.ace.range;version=${project.version},
+            *
+        </import.package>
+        <private.package>
+            org.apache.ace.util
+        </private.package>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-managementagent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-managementagent/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-managementagent/pom.xml (original)
+++ incubator/ace/trunk/ace-managementagent/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,27 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Management Agent</name>
+    <description></description>
 
     <properties>
-        <bundle.symbolicName>${namespace}.managementagent</bundle.symbolicName>
-        <bundle.namespace>${namespace}</bundle.namespace>
+        <export.package>
+            org.osgi.service.cm;version="1.3",
+	        org.osgi.service.deploymentadmin;version="1.0",
+	        org.osgi.service.deploymentadmin.spi;version="1.0",
+	        org.osgi.service.event;version="1.2",
+	        org.osgi.service.log;version="1.3",
+	        org.osgi.service.metatype;version="1.1",
+	        org.apache.ace.log;version=${project.version}
+        </export.package>
+        <import.package>
+            *
+        </import.package>
+        <private.package>
+            org.apache.ace.*,
+            org.apache.felix.*,
+            EDU.oswego.cs.dl.util.concurrent
+        </private.package>
+        <bundle.activator>org.apache.ace.managementagent.Activator</bundle.activator>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-obr-metadata/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-obr-metadata/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-obr-metadata/pom.xml (original)
+++ incubator/ace/trunk/ace-obr-metadata/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,20 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: OBR :: Metadata</name>
+    <description></description>
 
     <properties>
-        <bundle.symbolicName>${namespace}.obr.metadata</bundle.symbolicName>
-        <bundle.namespace>${namespace}.obr.metadata</bundle.namespace>
+        <export.package>
+            org.apache.ace.obr.metadata;version=${project.version}
+        </export.package>
+        <import.package>
+            *
+        </import.package>
+        <private.package>
+            org.apache.ace.obr.metadata.bindex
+        </private.package>
+        <bundle.activator>org.apache.ace.obr.metadata.bindex.Activator</bundle.activator>
+        <embed.dependency>kxml2</embed.dependency>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-obr-servlet/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-obr-servlet/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-obr-servlet/pom.xml (original)
+++ incubator/ace/trunk/ace-obr-servlet/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,16 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: OBR :: Servlet</name>
+    <description></description>
 
     <properties>
-        <bundle.symbolicName>${namespace}.obr.servlet</bundle.symbolicName>
-        <bundle.namespace>${namespace}.obr.servlet</bundle.namespace>
+        <export.package>
+            org.apache.ace.obr.servlet;version=${project.version}
+        </export.package>
+        <import.package>
+            *
+        </import.package>
+        <bundle.activator>org.apache.ace.obr.servlet.Activator</bundle.activator>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-obr-storage/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-obr-storage/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-obr-storage/pom.xml (original)
+++ incubator/ace/trunk/ace-obr-storage/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,17 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: OBR :: Storage</name>
+    <description></description>
 
     <properties>
-        <bundle.symbolicName>${namespace}.obr.storage</bundle.symbolicName>
-        <bundle.namespace>${namespace}.obr.storage</bundle.namespace>
+        <export.package>
+            org.apache.ace.obr.storage;version=${project.version}
+        </export.package>
+        <import.package>
+            org.apache.ace.obr.storage.file,
+            *
+        </import.package>
+        <bundle.activator>org.apache.ace.obr.storage.file.Activator</bundle.activator>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-range-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-range-api/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-range-api/pom.xml (original)
+++ incubator/ace/trunk/ace-range-api/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,12 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Range :: API</name>
+    <description></description>
 
     <properties>
-        <bundle.symbolicName>${namespace}.range.api</bundle.symbolicName>
-        <bundle.namespace>${namespace}.range</bundle.namespace>
+        <export.package>
+            org.apache.ace.range;version=${project.version}
+        </export.package>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-repository-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-repository-api/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-repository-api/pom.xml (original)
+++ incubator/ace/trunk/ace-repository-api/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,15 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Repository :: API</name>
+    <description></description>
 
     <properties>
-        <bundle.symbolicName>${namespace}.repository.api</bundle.symbolicName>
-        <bundle.namespace>${namespace}.repository</bundle.namespace>
+        <export.package>
+            org.apache.ace.repository;version=${project.version}
+        </export.package>
+        <import.package>
+            org.apache.ace.range;version=${project.version}
+        </import.package>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-repository-impl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-repository-impl/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-repository-impl/pom.xml (original)
+++ incubator/ace/trunk/ace-repository-impl/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,18 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Repository :: Impl</name>
+    <description></description>
 
     <properties>
-        <bundle.symbolicName>${namespace}.repository.impl</bundle.symbolicName>
-        <bundle.namespace>${namespace}.repository</bundle.namespace>
+        <import.package>
+            org.apache.ace.range;version=${project.version},
+            org.apache.ace.repository;version=${project.version},
+            *
+        </import.package>
+        <private.package>
+            org.apache.ace.repository.impl
+        </private.package>
+        <bundle.activator>org.apache.ace.repository.impl.Activator</bundle.activator>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-repository-servlet/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-repository-servlet/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-repository-servlet/pom.xml (original)
+++ incubator/ace/trunk/ace-repository-servlet/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,18 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Repository :: Servlet</name>
+    <description></description>
 
     <properties>
-        <bundle.symbolicName>${namespace}.repository.servlet</bundle.symbolicName>
-        <bundle.namespace>${namespace}.repository.servlet</bundle.namespace>
+        <export.package>
+            org.apache.ace.repository.servlet;version=${project.version}
+        </export.package>
+        <import.package>
+            org.apache.ace.range;version=${project.version},
+            org.apache.ace.repository;version=${project.version},
+            *
+        </import.package>
+        <bundle.activator>org.apache.ace.repository.servlet.Activator</bundle.activator>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-repository-task/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-repository-task/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-repository-task/pom.xml (original)
+++ incubator/ace/trunk/ace-repository-task/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,19 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Repository :: Task</name>
+    <description></description>
 
     <properties>
-        <bundle.symbolicName>${namespace}.repository.task</bundle.symbolicName>
-        <bundle.namespace>${namespace}.repository.task</bundle.namespace>
+        <export.package>
+            org.apache.ace.repository.task;version=${project.version}
+        </export.package>
+        <import.package>
+            org.apache.ace.discovery;version=${project.version},
+            org.apache.ace.range;version=${project.version},
+            org.apache.ace.repository;version=${project.version},
+            *
+        </import.package>
+        <bundle.activator>org.apache.ace.repository.task.Activator</bundle.activator>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/ace-resourceprocessor-useradmin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-resourceprocessor-useradmin/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/ace-resourceprocessor-useradmin/pom.xml (original)
+++ incubator/ace/trunk/ace-resourceprocessor-useradmin/pom.xml Mon Feb 28 16:29:30 2011
@@ -32,10 +32,20 @@
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Resourceprocessor :: UserAdmin</name>
+    <description></description>
 
     <properties>
-        <bundle.symbolicName>${namespace}.resourceprocessor.useradmin</bundle.symbolicName>
-        <bundle.namespace>${namespace}.resourceprocessor.useradmin</bundle.namespace>
+        <export.package>
+            org.apache.ace.resourceprocessor.useradmin;version=${project.version}
+        </export.package>
+        <import.package>
+            *
+        </import.package>
+        <private.package>
+            org.apache.ace.resourceprocessor.useradmin.impl
+        </private.package>
+        <bundle.activator>org.apache.ace.resourceprocessor.useradmin.impl.Activator</bundle.activator>
+        <deployment.providesresourceprocessor>org.apache.ace.resourceprocessor.useradmin</deployment.providesresourceprocessor>
     </properties>
 
     <dependencies>

Modified: incubator/ace/trunk/pom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/pom/pom.xml?rev=1075411&r1=1075410&r2=1075411&view=diff
==============================================================================
--- incubator/ace/trunk/pom/pom.xml (original)
+++ incubator/ace/trunk/pom/pom.xml Mon Feb 28 16:29:30 2011
@@ -115,9 +115,14 @@
     </scm>
 
     <properties>
-        <namespace>org.apache.ace</namespace>
+        <!-- Default OSGi statements -->
+        <import.package></import.package>
+        <export.package></export.package>
+        <private.package></private.package>
+        <embed.dependency></embed.dependency>
+        <bundle.activator></bundle.activator>
+        <deployment.providesresourceprocessor></deployment.providesresourceprocessor>
 
-        <!-- Dependency versions -->
         <commons-collections.version>3.2.1</commons-collections.version>
         <commons-lang.version>2.4</commons-lang.version>
         <commons-logging.version>1.1.1</commons-logging.version>
@@ -207,7 +212,15 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <_include>-osgi.bnd</_include>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Bundle-Description>${project.description}</Bundle-Description>
+                        <Bundle-Version>${project.version}</Bundle-Version>
+                        <Export-Package>${export.package}</Export-Package>
+                        <Import-Package>${import.package}</Import-Package>
+                        <Private-Package>${private.package}</Private-Package>
+                        <Embed-Dependency>${embed.dependency}</Embed-Dependency>
+                        <Bundle-Activator>${bundle.activator}</Bundle-Activator>
+                        <Deployment-ProvidesResourceProcessor>${deployment.providesresourceprocessor}</Deployment-ProvidesResourceProcessor>
                     </instructions>
                     <supportedProjectTypes>
                         <supportedProjectType>jar</supportedProjectType>