Code review:
- cleaned up the code to use more recent Java constructs, such as foreach
loops;
- cleaned up the test cases to make them a bit more readable and easier to
maintain by folding some duplicate code into helper methods;
- fixed a corner case in which an AutoConf resource drops a configuration while
updating existing ones at the same time. A NPE could be thrown in this
situation due ConfigurationAdmin not being present;
- fixed a corner case in which a resource is dropped twice. A IOException could
be thrown;
- moved some really specific MetaType code to a utility class;
- added some test cases for PersistencyManager;
- applied the code formatting guidelines for Apache Felix.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1724802 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/deploymentadmin/autoconf/pom.xml b/deploymentadmin/autoconf/pom.xml
index f6b83d7..0406d3a 100644
--- a/deploymentadmin/autoconf/pom.xml
+++ b/deploymentadmin/autoconf/pom.xml
@@ -85,9 +85,19 @@
<Bundle-Name>Apache Felix AutoConf Resource Processor</Bundle-Name>
<Bundle-Description>A customizer bundle that publishes a Resource Processor service that processes configuration resources shipped in a Deployment Package.</Bundle-Description>
<Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
- <Private-Package>org.apache.felix.deployment.rp.autoconf, org.apache.felix.metatype, org.apache.felix.metatype.internal.l10n, org.apache.felix.metatype.internal, org.kxml2.io;-split-package:=merge-first, org.xmlpull.v1;-split-package:=merge-first, org.osgi.service.metatype;-split-package:=merge-first</Private-Package>
- <Import-Package>org.apache.felix.dm,org.osgi.service.deploymentadmin,org.osgi.service.deploymentadmin.spi,org.osgi.service.event,org.osgi.service.log,*</Import-Package>
- <Export-Package>org.osgi.service.deploymentadmin.spi;version="1.0",org.osgi.service.metatype;version="1.2"</Export-Package>
+ <Private-Package>
+ org.apache.felix.deployment.rp.autoconf,
+ org.apache.felix.metatype,
+ org.apache.felix.metatype.internal.l10n,
+ org.apache.felix.metatype.internal,
+ org.kxml2.io; -split-package:=merge-first,
+ org.xmlpull.v1; -split-package:=merge-first,
+ org.osgi.service.metatype; -split-package:=merge-first
+ </Private-Package>
+ <Export-Package>
+ org.osgi.service.deploymentadmin.spi; -split-package:=merge-last;version="1.0",
+ org.osgi.service.metatype; -split-package:=merge-last;version="1.2"
+ </Export-Package>
<DeploymentPackage-Customizer>true</DeploymentPackage-Customizer>
<Deployment-ProvidesResourceProcessor>org.osgi.deployment.rp.autoconf</Deployment-ProvidesResourceProcessor>
</instructions>