incubator-tamaya git commit: Fixed role description.

2016-04-30 Thread pottlinger
Repository: incubator-tamaya
Updated Branches:
  refs/heads/master 02b3306ac -> c16b0d534


Fixed role description.


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

Branch: refs/heads/master
Commit: c16b0d5348a7607af9004fce7078cfff19372537
Parents: 02b3306
Author: Phil Ottlinger 
Authored: Sun May 1 07:36:47 2016 +0200
Committer: Phil Ottlinger 
Committed: Sun May 1 07:36:47 2016 +0200

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/c16b0d53/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 9f57e3f..ee182c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -204,7 +204,7 @@ under the License.
 pottlinger
 Phil Ottlinger
 
-PMC
+Committer
 
 pottlin...@apache.org
 +1



incubator-tamaya git commit: Adding my public SSH key.

2016-04-30 Thread pottlinger
Repository: incubator-tamaya
Updated Branches:
  refs/heads/master e9e22b157 -> 02b3306ac


Adding my public SSH key.


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

Branch: refs/heads/master
Commit: 02b3306acc47a018ff785110b9cfe2af357729a8
Parents: e9e22b1
Author: Phil Ottlinger 
Authored: Sat Apr 30 23:52:19 2016 +0200
Committer: Phil Ottlinger 
Committed: Sat Apr 30 23:52:19 2016 +0200

--
 keys/KEYS | 53 +
 1 file changed, 53 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/02b3306a/keys/KEYS
--
diff --git a/keys/KEYS b/keys/KEYS
index 3a79343..990a48e 100644
--- a/keys/KEYS
+++ b/keys/KEYS
@@ -1,3 +1,56 @@
+Phil Ottlinger 
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v1
+
+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
+10IWlWN36jY=
+=3H1f
+-END PGP PUBLIC KEY BLOCK-
 John D. Ament 
 -BEGIN PGP PUBLIC KEY BLOCK-
 Comment: GPGTools - https://gpgtools.org



Jenkins build is back to normal : Tamaya-Master-branch #552

2016-04-30 Thread Apache Jenkins Server
See 



[2/2] incubator-tamaya git commit: TAMAYA-156: Bugfix: now honoring the enabled/disabled setting for usage reporting (added test as well).

2016-04-30 Thread anatole
TAMAYA-156: Bugfix: now honoring the enabled/disabled setting for usage 
reporting (added test as well).


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

Branch: refs/heads/master
Commit: e9a406b949321cb233ceb1dba6489f79472a830d
Parents: 9f07d41
Author: anatole 
Authored: Sat Apr 30 21:51:48 2016 +0200
Committer: anatole 
Committed: Sat Apr 30 21:51:48 2016 +0200

--
 .../java/org/apache/tamaya/model/internal/DefaultUsageTracker.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e9a406b9/modules/model/src/main/java/org/apache/tamaya/model/internal/DefaultUsageTracker.java
--
diff --git 
a/modules/model/src/main/java/org/apache/tamaya/model/internal/DefaultUsageTracker.java
 
b/modules/model/src/main/java/org/apache/tamaya/model/internal/DefaultUsageTracker.java
index 03b5bd5..9a502a4 100644
--- 
a/modules/model/src/main/java/org/apache/tamaya/model/internal/DefaultUsageTracker.java
+++ 
b/modules/model/src/main/java/org/apache/tamaya/model/internal/DefaultUsageTracker.java
@@ -107,7 +107,7 @@ public class DefaultUsageTracker implements UsageTrackerSpi{
 @Override
 public void trackSingleKeyAccess(String key, String value){
 // Ignore meta-entries
-if(key.startsWith("_")){
+if(!isUsageTrackingEnabled() || key.startsWith("_")){
 return;
 }
 Usage usage = this.usages.get(key);



[1/5] incubator-tamaya git commit: Fixed quality issues.

2016-04-30 Thread anatole
Repository: incubator-tamaya
Updated Branches:
  refs/heads/master 0b8627da4 -> 101023b2f


Fixed quality issues.


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

Branch: refs/heads/master
Commit: a7ee4e4e8559b8142a44a42e35ffa09aea9e3503
Parents: 0b8627d
Author: anatole 
Authored: Sat Apr 30 19:43:58 2016 +0200
Committer: anatole 
Committed: Sat Apr 30 19:43:58 2016 +0200

--
 .../java/org/apache/tamaya/core/internal/PropertyFiltering.java  | 4 ++--
 .../META-INF/services/org.apache.tamaya.spi.PropertySource   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/a7ee4e4e/code/core/src/main/java/org/apache/tamaya/core/internal/PropertyFiltering.java
--
diff --git 
a/code/core/src/main/java/org/apache/tamaya/core/internal/PropertyFiltering.java
 
b/code/core/src/main/java/org/apache/tamaya/core/internal/PropertyFiltering.java
index e16b056..1872be4 100644
--- 
a/code/core/src/main/java/org/apache/tamaya/core/internal/PropertyFiltering.java
+++ 
b/code/core/src/main/java/org/apache/tamaya/core/internal/PropertyFiltering.java
@@ -57,7 +57,7 @@ public final class PropertyFiltering{
 for (int i = 0; i < MAX_FILTER_LOOPS; i++) {
 boolean changed = false;
 // Apply filters to values, prevent values filtered to null!
-FilterContext filterContext = new FilterContext(key, configData, 
false);
+FilterContext filterContext = new FilterContext(key, configData, 
true);
 for (PropertyFilter filter : 
configurationContext.getPropertyFilters()) {
 String newValue = filter.filterProperty(result, filterContext);
 if (newValue != null && !newValue.equals(result)) {
@@ -96,7 +96,7 @@ public final class PropertyFiltering{
 for (int i = 0; i < MAX_FILTER_LOOPS; i++) {
 AtomicInteger changes = new AtomicInteger();
 for (Map.Entry entry : inputMap.entrySet()) {
-FilterContext filterContext = new 
FilterContext(entry.getKey(), inputMap, true);
+FilterContext filterContext = new 
FilterContext(entry.getKey(), inputMap, false);
 for (PropertyFilter filter : 
configurationContext.getPropertyFilters()) {
 final String k = entry.getKey();
 final String v = entry.getValue();

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/a7ee4e4e/code/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertySource
--
diff --git 
a/code/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertySource
 
b/code/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertySource
index 1b8f8c0..5bc940d 100644
--- 
a/code/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertySource
+++ 
b/code/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertySource
@@ -17,4 +17,5 @@
 # under the License.
 #
 org.apache.tamaya.core.propertysource.EnvironmentPropertySource
-org.apache.tamaya.core.propertysource.SystemPropertySource
\ No newline at end of file
+org.apache.tamaya.core.propertysource.SystemPropertySource
+org.apache.tamaya.core.propertysource.CLIPropertySource
\ No newline at end of file



[2/5] incubator-tamaya git commit: TAMAYA-156: Added stats function, TAMAYA-150: Refactored UI Widgets., TAMAYA-157: Added CLI main arg support.

2016-04-30 Thread anatole
TAMAYA-156: Added stats function, TAMAYA-150: Refactored UI Widgets., 
TAMAYA-157: Added CLI main arg 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/4749d395
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/4749d395
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/4749d395

Branch: refs/heads/master
Commit: 4749d3950983a78b0fd33459cf15cf339dc44f51
Parents: a7ee4e4
Author: anatole 
Authored: Sat Apr 30 19:57:52 2016 +0200
Committer: anatole 
Committed: Sat Apr 30 19:57:52 2016 +0200

--
 .../core/propertysource/CLIPropertySource.java  | 102 +++
 .../propertysource/CLIPropertySourceTest.java   |  58 
 .../java/org/apache/tamaya/model/Usage.java | 275 +++
 .../org/apache/tamaya/model/UsageReference.java |  45 +++
 .../model/internal/DefaultUsageTracker.java | 127 +
 .../model/internal/UsageTrackerFilter.java  |  45 +++
 .../tamaya/model/spi/UsageTrackerSpi.java   |  67 +
 .../org.apache.tamaya.model.spi.UsageTrackerSpi |  19 ++
 .../org.apache.tamaya.spi.PropertyFilter|  19 ++
 .../java/test/model/TestConfigAccessor.java |  27 ++
 .../mutableconfig/ui/ConfigEditorWidget.java| 110 
 .../mutableconfig/ui/ConfigUpdaterView.java |  33 +--
 .../tamaya/mutableconfig/ui/ProtocolWidget.java |  87 ++
 .../ui/TransactionControlWidget.java| 168 +++
 .../main/resources/ui/lang/tamaya.properties|  13 +-
 15 files changed, 1175 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/4749d395/code/core/src/main/java/org/apache/tamaya/core/propertysource/CLIPropertySource.java
--
diff --git 
a/code/core/src/main/java/org/apache/tamaya/core/propertysource/CLIPropertySource.java
 
b/code/core/src/main/java/org/apache/tamaya/core/propertysource/CLIPropertySource.java
new file mode 100644
index 000..ddc540e
--- /dev/null
+++ 
b/code/core/src/main/java/org/apache/tamaya/core/propertysource/CLIPropertySource.java
@@ -0,0 +1,102 @@
+/*
+ * 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.
+ */
+package org.apache.tamaya.core.propertysource;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * PropertySource that allows to add the programs main arguments as 
configuration entries. Unix syntax using '--' and
+ * '-' params is supported.
+ */
+public class CLIPropertySource extends BasePropertySource{
+
+/** The original main arguments. */
+private static String[] args = new String[0];
+
+/** The map of parsed main arguments. */
+private static Map mainArgs;
+
+/** Initializes the initial state. */
+static{
+initMainArgs(args);
+}
+
+
+/**
+ * Creates a new instance.
+ */
+public CLIPropertySource(){}
+
+/**
+ * Configure the main arguments, herby parsing and mapping the main 
arguments into
+ * configuration properties.
+ * @param args the main arguments, not null.
+ * @returns the parsed main arguments as key/value pairs.
+ */
+public static void initMainArgs(String... args){
+CLIPropertySource.args = Objects.requireNonNull(args);
+// TODO is there a way to figure out the args?
+String argsProp = System.getProperty("main.args");
+if(argsProp!=null){
+CLIPropertySource.args = argsProp.split("\\s");
+}
+Map result = null;
+if(CLIPropertySource.args==null){
+result = Collections.emptyMap();
+}else{
+result = new HashMap<>();
+String prefix = System.getProperty("main.args.prefix");
+if(prefix==null){
+prefix="";
+}
+String key = null;
+for(String arg:CLIPropertySource.args){
+

[4/5] incubator-tamaya git commit: Fixed quality issues.

2016-04-30 Thread anatole
Fixed quality issues.


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

Branch: refs/heads/master
Commit: e3ec30817b1d24a2861680f562a3c41fdb009d0a
Parents: cb199e2
Author: anatole 
Authored: Sat Apr 30 20:44:03 2016 +0200
Committer: anatole 
Committed: Sat Apr 30 20:44:03 2016 +0200

--
 .../main/java/org/apache/tamaya/filter/ConfigurationFilter.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e3ec3081/modules/filter/src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java
--
diff --git 
a/modules/filter/src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java
 
b/modules/filter/src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java
index b33ff27..c2739a1 100644
--- 
a/modules/filter/src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java
+++ 
b/modules/filter/src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java
@@ -107,7 +107,7 @@ public final class ConfigurationFilter implements 
PropertyFilter{
 
 @Override
 public String filterProperty(String valueToBeFiltered, FilterContext 
context) {
-if(!context.isSinglePropertyScoped()){
+if(context.isSinglePropertyScoped()){
 for(PropertyFilter pred: 
THREADED_SINGLE_FILTERS.get().getFilters()){
 valueToBeFiltered = pred.filterProperty(valueToBeFiltered, 
context);
 }



incubator-tamaya git commit: TAMAYA-156: Implemented usage tracking.

2016-04-30 Thread anatole
Repository: incubator-tamaya
Updated Branches:
  refs/heads/master 80aa20b6b -> 0b8627da4


TAMAYA-156: Implemented usage tracking.


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

Branch: refs/heads/master
Commit: 0b8627da4c914d386cc10499f04b2d01132d5459
Parents: 80aa20b
Author: anatole 
Authored: Sat Apr 30 18:40:29 2016 +0200
Committer: anatole 
Committed: Sat Apr 30 18:40:58 2016 +0200

--
 .../org/apache/tamaya/model/ConfigModel.java|  12 +-
 .../apache/tamaya/model/ConfigModelManager.java | 107 ++
 .../org/apache/tamaya/model/ModelTarget.java|  37 
 .../java/org/apache/tamaya/model/ModelType.java |  49 -
 .../org/apache/tamaya/model/Validation.java | 202 ++
 .../apache/tamaya/model/ValidationResult.java   | 182 ++---
 .../apache/tamaya/model/ValidationState.java|  59 --
 .../model/internal/ConfigDocumentationBean.java |  22 +-
 .../ConfiguredPropertiesModelProviderSpi.java   |   5 +-
 .../tamaya/model/spi/AbstractConfigModel.java   |  82 
 .../apache/tamaya/model/spi/AbstractModel.java  |  89 
 .../tamaya/model/spi/AreaConfigModel.java   | 204 ---
 .../model/spi/ConfigDocumentationMBean.java |   8 +-
 .../tamaya/model/spi/ConfigModelGroup.java  | 110 --
 .../tamaya/model/spi/ConfigModelReader.java |  61 +++---
 .../org/apache/tamaya/model/spi/GroupModel.java | 103 ++
 .../apache/tamaya/model/spi/ParameterModel.java |  32 +--
 .../apache/tamaya/model/spi/SectionModel.java   | 192 +
 .../tamaya/model/TestConfigModelProvider.java   |  38 +++-
 .../internal/ConfigDocumentationBeanTest.java   |  10 +-
 20 files changed, 798 insertions(+), 806 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/0b8627da/modules/model/src/main/java/org/apache/tamaya/model/ConfigModel.java
--
diff --git 
a/modules/model/src/main/java/org/apache/tamaya/model/ConfigModel.java 
b/modules/model/src/main/java/org/apache/tamaya/model/ConfigModel.java
index d03e691..77c3fb0 100644
--- a/modules/model/src/main/java/org/apache/tamaya/model/ConfigModel.java
+++ b/modules/model/src/main/java/org/apache/tamaya/model/ConfigModel.java
@@ -31,7 +31,7 @@ public interface ConfigModel {
  * Get the type of item that is modelled.
  * @return the modelled type, never null.
  */
-ModelType getType();
+ModelTarget getType();
 
 /**
  * Get the item's name, it should minimally describe the validation. 
Examples are:
@@ -53,12 +53,6 @@ public interface ConfigModel {
 boolean isRequired();
 
 /**
- * Get the provider of this validation.
- * @return the provider.
- */
-String getProvider();
-
-/**
  * Get an description of the item, using the default locale. The 
description is basically optional
  * though it is higly recommended to provide a description, so the 
validation issues is well
  * resolvable.
@@ -71,8 +65,8 @@ public interface ConfigModel {
  * Validates the item and all its children against the given configuration.
  *
  * @param config the configuration to be validated against, not null.
- * @return the validation results, never null.
+ * @return the validation result, or null, if not applicable.
  */
-Collection validate(Configuration config);
+Collection validate(Configuration config);
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/0b8627da/modules/model/src/main/java/org/apache/tamaya/model/ConfigModelManager.java
--
diff --git 
a/modules/model/src/main/java/org/apache/tamaya/model/ConfigModelManager.java 
b/modules/model/src/main/java/org/apache/tamaya/model/ConfigModelManager.java
index 03e6361..d0a5a01 100644
--- 
a/modules/model/src/main/java/org/apache/tamaya/model/ConfigModelManager.java
+++ 
b/modules/model/src/main/java/org/apache/tamaya/model/ConfigModelManager.java
@@ -22,20 +22,14 @@ import org.apache.tamaya.Configuration;
 import org.apache.tamaya.ConfigurationProvider;
 import org.apache.tamaya.model.spi.ConfigDocumentationMBean;
 import org.apache.tamaya.model.spi.ModelProviderSpi;
+import org.apache.tamaya.model.spi.UsageTrackerSpi;
 import org.apache.tamaya.spi.ServiceContextManager;
 
 import javax.management.InstanceNotFoundException;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 import java.lang.management.ManagementFactory;
-import 

Jenkins build is back to stable : Tamaya-Master-branch #550

2016-04-30 Thread Apache Jenkins Server
See 



incubator-tamaya git commit: TAMAYA-148 Removed existing tests, to be replaced by pax-exam. Added a karaf integration layer to generate an aggregate features.xml

2016-04-30 Thread johndament
Repository: incubator-tamaya
Updated Branches:
  refs/heads/master 4050e8176 -> 80aa20b6b


TAMAYA-148 Removed existing tests, to be replaced by pax-exam.  Added a karaf 
integration layer to generate an aggregate features.xml


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

Branch: refs/heads/master
Commit: 80aa20b6ba6f45e61f5acf0bbd807b13aca5e4fd
Parents: 4050e81
Author: John D. Ament 
Authored: Sat Apr 30 07:30:14 2016 -0400
Committer: John D. Ament 
Committed: Sat Apr 30 07:30:14 2016 -0400

--
 modules/classloader-support/pom.xml |   2 +-
 modules/injection-api/pom.xml   |   1 +
 modules/integration/camel/pom.xml   |   2 +-
 modules/integration/karaf/pom.xml   | 274 +++
 modules/integration/osgi/pom.xml|  69 +
 .../integration/osgi/OSGIConfigRootMapper.java  |   1 -
 .../osgi/OSGIEnhancedConfiguration.java |   3 -
 .../integration/osgi/TamayaConfigAdminImpl.java |  64 +++--
 .../osgi/TamayaConfigurationImpl.java   |   4 +-
 .../integration/osgi/test/HelloService.java |  35 ---
 .../osgi/test/TestConfigIntegration.java| 257 -
 modules/integration/pom.xml |   1 +
 12 files changed, 317 insertions(+), 396 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80aa20b6/modules/classloader-support/pom.xml
--
diff --git a/modules/classloader-support/pom.xml 
b/modules/classloader-support/pom.xml
index 1d27df4..adea1d3 100644
--- a/modules/classloader-support/pom.xml
+++ b/modules/classloader-support/pom.xml
@@ -1,4 +1,4 @@
-
+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;>
+
+tamaya-integration
+org.apache.tamaya.ext
+0.3-incubating-SNAPSHOT
+
+4.0.0
+Apache Tamaya Integration - Karaf Features
+tamaya-karaf
+
+
+org.apache.tamaya
+tamaya-api
+features
+xml
+${project.version}
+
+
+
+org.apache.tamaya
+tamaya-core
+features
+xml
+${project.version}
+
+
+
+org.apache.tamaya.ext
+tamaya-builder
+features
+xml
+${project.version}
+
+
+
+org.apache.tamaya.ext
+tamaya-classloader-support
+features
+xml
+${project.version}
+
+
+
+org.apache.tamaya.ext
+tamaya-collections
+features
+xml
+${project.version}
+
+
+
+org.apache.tamaya.ext
+tamaya-events
+features
+xml
+${project.version}
+
+
+
+org.apache.tamaya.ext
+tamaya-filter
+features
+xml
+${project.version}
+
+
+
+org.apache.tamaya.ext
+tamaya-formats
+features
+xml
+${project.version}
+
+
+
+org.apache.tamaya.ext
+tamaya-functions
+features
+xml
+${project.version}
+
+
+
+org.apache.tamaya.ext
+tamaya-injection
+features
+xml
+${project.version}
+
+
+
+org.apache.tamaya.ext
+tamaya-injection-api
+features
+xml
+${project.version}
+
+
+
+org.apache.tamaya.ext
+tamaya-json
+features
+xml
+${project.version}
+
+
+
+org.apache.tamaya.ext
+tamaya-management
+features
+xml
+${project.version}
+
+
+
+org.apache.tamaya.ext
+tamaya-model
+features
+xml
+${project.version}
+
+
+
+org.apache.tamaya.ext
+tamaya-mutable-config
+features
+xml
+${project.version}
+
+
+
+org.apache.tamaya.ext
+tamaya-optional
+features
+xml
+