You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2016/10/25 17:37:33 UTC

svn commit: r16685 - /release/felix/

Author: cziegeler
Date: Tue Oct 25 17:37:32 2016
New Revision: 16685

Log:
Configadmin 1.8.12

Added:
    release/felix/org.apache.felix.configadmin-1.8.12-javadoc.jar   (with props)
    release/felix/org.apache.felix.configadmin-1.8.12-javadoc.jar.asc   (with props)
    release/felix/org.apache.felix.configadmin-1.8.12-javadoc.jar.md5
    release/felix/org.apache.felix.configadmin-1.8.12-javadoc.jar.sha1
    release/felix/org.apache.felix.configadmin-1.8.12-source-release.tar.gz   (with props)
    release/felix/org.apache.felix.configadmin-1.8.12-source-release.tar.gz.asc   (with props)
    release/felix/org.apache.felix.configadmin-1.8.12-source-release.tar.gz.md5
    release/felix/org.apache.felix.configadmin-1.8.12-source-release.tar.gz.sha1
    release/felix/org.apache.felix.configadmin-1.8.12-source-release.zip   (with props)
    release/felix/org.apache.felix.configadmin-1.8.12-source-release.zip.asc   (with props)
    release/felix/org.apache.felix.configadmin-1.8.12-source-release.zip.md5
    release/felix/org.apache.felix.configadmin-1.8.12-source-release.zip.sha1
    release/felix/org.apache.felix.configadmin-1.8.12-sources.jar   (with props)
    release/felix/org.apache.felix.configadmin-1.8.12-sources.jar.asc   (with props)
    release/felix/org.apache.felix.configadmin-1.8.12-sources.jar.md5
    release/felix/org.apache.felix.configadmin-1.8.12-sources.jar.sha1
    release/felix/org.apache.felix.configadmin-1.8.12.jar   (with props)
    release/felix/org.apache.felix.configadmin-1.8.12.jar.asc   (with props)
    release/felix/org.apache.felix.configadmin-1.8.12.jar.md5
    release/felix/org.apache.felix.configadmin-1.8.12.jar.sha1
    release/felix/org.apache.felix.configadmin-1.8.12.pom
    release/felix/org.apache.felix.configadmin-1.8.12.pom.asc   (with props)
    release/felix/org.apache.felix.configadmin-1.8.12.pom.md5
    release/felix/org.apache.felix.configadmin-1.8.12.pom.sha1
Removed:
    release/felix/org.apache.felix.configadmin-1.8.10-javadoc.jar
    release/felix/org.apache.felix.configadmin-1.8.10-javadoc.jar.asc
    release/felix/org.apache.felix.configadmin-1.8.10-javadoc.jar.md5
    release/felix/org.apache.felix.configadmin-1.8.10-javadoc.jar.sha1
    release/felix/org.apache.felix.configadmin-1.8.10-source-release.tar.gz
    release/felix/org.apache.felix.configadmin-1.8.10-source-release.tar.gz.asc
    release/felix/org.apache.felix.configadmin-1.8.10-source-release.tar.gz.md5
    release/felix/org.apache.felix.configadmin-1.8.10-source-release.tar.gz.sha1
    release/felix/org.apache.felix.configadmin-1.8.10-source-release.zip
    release/felix/org.apache.felix.configadmin-1.8.10-source-release.zip.asc
    release/felix/org.apache.felix.configadmin-1.8.10-source-release.zip.md5
    release/felix/org.apache.felix.configadmin-1.8.10-source-release.zip.sha1
    release/felix/org.apache.felix.configadmin-1.8.10-sources.jar
    release/felix/org.apache.felix.configadmin-1.8.10-sources.jar.asc
    release/felix/org.apache.felix.configadmin-1.8.10-sources.jar.md5
    release/felix/org.apache.felix.configadmin-1.8.10-sources.jar.sha1
    release/felix/org.apache.felix.configadmin-1.8.10.jar
    release/felix/org.apache.felix.configadmin-1.8.10.jar.asc
    release/felix/org.apache.felix.configadmin-1.8.10.jar.md5
    release/felix/org.apache.felix.configadmin-1.8.10.jar.sha1
    release/felix/org.apache.felix.configadmin-1.8.10.pom
    release/felix/org.apache.felix.configadmin-1.8.10.pom.asc
    release/felix/org.apache.felix.configadmin-1.8.10.pom.md5
    release/felix/org.apache.felix.configadmin-1.8.10.pom.sha1

Added: release/felix/org.apache.felix.configadmin-1.8.12-javadoc.jar
==============================================================================
Binary file - no diff available.

Propchange: release/felix/org.apache.felix.configadmin-1.8.12-javadoc.jar
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: release/felix/org.apache.felix.configadmin-1.8.12-javadoc.jar.asc
==============================================================================
Binary file - no diff available.

Propchange: release/felix/org.apache.felix.configadmin-1.8.12-javadoc.jar.asc
------------------------------------------------------------------------------
    svn:mime-type = application/pgp-signature

Added: release/felix/org.apache.felix.configadmin-1.8.12-javadoc.jar.md5
==============================================================================
--- release/felix/org.apache.felix.configadmin-1.8.12-javadoc.jar.md5 (added)
+++ release/felix/org.apache.felix.configadmin-1.8.12-javadoc.jar.md5 Tue Oct 25 17:37:32 2016
@@ -0,0 +1 @@
+66fbbc3f1f837724ce8adc3648a5d090
\ No newline at end of file

Added: release/felix/org.apache.felix.configadmin-1.8.12-javadoc.jar.sha1
==============================================================================
--- release/felix/org.apache.felix.configadmin-1.8.12-javadoc.jar.sha1 (added)
+++ release/felix/org.apache.felix.configadmin-1.8.12-javadoc.jar.sha1 Tue Oct 25 17:37:32 2016
@@ -0,0 +1 @@
+5cfc0c99dd984979f3abd121a1ac6fd0881dcd67
\ No newline at end of file

Added: release/felix/org.apache.felix.configadmin-1.8.12-source-release.tar.gz
==============================================================================
Binary file - no diff available.

Propchange: release/felix/org.apache.felix.configadmin-1.8.12-source-release.tar.gz
------------------------------------------------------------------------------
--- svn:mime-type (added)
+++ svn:mime-type Tue Oct 25 17:37:32 2016
@@ -0,0 +1 @@
+application/x-gzip*.h = svn:eol-style=native*.htc = svn:eol-style=native.htaccess = svn:eol-style=native*.handlers = svn:eol-style=native

Added: release/felix/org.apache.felix.configadmin-1.8.12-source-release.tar.gz.asc
==============================================================================
Binary file - no diff available.

Propchange: release/felix/org.apache.felix.configadmin-1.8.12-source-release.tar.gz.asc
------------------------------------------------------------------------------
    svn:mime-type = application/pgp-signature

Added: release/felix/org.apache.felix.configadmin-1.8.12-source-release.tar.gz.md5
==============================================================================
--- release/felix/org.apache.felix.configadmin-1.8.12-source-release.tar.gz.md5 (added)
+++ release/felix/org.apache.felix.configadmin-1.8.12-source-release.tar.gz.md5 Tue Oct 25 17:37:32 2016
@@ -0,0 +1 @@
+29e04ef9046692a6f2621a3ed76eeb23
\ No newline at end of file

Added: release/felix/org.apache.felix.configadmin-1.8.12-source-release.tar.gz.sha1
==============================================================================
--- release/felix/org.apache.felix.configadmin-1.8.12-source-release.tar.gz.sha1 (added)
+++ release/felix/org.apache.felix.configadmin-1.8.12-source-release.tar.gz.sha1 Tue Oct 25 17:37:32 2016
@@ -0,0 +1 @@
+4bb3be1eb2f0482b4be24292abe626f056c1bb72
\ No newline at end of file

Added: release/felix/org.apache.felix.configadmin-1.8.12-source-release.zip
==============================================================================
Binary file - no diff available.

Propchange: release/felix/org.apache.felix.configadmin-1.8.12-source-release.zip
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: release/felix/org.apache.felix.configadmin-1.8.12-source-release.zip.asc
==============================================================================
Binary file - no diff available.

Propchange: release/felix/org.apache.felix.configadmin-1.8.12-source-release.zip.asc
------------------------------------------------------------------------------
    svn:mime-type = application/pgp-signature

Added: release/felix/org.apache.felix.configadmin-1.8.12-source-release.zip.md5
==============================================================================
--- release/felix/org.apache.felix.configadmin-1.8.12-source-release.zip.md5 (added)
+++ release/felix/org.apache.felix.configadmin-1.8.12-source-release.zip.md5 Tue Oct 25 17:37:32 2016
@@ -0,0 +1 @@
+691e7dd73111b983b4ab248fcc2f1eb7
\ No newline at end of file

Added: release/felix/org.apache.felix.configadmin-1.8.12-source-release.zip.sha1
==============================================================================
--- release/felix/org.apache.felix.configadmin-1.8.12-source-release.zip.sha1 (added)
+++ release/felix/org.apache.felix.configadmin-1.8.12-source-release.zip.sha1 Tue Oct 25 17:37:32 2016
@@ -0,0 +1 @@
+c9d9484bfadd59e52360c927363652a71df8c78a
\ No newline at end of file

Added: release/felix/org.apache.felix.configadmin-1.8.12-sources.jar
==============================================================================
Binary file - no diff available.

Propchange: release/felix/org.apache.felix.configadmin-1.8.12-sources.jar
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: release/felix/org.apache.felix.configadmin-1.8.12-sources.jar.asc
==============================================================================
Binary file - no diff available.

Propchange: release/felix/org.apache.felix.configadmin-1.8.12-sources.jar.asc
------------------------------------------------------------------------------
    svn:mime-type = application/pgp-signature

Added: release/felix/org.apache.felix.configadmin-1.8.12-sources.jar.md5
==============================================================================
--- release/felix/org.apache.felix.configadmin-1.8.12-sources.jar.md5 (added)
+++ release/felix/org.apache.felix.configadmin-1.8.12-sources.jar.md5 Tue Oct 25 17:37:32 2016
@@ -0,0 +1 @@
+e64c1c51a69c3f1b526073514d73e012
\ No newline at end of file

Added: release/felix/org.apache.felix.configadmin-1.8.12-sources.jar.sha1
==============================================================================
--- release/felix/org.apache.felix.configadmin-1.8.12-sources.jar.sha1 (added)
+++ release/felix/org.apache.felix.configadmin-1.8.12-sources.jar.sha1 Tue Oct 25 17:37:32 2016
@@ -0,0 +1 @@
+a3cb12152878c44736ace7dc5ec718f9bda64a75
\ No newline at end of file

Added: release/felix/org.apache.felix.configadmin-1.8.12.jar
==============================================================================
Binary file - no diff available.

Propchange: release/felix/org.apache.felix.configadmin-1.8.12.jar
------------------------------------------------------------------------------
    svn:mime-type = application/java-archive

Added: release/felix/org.apache.felix.configadmin-1.8.12.jar.asc
==============================================================================
Binary file - no diff available.

Propchange: release/felix/org.apache.felix.configadmin-1.8.12.jar.asc
------------------------------------------------------------------------------
    svn:mime-type = application/pgp-signature

Added: release/felix/org.apache.felix.configadmin-1.8.12.jar.md5
==============================================================================
--- release/felix/org.apache.felix.configadmin-1.8.12.jar.md5 (added)
+++ release/felix/org.apache.felix.configadmin-1.8.12.jar.md5 Tue Oct 25 17:37:32 2016
@@ -0,0 +1 @@
+c99fe561643ce038826f7f2458252667
\ No newline at end of file

Added: release/felix/org.apache.felix.configadmin-1.8.12.jar.sha1
==============================================================================
--- release/felix/org.apache.felix.configadmin-1.8.12.jar.sha1 (added)
+++ release/felix/org.apache.felix.configadmin-1.8.12.jar.sha1 Tue Oct 25 17:37:32 2016
@@ -0,0 +1 @@
+8d68df2ef22c0293f1a977764ac83e1b4aaf1cc6
\ No newline at end of file

Added: release/felix/org.apache.felix.configadmin-1.8.12.pom
==============================================================================
--- release/felix/org.apache.felix.configadmin-1.8.12.pom (added)
+++ release/felix/org.apache.felix.configadmin-1.8.12.pom Tue Oct 25 17:37:32 2016
@@ -0,0 +1,307 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>felix-parent</artifactId>
+        <version>4</version>
+        <relativePath />
+    </parent>
+
+    <artifactId>org.apache.felix.configadmin</artifactId>
+    <version>1.8.12</version>
+    <packaging>bundle</packaging>
+
+    <name>Apache Felix Configuration Admin Service</name>
+    <description>
+        Implementation of the OSGi Configuration Admin Service Specification 1.5
+    </description>
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.configadmin-1.8.12</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.configadmin-1.8.12</developerConnection>
+        <url>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.configadmin-1.8.12</url>
+    </scm>
+
+    <!--
+        A Note on Testing
+        =================
+        
+        This project contains two kinds of tests: regular unit tests running
+        in the test phase and integration tests based on PAX Exam running
+        in the integration-test phase.
+        
+        Basically the complete project is build using Java 1.3 source and target
+        compatibility (as inherited from the parent pom). The exception are the
+        unit tests in the "integration" packages. These have to be compiled with
+        Java 5 source and target compatibility because the employ annotations
+        and generics.
+        
+        For running the integration tests from the console using Maven nothing
+        special has to be done as the tests run automatically. To run the tests
+        in your IDE, the project has to be built to the "package" phase with
+        the profile "ide" enabled:
+        
+             $ mvn -Pide clean package
+             
+        This creates the scr.jar file in the target folder, which is used by
+        the integration tests when run from the IDE. Alternatively the
+        "project.bundle.file" system property may be set to the bundle JAR
+        in the IDE launcher. 
+    -->
+    <properties>
+        <felix.java.version>6</felix.java.version>
+        <bundle.build.name>
+            ${basedir}/target
+        </bundle.build.name>
+        <bundle.file.name>
+            ${bundle.build.name}/${project.build.finalName}.jar
+        </bundle.file.name>
+    </properties>
+
+    <dependencies>
+    
+        <!--
+            Depend on latest version to make use of generics. Still we
+            make sure to only require Framework API 1.5 (OSGi Core R4.2)
+        -->
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <version>5.0.0</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <!--
+            Configuration Admin and other API from latest enterprise
+            which provides Config Admin 1.5 API
+        -->
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.enterprise</artifactId>
+            <version>5.0.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- BND export annotations -->        
+        <dependency>
+            <groupId>biz.aQute</groupId>
+            <artifactId>bndlib</artifactId>
+            <version>1.50.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Integration Testing with Pax Exam -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.6</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>pax-exam-junit4</artifactId>
+            <version>2.6.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>pax-exam-container-native</artifactId>
+            <version>2.6.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>pax-exam-link-mvn</artifactId>
+            <version>2.6.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.url</groupId>
+            <artifactId>pax-url-aether</artifactId>
+            <version>1.5.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.tinybundles</groupId>
+            <artifactId>tinybundles</artifactId>
+            <version>1.0.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-atinject_1.0_spec</artifactId>
+            <version>1.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>1.7.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.framework</artifactId>
+            <version>4.0.3</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>2.3.7</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Category>osgi</Bundle-Category>
+                        <Bundle-SymbolicName>
+                            ${project.artifactId}
+                        </Bundle-SymbolicName>
+                        <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
+                        <Bundle-DocURL>
+                            http://felix.apache.org/site/apache-felix-config-admin.html
+                        </Bundle-DocURL>
+                        <Bundle-Activator>
+                            org.apache.felix.cm.impl.ConfigurationManager
+                        </Bundle-Activator>
+                        <Export-Package>
+                            <!-- just list, version from package-info classes -->
+                            <!-- when the spec version changes, update the service property that includes the spec version in ConfigurationManager -->
+                            org.apache.felix.cm;
+                            org.apache.felix.cm.file,
+                            org.osgi.service.cm;provide:=true;version=1.5
+                        </Export-Package>
+                        <Import-Package>
+                            org.osgi.service.cm;version="[1.5,1.6)",
+                            org.osgi.framework;version="[1.4,2)",
+							org.osgi.service.log;resolution:=optional;version="1.3",
+                            *
+                        </Import-Package>
+                        <DynamicImport-Package>
+                            <!-- overwrite version from compendium bundle -->
+                            org.osgi.service.log;version="1.3"
+                        </DynamicImport-Package>
+                        <Provide-Capability>osgi.service;objectClass:List&lt;String&gt;="org.osgi.service.cm.ConfigurationAdmin",
+                        osgi.service;objectClass:List&lt;String&gt;="org.apache.felix.cm.PersistenceManager"</Provide-Capability>
+                        <Require-Capability>osgi.service;filter:="(objectClass=org.osgi.service.log.LogService)";effective:=active;resolution:=optional</Require-Capability>
+                        <Embed-Dependency>
+                            org.osgi.core;inline=org/osgi/util/tracker/ServiceTracker*|org/osgi/util/tracker/AbstractTracked.class
+                        </Embed-Dependency>
+                    </instructions>
+                </configuration>
+            </plugin>
+            <!--
+                Exclude Integration tests in (default) unit tests and
+                conversely enable integration tests for integration testing
+                only. Helper classes are completely excluded from testing. 
+            -->
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>surefire-it</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <systemProperties>
+                                <property>
+                                    <name>project.bundle.file</name>
+                                    <value>${bundle.file.name}</value>
+                                </property>
+                            </systemProperties>
+                            <excludes>
+                                <exclude>**/cm/*</exclude>
+                                <exclude>**/cm/file/*</exclude>
+                                <exclude>**/cm/impl/**</exclude>
+                            </excludes>
+                            <includes>
+                                <include>**/integration/*</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <excludes>
+                        <exclude>**/integration/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
+    <profiles>
+        <!--
+            copy the package such that IDEs may easily use it without
+            setting the system property
+        -->
+        <profile>
+            <id>ide</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <version>1.3</version>
+                        <executions>
+                            <execution>
+                                <id>cm-file-create</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <tasks>
+                                        <copy file="${project.build.directory}/${project.build.finalName}.jar" tofile="${project.build.directory}/configadmin.jar" />
+                                    </tasks>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+    
+    <!-- repositories for Pax Exam and BND tool -->
+    <repositories>
+        <repository>
+            <id>ops4j</id>
+            <name>ops4j</name>
+            <url>http://repository.ops4j.org/maven2</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>aqute</id>
+            <name>aqute</name>
+            <url>http://www.aqute.biz/repo</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+</project>

Added: release/felix/org.apache.felix.configadmin-1.8.12.pom.asc
==============================================================================
Binary file - no diff available.

Propchange: release/felix/org.apache.felix.configadmin-1.8.12.pom.asc
------------------------------------------------------------------------------
    svn:mime-type = application/pgp-signature

Added: release/felix/org.apache.felix.configadmin-1.8.12.pom.md5
==============================================================================
--- release/felix/org.apache.felix.configadmin-1.8.12.pom.md5 (added)
+++ release/felix/org.apache.felix.configadmin-1.8.12.pom.md5 Tue Oct 25 17:37:32 2016
@@ -0,0 +1 @@
+49370cc50eb5c99b5707ffec64f46308
\ No newline at end of file

Added: release/felix/org.apache.felix.configadmin-1.8.12.pom.sha1
==============================================================================
--- release/felix/org.apache.felix.configadmin-1.8.12.pom.sha1 (added)
+++ release/felix/org.apache.felix.configadmin-1.8.12.pom.sha1 Tue Oct 25 17:37:32 2016
@@ -0,0 +1 @@
+3f5576152aab90a3143a90b41590466b1c365a68
\ No newline at end of file