incubator-tamaya-sandbox git commit: Change base version to 0.4

2017-09-18 Thread pottlinger 
Repository: incubator-tamaya-sandbox
Updated Branches:
  refs/heads/master 460ab2ebc -> 422132ba6


Change base version to 0.4


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

Branch: refs/heads/master
Commit: 422132ba6b0277f40c6f96046d33832619c31e16
Parents: 460ab2e
Author: Phil Ottlinger 
Authored: Mon Sep 18 23:04:20 2017 +0200
Committer: Phil Ottlinger 
Committed: Mon Sep 18 23:04:20 2017 +0200

--
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/422132ba/pom.xml
--
diff --git a/pom.xml b/pom.xml
index b6909f8..e464cd4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@ under the License.
 
 org.apache.tamaya.ext
 tamaya-sandbox
-0.3-incubating-SNAPSHOT
+0.4-incubating-SNAPSHOT
 pom
 
 Apache Tamaya Sandbox
@@ -40,7 +40,7 @@ under the License.
 
 
 
-4.0-incubating-SNAPSHOT
+0.4-incubating-SNAPSHOT
 2.5
 false
 1.7

incubator-tamaya-sandbox git commit: Trying to fix the build.

2017-09-18 Thread pottlinger 
Repository: incubator-tamaya-sandbox
Updated Branches:
  refs/heads/master c66f02a81 -> 460ab2ebc


Trying to fix the build.


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

Branch: refs/heads/master
Commit: 460ab2ebcd63739916b96b0404c7c22b16f69c0f
Parents: c66f02a
Author: Phil Ottlinger 
Authored: Mon Sep 18 22:58:22 2017 +0200
Committer: Phil Ottlinger 
Committed: Mon Sep 18 22:58:22 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/460ab2eb/hazelcast/pom.xml
--
diff --git a/hazelcast/pom.xml b/hazelcast/pom.xml
index 7f594cd..1052787 100644
--- a/hazelcast/pom.xml
+++ b/hazelcast/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.tamaya.ext
 tamaya-sandbox
-0.3-incubating-SNAPSHOT
+0.4-incubating-SNAPSHOT
 ..

[2/2] incubator-tamaya-sandbox git commit: TAMAYA-274: Implemented OSGI integration, tested in Karaf (using Karaf shell custom commands).

2017-09-18 Thread anatole 
TAMAYA-274: Implemented OSGI integration, tested in Karaf (using Karaf shell 
custom commands).


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

Branch: refs/heads/java8
Commit: 920538603ef43802b16f60eb8ef41b55b96e6c15
Parents: c345b5c
Author: anatole 
Authored: Mon Sep 18 17:15:43 2017 +0200
Committer: anatole 
Committed: Mon Sep 18 17:15:43 2017 +0200

--
 osgi/common/bnd.bnd |   7 +-
 osgi/common/pom.xml |   6 +-
 .../java/org/apache/tamaya/osgi/Activator.java  |  49 +--
 .../tamaya/osgi/DefaultOSGIConfigMapper.java|  45 +++
 .../apache/tamaya/osgi/OSGIConfigMapper.java|  38 +++
 .../tamaya/osgi/OSGIConfigRootMapper.java   |  36 ---
 .../tamaya/osgi/TamayaConfigAdminImpl.java  | 170 ---
 .../apache/tamaya/osgi/TamayaConfigPlugin.java  | 295 +++
 .../tamaya/osgi/TamayaOSGIConfiguration.java| 139 -
 .../apache/tamaya/osgi/attic/ConfigPrinter.java | 115 
 .../tamaya/osgi/attic/ConfigPrinterService.java |  28 ++
 .../osgi/attic/TamayaConfigAdminImpl.java   | 167 +++
 .../osgi/attic/TamayaOSGIConfiguration.java | 139 +
 .../tamaya/osgi/TamayaConfigAdminImplTest.java  |  75 -
 osgi/karaf-features/pom.xml |  60 +---
 osgi/karaf-shell/bnd.bnd|  37 +++
 osgi/karaf-shell/pom.xml|  71 +
 .../tamaya/karaf/shell/ConfigCommand.java   |  50 
 .../karaf/shell/DefaultDisableCommand.java  |  68 +
 .../karaf/shell/EvaluateCMConfigCommand.java|  63 
 .../tamaya/karaf/shell/GetPolicyCommand.java|  42 +++
 .../apache/tamaya/karaf/shell/InfoCommand.java  |  46 +++
 .../tamaya/karaf/shell/PropertyCommand.java |  75 +
 .../karaf/shell/PropertySourceCommand.java  |  59 
 .../karaf/shell/PropertySourcesCommand.java |  48 +++
 .../tamaya/karaf/shell/SetPolicyCommand.java|  68 +
 .../org/apache/tamaya/karaf/shell/commands  |  27 ++
 osgi/pom.xml| 115 +---
 28 files changed, 1538 insertions(+), 600 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/92053860/osgi/common/bnd.bnd
--
diff --git a/osgi/common/bnd.bnd b/osgi/common/bnd.bnd
index 56e697f..22c802c 100644
--- a/osgi/common/bnd.bnd
+++ b/osgi/common/bnd.bnd
@@ -10,9 +10,9 @@ javac.source: 1.8
 javac.target: 1.8
 
 Bundle-Version: ${version}.${tstamp}
-Bundle-Name: Apache Tamaya - OSGI ConfigAdmin
+Bundle-Name: Apache Tamaya - OSGI ConfigurationPlugin
 Bundle-SymbolicName: org.apache.tamaya.osgi
-Bundle-Description: Apacha Tamaya Configuration - OSGI ConfigAdmin
+Bundle-Description: Apacha Tamaya Configuration - OSGI ConfigurationPlugin
 Bundle-Category: Implementation
 Bundle-Copyright: (C) Apache Foundation
 Bundle-License: Apache Licence version 2
@@ -29,4 +29,5 @@ Import-Package: \
 org.apache.tamaya.spi,\
 org.apache.tamaya.functions,\
 org.apache.tamaya.spisupport
-Export-Service:   org.osgi.service.cm.ConfigurationAdmin
+Export-Service:   org.osgi.service.cm.ConfigurationPlugin,\
+org.apache.tamaya.osgi.TamayaConfigPlugin

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/92053860/osgi/common/pom.xml
--
diff --git a/osgi/common/pom.xml b/osgi/common/pom.xml
index e0a5411..9455104 100644
--- a/osgi/common/pom.xml
+++ b/osgi/common/pom.xml
@@ -29,14 +29,14 @@
 
 tamaya-osgi_alpha
 jar
-Apache Tamaya :: OSGi Integration :: ConfigAdmin
-Tamaya Based OSGI Implementation of ConfigAdmin and Config 
Injection
+Apache Tamaya :: OSGi Integration :: ConfigurationPlugin
+Tamaya Based OSGI ConfigurationPlugin 
Implementation
 
 
 
 org.osgi
 org.osgi.core
-test
+provided
 
 
 org.osgi

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/92053860/osgi/common/src/main/java/org/apache/tamaya/osgi/Activator.java
--
diff --git a/osgi/common/src/main/java/org/apache/tamaya/osgi/Activator.java 
b/osgi/common/src/main/java/org/apache/tamaya/osgi/Activator.java
index 83e1acf..d6c5726 100644
--- a/osgi/common/src/main/java/org/apache/tamaya/osgi/Activator.java
+++

[1/2] incubator-tamaya-sandbox git commit: TAMAYA-274: Implemented OSGI integration, tested in Karaf (using Karaf shell custom commands).

2017-09-18 Thread anatole 
Repository: incubator-tamaya-sandbox
Updated Branches:
  refs/heads/java8 c345b5c2c -> 920538603


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/92053860/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PropertySourceCommand.java
--
diff --git 
a/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PropertySourceCommand.java
 
b/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PropertySourceCommand.java
new file mode 100644
index 000..fc42c54
--- /dev/null
+++ 
b/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PropertySourceCommand.java
@@ -0,0 +1,59 @@
+/*
+ * 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.karaf.shell;
+
+import org.apache.karaf.shell.api.action.Action;
+import org.apache.karaf.shell.api.action.Argument;
+import org.apache.karaf.shell.api.action.Command;
+import org.apache.karaf.shell.api.action.lifecycle.Service;
+import org.apache.tamaya.Configuration;
+import org.apache.tamaya.ConfigurationProvider;
+import org.apache.tamaya.spi.PropertySource;
+import org.apache.tamaya.spi.PropertyValue;
+
+import java.io.IOException;
+
+@Command(scope = "tamaya", name = "propertysource", description="Show the 
current Tamaya entries of a propertysource.")
+@Service
+public class PropertySourceCommand implements Action{
+
+@Argument(index = 0, name = "propertysource", description = "The target 
property source id.",
+required = false, multiValued = false)
+String propertysource = null;
+
+public Object execute() throws IOException {
+Configuration config = ConfigurationProvider.getConfiguration();
+if(propertysource!=null){
+PropertySource ps = 
config.getContext().getPropertySource(propertysource);
+if(ps==null){
+System.out.println("No such propertysource: " + 
propertysource);
+}else {
+System.out.println("ID: " + ps.getName());
+System.out.println("Ordinal: " + ps.getOrdinal());
+System.out.println("Class: " + ps.getClass().getName());
+System.out.println("Properties:");
+for(PropertyValue pv:ps.getProperties().values()) {
+System.out.println(pv);
+}
+}
+}
+return null;
+}
+
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/92053860/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PropertySourcesCommand.java
--
diff --git 
a/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PropertySourcesCommand.java
 
b/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PropertySourcesCommand.java
new file mode 100644
index 000..74c5985
--- /dev/null
+++ 
b/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PropertySourcesCommand.java
@@ -0,0 +1,48 @@
+/*
+ * 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.karaf.shell;
+
+import org.apache.karaf.shell.api.action.Action;
+import org.apache.karaf.shell.api.action.Argument;
+import org.apache.karaf.shell.api.action.Command;
+import org.apache.karaf.shell.api.action.lifecycle.Service;
+import org.apache.tamaya.Configuration;
+import