tamaya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anat...@apache.org
Subject [01/11] incubator-tamaya git commit: TAMAYA-123: Adding OSGI Support.
Date Fri, 16 Oct 2015 18:59:43 GMT
Repository: incubator-tamaya
Updated Branches:
  refs/heads/master a038b9c33 -> d03782a58


TAMAYA-123: Adding OSGI Support.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/624fb484
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/624fb484
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/624fb484

Branch: refs/heads/master
Commit: 624fb484ea98150ce560225c3d2de321d7c7622b
Parents: a038b9c
Author: anatole <anatole@apache.org>
Authored: Fri Oct 16 19:15:21 2015 +0200
Committer: anatole <anatole@apache.org>
Committed: Fri Oct 16 19:15:21 2015 +0200

----------------------------------------------------------------------
 api/pom.xml                                     | 19 +++++
 core/pom.xml                                    | 25 +++++++
 modules/builder/pom.xml                         | 17 +++++
 modules/classloader-support/pom.xml             | 24 +++++-
 modules/events/pom.xml                          | 24 ++++++
 modules/formats/pom.xml                         | 19 +++++
 modules/functions/pom.xml                       | 20 ++++-
 modules/injection-api/pom.xml                   | 77 ++++++++++++++++++++
 modules/injection/pom.xml                       | 33 ++++++++-
 modules/integration/cdi-se/pom.xml              | 18 +++++
 modules/integration/cdi/pom.xml                 | 19 ++++-
 .../org/tamaya/integration/osgi/Activator.java  |  3 +-
 .../integration/osgi/TamayaConfigAdminImpl.java |  3 +-
 modules/integration/spring/pom.xml              | 13 ++++
 modules/json/pom.xml                            | 17 ++++-
 modules/management/pom.xml                      | 19 ++++-
 modules/model/pom.xml                           | 23 +++++-
 modules/optional/pom.xml                        | 19 ++++-
 modules/remote/pom.xml                          | 19 ++++-
 modules/resolver/pom.xml                        | 26 ++++++-
 modules/resources/pom.xml                       | 22 +++++-
 modules/server/pom.xml                          | 23 +++++-
 modules/spi-support/pom.xml                     | 19 ++++-
 sandbox/collections/pom.xml                     | 25 ++++++-
 sandbox/integration/commons/pom.xml             | 27 ++++++-
 sandbox/integration/store/pom.xml               | 28 ++++++-
 sandbox/jodatime/pom.xml                        | 25 +++++++
 sandbox/metamodels/simple/pom.xml               | 28 ++++++-
 sandbox/metamodels/staged/pom.xml               | 28 ++++++-
 sandbox/sysprops/pom.xml                        | 23 +++++-
 30 files changed, 657 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/624fb484/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index 369cdb6..0cca428 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -28,6 +28,7 @@ under the License.
 
     <artifactId>tamaya-api</artifactId>
     <name>Apache Tamaya API</name>
+    <packaging>bundle</packaging>
 
     <description>
         The API for accessing configuration data.
@@ -41,4 +42,22 @@ under the License.
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.apache.tamaya,
+                            org.apache.tamaya.spi
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/624fb484/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index fe39e94..1b35dab 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -28,6 +28,7 @@ under the License.
 
     <artifactId>tamaya-core</artifactId>
     <name>Apache Tamaya Core Implementation</name>
+    <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>
@@ -49,4 +50,28 @@ under the License.
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Import-Package>
+                            org.apache.tamaya,
+                            org.apache.tamaya.spi,
+                            javax.annotation,
+                            *
+                        </Import-Package>
+                        <Private-Package>
+                            org.apache.tamaya.core.internal,
+                            org.apache.tamaya.core.internal.converters
+                        </Private-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/624fb484/modules/builder/pom.xml
----------------------------------------------------------------------
diff --git a/modules/builder/pom.xml b/modules/builder/pom.xml
index a078f79..710e5e7 100644
--- a/modules/builder/pom.xml
+++ b/modules/builder/pom.xml
@@ -28,6 +28,7 @@ under the License.
 
     <artifactId>tamaya-builder</artifactId>
     <name>Apache Tamaya Builder</name>
+    <packaging>jar</packaging> <!-- bundle -->
 
     <inceptionYear>2015</inceptionYear>
 
@@ -86,5 +87,21 @@ under the License.
 
     </dependencies>
 
+    <!--build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.apache.tamaya.builder
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build -->
     
 </project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/624fb484/modules/classloader-support/pom.xml
----------------------------------------------------------------------
diff --git a/modules/classloader-support/pom.xml b/modules/classloader-support/pom.xml
index 251bf64..953875d 100644
--- a/modules/classloader-support/pom.xml
+++ b/modules/classloader-support/pom.xml
@@ -32,7 +32,7 @@ under the License.
     <description>Apache Tamaya Classloader Support registers a ConfigurationContext that leverages
     classloader hierarchies. Also visibility of features and components is aligned with the
     corresponding hierarchy of classloaders.</description>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
 
     <properties>
         <jdkVersion>1.7</jdkVersion>
@@ -45,9 +45,31 @@ under the License.
             <version>${project.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.apache.tamaya.ext</groupId>
+            <artifactId>tamaya-spisupport</artifactId>
+            <version>0.2-incubating-SNAPSHOT</version>
+        </dependency>
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.apache.tamaya.clsupport
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/624fb484/modules/events/pom.xml
----------------------------------------------------------------------
diff --git a/modules/events/pom.xml b/modules/events/pom.xml
index a9f7e92..0c846c9 100644
--- a/modules/events/pom.xml
+++ b/modules/events/pom.xml
@@ -28,6 +28,7 @@ under the License.
 
     <artifactId>tamaya-events</artifactId>
     <name>Apache Tamaya Event and dynamic Update Extensions</name>
+    <packaging>bundle</packaging>
 
     <properties>
         <jdkVersion>1.7</jdkVersion>
@@ -62,5 +63,28 @@ under the License.
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.apache.tamaya.events,
+                            org.apache.tamaya.events.delta,
+                            org.apache.tamaya.events.folderobserver,
+                            org.apache.tamaya.events..spi
+                        </Export-Package>
+                        <Private-Package>
+                            org.apache.tamaya.events.internal
+                        </Private-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     
 </project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/624fb484/modules/formats/pom.xml
----------------------------------------------------------------------
diff --git a/modules/formats/pom.xml b/modules/formats/pom.xml
index c364a35..c8bfce4 100644
--- a/modules/formats/pom.xml
+++ b/modules/formats/pom.xml
@@ -27,6 +27,7 @@ under the License.
     </parent>
     <artifactId>tamaya-formats</artifactId>
     <name>Apache Tamaya Format Services</name>
+    <packaging>bundle</packaging>
 
     <properties>
         <jdkVersion>1.7</jdkVersion>
@@ -62,4 +63,22 @@ under the License.
             <artifactId>mockito-core</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.apache.tamaya.format,
+                            org.apache.tamaya.format.formats
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/624fb484/modules/functions/pom.xml
----------------------------------------------------------------------
diff --git a/modules/functions/pom.xml b/modules/functions/pom.xml
index c56ca5c..7bc7b66 100644
--- a/modules/functions/pom.xml
+++ b/modules/functions/pom.xml
@@ -29,7 +29,7 @@ under the License.
 
     <artifactId>tamaya-functions</artifactId>
     <name>Apache Tamaya Common Functional Extensions</name>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
 
     <properties>
         <jdkVersion>1.7</jdkVersion>
@@ -54,4 +54,22 @@ under the License.
             <artifactId>junit</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.apache.tamaya.functions
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/624fb484/modules/injection-api/pom.xml
----------------------------------------------------------------------
diff --git a/modules/injection-api/pom.xml b/modules/injection-api/pom.xml
new file mode 100644
index 0000000..89b1c67
--- /dev/null
+++ b/modules/injection-api/pom.xml
@@ -0,0 +1,77 @@
+<!-- 
+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 current 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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.tamaya.ext</groupId>
+        <artifactId>tamaya-extensions</artifactId>
+        <version>0.2-incubating-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+    <artifactId>tamaya-injection-api</artifactId>
+    <name>Apache Tamaya Injection Support API</name>
+    <packaging>bundle</packaging>
+
+    <properties>
+        <jdkVersion>1.7</jdkVersion>
+        <geronimo-atinject-1.0-spec.version>1.0</geronimo-atinject-1.0-spec.version>
+        <geronimo-jcdi-1.1-spec.version>1.0</geronimo-jcdi-1.1-spec.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tamaya</groupId>
+            <artifactId>tamaya-api</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-atinject_1.0_spec</artifactId>
+            <version>${geronimo-atinject-1.0-spec.version}</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jcdi_1.1_spec</artifactId>
+            <version>${geronimo-jcdi-1.1-spec.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.apache.tamaya.inject.api
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/624fb484/modules/injection/pom.xml
----------------------------------------------------------------------
diff --git a/modules/injection/pom.xml b/modules/injection/pom.xml
index 03a0b60..b5c87b3 100644
--- a/modules/injection/pom.xml
+++ b/modules/injection/pom.xml
@@ -27,7 +27,7 @@ under the License.
     </parent>
     <artifactId>tamaya-injection</artifactId>
     <name>Apache Tamaya Injection Support</name>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
 
     <properties>
         <jdkVersion>1.7</jdkVersion>
@@ -41,6 +41,11 @@ under the License.
             <scope>provided</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.tamaya.ext</groupId>
+            <artifactId>tamaya-injection-api</artifactId>
+            <version>0.2-incubating-SNAPSHOT</version>
+        </dependency>
+        <dependency>
             <groupId>org.apache.tamaya</groupId>
             <artifactId>tamaya-core</artifactId>
             <version>${project.version}</version>
@@ -48,6 +53,11 @@ under the License.
         </dependency>
         <dependency>
             <groupId>org.apache.tamaya.ext</groupId>
+            <artifactId>tamaya-events</artifactId>
+            <version>0.2-incubating-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tamaya.ext</groupId>
             <artifactId>tamaya-resolver</artifactId>
             <version>${project.version}</version>
             <optional>true</optional>
@@ -69,4 +79,25 @@ under the License.
             <artifactId>junit</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.apache.tamaya.inject
+                        </Export-Package>
+                        <Private-Package>
+                            org.apache.tamaya.inject.internal
+                        </Private-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/624fb484/modules/integration/cdi-se/pom.xml
----------------------------------------------------------------------
diff --git a/modules/integration/cdi-se/pom.xml b/modules/integration/cdi-se/pom.xml
index 88e9690..b3d573b 100644
--- a/modules/integration/cdi-se/pom.xml
+++ b/modules/integration/cdi-se/pom.xml
@@ -28,6 +28,7 @@ under the License.
 
     <artifactId>tamaya-cdi-se</artifactId>
     <name>Apache Tamaya Modules Integration - CDI (Using SE Injection)</name>
+    <packaging>bundle</packaging>
 
     <properties>
         <owb.version>1.6.2</owb.version>
@@ -53,6 +54,22 @@ under the License.
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.apache.tamaya.integration.cdi,
+                            org.apache.tamaya.integration.cdi.config,
+                        </Export-Package>
+                        <Private-Package>
+                            org.apache.tamaya.integration.cdi.internal
+                        </Private-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <dependencies>
@@ -118,6 +135,7 @@ under the License.
             <scope>test</scope>
         </dependency>
     </dependencies>
+
     <profiles>
         <profile>
             <id>OWB</id>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/624fb484/modules/integration/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/modules/integration/cdi/pom.xml b/modules/integration/cdi/pom.xml
index 2ebcc6b..eabf30e 100644
--- a/modules/integration/cdi/pom.xml
+++ b/modules/integration/cdi/pom.xml
@@ -28,6 +28,7 @@ under the License.
 
     <artifactId>tamaya-cdi</artifactId>
     <name>Apache Tamaya Modules Integration - CDI (Java EE)</name>
+    <packaging>bundle</packaging>
 
     <properties>
         <owb.version>1.6.2</owb.version>
@@ -56,10 +57,27 @@ under the License.
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.apache.tamaya.integration.cdi
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <dependencies>
         <dependency>
+            <groupId>org.apache.tamaya.ext</groupId>
+            <artifactId>tamaya-injection-api</artifactId>
+            <version>0.2-incubating-SNAPSHOT</version>
+        </dependency>
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
@@ -75,7 +93,6 @@ under the License.
             <scope>test</scope>
         </dependency>
 
-
         <dependency>
             <groupId>org.apache.tamaya</groupId>
             <artifactId>tamaya-core</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/624fb484/modules/integration/osgi/src/main/java/org/tamaya/integration/osgi/Activator.java
----------------------------------------------------------------------
diff --git a/modules/integration/osgi/src/main/java/org/tamaya/integration/osgi/Activator.java b/modules/integration/osgi/src/main/java/org/tamaya/integration/osgi/Activator.java
index 6ab5ace..7da7e77 100644
--- a/modules/integration/osgi/src/main/java/org/tamaya/integration/osgi/Activator.java
+++ b/modules/integration/osgi/src/main/java/org/tamaya/integration/osgi/Activator.java
@@ -45,8 +45,7 @@ public class Activator implements BundleActivator {
         String ranking = context.getProperty(SERVICE_RANKING_PROP);
         if (ranking == null) {
             props.put(Constants.SERVICE_RANKING, DEFAULT_RANKING);
-        }
-        else{
+        } else{
             props.put(Constants.SERVICE_RANKING, Integer.valueOf(ranking));
         }
         TamayaConfigAdminImpl cm = new TamayaConfigAdminImpl(context);

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/624fb484/modules/integration/osgi/src/main/java/org/tamaya/integration/osgi/TamayaConfigAdminImpl.java
----------------------------------------------------------------------
diff --git a/modules/integration/osgi/src/main/java/org/tamaya/integration/osgi/TamayaConfigAdminImpl.java b/modules/integration/osgi/src/main/java/org/tamaya/integration/osgi/TamayaConfigAdminImpl.java
index c9c7f00..649661c 100644
--- a/modules/integration/osgi/src/main/java/org/tamaya/integration/osgi/TamayaConfigAdminImpl.java
+++ b/modules/integration/osgi/src/main/java/org/tamaya/integration/osgi/TamayaConfigAdminImpl.java
@@ -55,8 +55,7 @@ public class TamayaConfigAdminImpl implements ConfigurationAdmin {
                         Configuration config = getConfiguration(pid);
                         if(config==null){
                             service.updated(null);
-                        }
-                        else{
+                        } else{
                             service.updated(config.getProperties());
                         }
                     } catch (Exception e) {

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/624fb484/modules/integration/spring/pom.xml
----------------------------------------------------------------------
diff --git a/modules/integration/spring/pom.xml b/modules/integration/spring/pom.xml
index f98d44b..bfad9a6 100644
--- a/modules/integration/spring/pom.xml
+++ b/modules/integration/spring/pom.xml
@@ -28,6 +28,7 @@ under the License.
 
     <artifactId>tamaya-spring</artifactId>
     <name>Apache Tamaya Modules Integration - Spring</name>
+    <packaging>bundle</packaging>
 
     <properties>
         <spring.version>4.2.1.RELEASE</spring.version>
@@ -48,6 +49,18 @@ under the License.
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.apache.tamaya.integration.spring
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/624fb484/modules/json/pom.xml
----------------------------------------------------------------------
diff --git a/modules/json/pom.xml b/modules/json/pom.xml
index 73c0102..78a88e6 100644
--- a/modules/json/pom.xml
+++ b/modules/json/pom.xml
@@ -28,6 +28,7 @@ under the License.
 
     <artifactId>tamaya-json</artifactId>
     <name>Apache Tamaya JSON Support</name>
+    <packaging>bundle</packaging>
     <inceptionYear>2015</inceptionYear>
 
     <properties>
@@ -54,22 +55,18 @@ under the License.
             <artifactId>tamaya-formats</artifactId>
             <version>${project.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-json_1.0_spec</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.apache.johnzon</groupId>
              <artifactId>johnzon-core</artifactId>
         </dependency>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.jboss.arquillian.daemon</groupId>
             <artifactId>arquillian-daemon-container-managed</artifactId>
@@ -135,6 +132,18 @@ under the License.
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.apache.tamaya.json
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/624fb484/modules/management/pom.xml
----------------------------------------------------------------------
diff --git a/modules/management/pom.xml b/modules/management/pom.xml
index c8b3129..9442452 100644
--- a/modules/management/pom.xml
+++ b/modules/management/pom.xml
@@ -29,7 +29,7 @@ under the License.
 
     <artifactId>tamaya-management</artifactId>
     <name>Apache Tamaya Modules - Java Management Extensions</name>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
 
     <properties>
         <jdkVersion>1.7</jdkVersion>
@@ -58,4 +58,21 @@ under the License.
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.apache.tamaya.management
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/624fb484/modules/model/pom.xml
----------------------------------------------------------------------
diff --git a/modules/model/pom.xml b/modules/model/pom.xml
index d36782b..b92aa6b 100644
--- a/modules/model/pom.xml
+++ b/modules/model/pom.xml
@@ -33,7 +33,7 @@ under the License.
     <description>This extension module provides functionality to describe, document and
         validate configuration during runtime.
     </description>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
 
     <properties>
         <jdkVersion>1.7</jdkVersion>
@@ -82,4 +82,25 @@ under the License.
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.apache.tamaya.model,
+                            org.apache.tamaya.model.spi
+                        </Export-Package>
+                        <Private-Package>
+                            org.apache.tamaya.model.internal
+                        </Private-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/624fb484/modules/optional/pom.xml
----------------------------------------------------------------------
diff --git a/modules/optional/pom.xml b/modules/optional/pom.xml
index 72a7e63..4204a12 100644
--- a/modules/optional/pom.xml
+++ b/modules/optional/pom.xml
@@ -32,7 +32,7 @@ under the License.
     <description>This module provides a simple class that can be used as a single dependency for evaluating
     configuration. It runs basically without Tamaya being on the classpath, but if available it
     considers/uses Tamaya functionality.</description>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
 
     <properties>
         <jdkVersion>1.7</jdkVersion>
@@ -58,4 +58,21 @@ under the License.
             <artifactId>junit</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.apache.tamaya.optional
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/624fb484/modules/remote/pom.xml
----------------------------------------------------------------------
diff --git a/modules/remote/pom.xml b/modules/remote/pom.xml
index 8b97441..68ae946 100644
--- a/modules/remote/pom.xml
+++ b/modules/remote/pom.xml
@@ -29,7 +29,7 @@ under the License.
 
     <artifactId>tamaya-remote</artifactId>
     <name>Apache Tamaya Remote PropertySource</name>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
 
     <properties>
         <jdkVersion>1.7</jdkVersion>
@@ -56,4 +56,21 @@ under the License.
             <artifactId>junit</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.apache.tamaya.remote
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/624fb484/modules/resolver/pom.xml
----------------------------------------------------------------------
diff --git a/modules/resolver/pom.xml b/modules/resolver/pom.xml
index 0eef3d7..770dc9f 100644
--- a/modules/resolver/pom.xml
+++ b/modules/resolver/pom.xml
@@ -16,7 +16,8 @@ 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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -27,7 +28,7 @@ under the License.
     </parent>
     <artifactId>tamaya-resolver</artifactId>
     <name>Apache Tamaya Resolver Services</name>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
 
     <properties>
         <jdkVersion>1.7</jdkVersion>
@@ -56,4 +57,25 @@ under the License.
             <artifactId>junit</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.apache.tamaya.resolver,
+                            org.apache.tamaya.resolver.spi
+                        </Export-Package>
+                        <Private-Package>
+                            org.apache.tamaya.resolver.internal
+                        </Private-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/624fb484/modules/resources/pom.xml
----------------------------------------------------------------------
diff --git a/modules/resources/pom.xml b/modules/resources/pom.xml
index 14f2677..25b11eb 100644
--- a/modules/resources/pom.xml
+++ b/modules/resources/pom.xml
@@ -27,7 +27,7 @@ under the License.
     </parent>
     <artifactId>tamaya-resources</artifactId>
     <name>Apache Tamaya Resource Services</name>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
 
     <properties>
         <jdkVersion>1.7</jdkVersion>
@@ -44,4 +44,24 @@ under the License.
             <artifactId>junit</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.apache.tamaya.resource
+                        </Export-Package>
+                        <Private-Package>
+                            org.apache.tamaya.resource.internal
+                        </Private-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/624fb484/modules/server/pom.xml
----------------------------------------------------------------------
diff --git a/modules/server/pom.xml b/modules/server/pom.xml
index b7c7f86..7d1d360 100644
--- a/modules/server/pom.xml
+++ b/modules/server/pom.xml
@@ -29,7 +29,7 @@ under the License.
 
     <artifactId>tamaya-server</artifactId>
     <name>Apache Tamaya Modules: Server Extension</name>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
 
     <properties>
         <jdkVersion>1.7</jdkVersion>
@@ -69,4 +69,25 @@ under the License.
             <version>3.1.2</version>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.apache.tamaya.server,
+                            org.apache.tamaya.server.spi
+                        </Export-Package>
+                        <Private-Package>
+                            org.apache.tamaya.server.internal
+                        </Private-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/624fb484/modules/spi-support/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spi-support/pom.xml b/modules/spi-support/pom.xml
index 2b2d6b6..8c8e8ae 100644
--- a/modules/spi-support/pom.xml
+++ b/modules/spi-support/pom.xml
@@ -31,7 +31,7 @@ under the License.
     <name> Apache Tamaya SPI Support Classes</name>
     <description>Apache Tamaya Support Classes useful when implementing the Tamaya SPI or code independent of the core RI
         implementation.</description>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
 
     <properties>
         <jdkVersion>1.7</jdkVersion>
@@ -56,4 +56,21 @@ under the License.
             <artifactId>junit</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.apache.tamaya.spisupport
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/624fb484/sandbox/collections/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/collections/pom.xml b/sandbox/collections/pom.xml
index 0ec3dda..d5ed30b 100644
--- a/sandbox/collections/pom.xml
+++ b/sandbox/collections/pom.xml
@@ -29,7 +29,7 @@ under the License.
 
     <artifactId>tamaya-collections</artifactId>
     <name>Apache Tamaya Modules - Collections Support</name>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>
@@ -49,4 +49,27 @@ under the License.
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Import-Package>
+                            org.apache.tamaya,
+                            org.apache.tamaya.spi,
+                            javax.annotation,
+                            *
+                        </Import-Package>
+                        <Private-Package>
+                            org.apache.tamaya.collections.internal
+                        </Private-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/624fb484/sandbox/integration/commons/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/integration/commons/pom.xml b/sandbox/integration/commons/pom.xml
index d3d1b85..8c04a41 100644
--- a/sandbox/integration/commons/pom.xml
+++ b/sandbox/integration/commons/pom.xml
@@ -28,7 +28,7 @@ under the License.
     </parent>
     <artifactId>commons</artifactId>
     <name>Apache Tamaya Commons Configuration Integration</name>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>
@@ -47,4 +47,29 @@ under the License.
             <version>1.10</version>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Import-Package>
+                            org.apache.tamaya,
+                            org.apache.tamaya.spi,
+                            org.apache.tamaya.format,
+                            org.apache.commons,
+                            javax.annotation,
+                            *
+                        </Import-Package>
+                        <Export-Package>
+                            org.apache.tamaya.integration.commons
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/624fb484/sandbox/integration/store/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/integration/store/pom.xml b/sandbox/integration/store/pom.xml
index d755551..0e8a546 100644
--- a/sandbox/integration/store/pom.xml
+++ b/sandbox/integration/store/pom.xml
@@ -28,7 +28,7 @@ under the License.
     <artifactId>tamaya-store</artifactId>
     <name>Apache Tamaya Storage/Cache/Datagrid Integration</name>
     <description>Integration with a Datagrid backend for distributed configuration.</description>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>
@@ -51,4 +51,30 @@ under the License.
             <artifactId>junit</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Import-Package>
+                            org.apache.tamaya,
+                            org.apache.tamaya.spi,
+                            org.apache.tamaya.events,
+                            org.apache.tamaya.spisupport
+                            javax.annotation,
+                            *
+                        </Import-Package>
+                        <Export-Package>
+                            org.apache.tamaya.integration.store,
+                            org.apache.tamaya.integration.store.spi,
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/624fb484/sandbox/jodatime/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/jodatime/pom.xml b/sandbox/jodatime/pom.xml
index 268939f..98b13a6 100644
--- a/sandbox/jodatime/pom.xml
+++ b/sandbox/jodatime/pom.xml
@@ -31,6 +31,7 @@ under the License.
 
     <artifactId>tamaya-jodatime</artifactId>
     <name>Apache Tamaya Joda-Time Support</name>
+    <packaging>bundle</packaging>
 
     <inceptionYear>2015</inceptionYear>
 
@@ -77,6 +78,30 @@ under the License.
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Import-Package>
+                            org.apache.tamaya,
+                            org.apache.tamaya.spi,
+                            org.jodatime,
+                            javax.annotation,
+                            *
+                        </Import-Package>
+                        <Export-Package>
+                            org.apache.tamaya.jodatime
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 
     
 </project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/624fb484/sandbox/metamodels/simple/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/metamodels/simple/pom.xml b/sandbox/metamodels/simple/pom.xml
index a806459..1d1b26b 100644
--- a/sandbox/metamodels/simple/pom.xml
+++ b/sandbox/metamodels/simple/pom.xml
@@ -29,7 +29,7 @@ under the License.
     <artifactId>tamaya-metamodels-simple</artifactId>
     <name>Apache Tamaya Modules Metamodels - Simple</name>
     <description>Simple Tamaya Metamodel, e.g. feasible for SE commandline tools and simple use cases.</description>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>
@@ -49,7 +49,7 @@ under the License.
         </dependency>
         <dependency>
             <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-items</artifactId>
+            <artifactId>tamaya-resources</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -59,4 +59,28 @@ under the License.
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Import-Package>
+                            org.apache.tamaya,
+                            org.apache.tamaya.spi,
+                            org.apache.tamaya.format,
+                            javax.annotation,
+                            *
+                        </Import-Package>
+                        <Export-Package>
+                            org.apache.tamaya.metamodel.simple
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/624fb484/sandbox/metamodels/staged/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/metamodels/staged/pom.xml b/sandbox/metamodels/staged/pom.xml
index 325e4ec..324ea5e 100644
--- a/sandbox/metamodels/staged/pom.xml
+++ b/sandbox/metamodels/staged/pom.xml
@@ -29,7 +29,7 @@ under the License.
 
     <artifactId>tamaya-metamodel-staged</artifactId>
     <name>Apache Tamaya Modules - Staged Configuration</name>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>
@@ -65,4 +65,30 @@ under the License.
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Import-Package>
+                            org.apache.tamaya,
+                            org.apache.tamaya.spi,
+                            org.apache.tamaya.resources,
+                            org.apache.tamaya.spisupport,
+                            org.apache.tamaya.functions,
+                            javax.annotation,
+                            *
+                        </Import-Package>
+                        <Export-Package>
+                            org.apache.tamaya.metamodel.simple
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/624fb484/sandbox/sysprops/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/sysprops/pom.xml b/sandbox/sysprops/pom.xml
index fba1d69..2fe0dd2 100644
--- a/sandbox/sysprops/pom.xml
+++ b/sandbox/sysprops/pom.xml
@@ -28,7 +28,7 @@ under the License.
     </parent>
     <artifactId>tamaya-sysprops</artifactId>
     <name>Apache Tamaya - Configured Java SE System Properties</name>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
 
     <build>
         <plugins>
@@ -44,6 +44,27 @@ under the License.
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Import-Package>
+                            org.apache.tamaya,
+                            org.apache.tamaya.spi,
+                            org.apache.tamaya.resources,
+                            org.apache.tamaya.spisupport,
+                            org.apache.tamaya.functions,
+                            javax.annotation,
+                            *
+                        </Import-Package>
+                        <Export-Package>
+                            org.apache.tamaya.integration.se
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 


Mime
View raw message