You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by an...@apache.org on 2015/11/27 10:14:20 UTC
[3/7] incubator-tamaya git commit: TAMAYA-129: OSGI Support,
loader bugfixes.
TAMAYA-129: OSGI Support, loader bugfixes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/8e2a5cb6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/8e2a5cb6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/8e2a5cb6
Branch: refs/heads/master
Commit: 8e2a5cb6e16fcac73b47647800ba41f1f8583871
Parents: 0fc8cc5
Author: anatole <an...@apache.org>
Authored: Thu Nov 26 22:47:05 2015 +0100
Committer: anatole <an...@apache.org>
Committed: Thu Nov 26 22:47:05 2015 +0100
----------------------------------------------------------------------
.../org/apache/tamaya/spi/ServiceContextManager.java | 11 ++++++++++-
core/pom.xml | 5 +++++
.../apache/tamaya/core/internal/OSGIServiceLoader.java | 1 +
.../tamaya/core/provider/JavaConfigurationProvider.java | 11 +++++++----
4 files changed, 23 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/8e2a5cb6/api/src/main/java/org/apache/tamaya/spi/ServiceContextManager.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/spi/ServiceContextManager.java b/api/src/main/java/org/apache/tamaya/spi/ServiceContextManager.java
index 64bb9ed..259493c 100644
--- a/api/src/main/java/org/apache/tamaya/spi/ServiceContextManager.java
+++ b/api/src/main/java/org/apache/tamaya/spi/ServiceContextManager.java
@@ -65,7 +65,16 @@ public final class ServiceContextManager {
} catch (Exception e) {
throw new ConfigException("ServiceContext not loadable", e);
}
-
+// if (highestServiceContext==null){
+// String serviceContext = System.getProperty(ServiceContext.class.getName());
+// if(serviceContext != null){
+// try{
+// highestServiceContext = (ServiceContext)Class.forName(serviceContext).newInstance();
+// } catch (Exception e) {
+// throw new ConfigException("Configured ServiceContext not loadable: " + serviceContext, e);
+// }
+// }
+// }
if (highestServiceContext==null){
throw new ConfigException("No ServiceContext found");
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/8e2a5cb6/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 6ec07c4..5c8d85a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -86,6 +86,11 @@ under the License.
org.apache.tamaya.core.internal,
org.apache.tamaya.core.internal.converters
</Private-Package>
+ <Export-Package>
+ org.apache.tamaya.core,
+ org.apache.tamaya.core.propertysource,
+ org.apache.tamaya.core.provider
+ </Export-Package>
<Bundle-Activator>
org.apache.tamaya.core.internal.OSGIActivator
</Bundle-Activator>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/8e2a5cb6/core/src/main/java/org/apache/tamaya/core/internal/OSGIServiceLoader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/OSGIServiceLoader.java b/core/src/main/java/org/apache/tamaya/core/internal/OSGIServiceLoader.java
index d2a11e2..dcc702f 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/OSGIServiceLoader.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/OSGIServiceLoader.java
@@ -146,6 +146,7 @@ public class OSGIServiceLoader implements BundleListener {
return serviceInstance;
}
catch (Exception ex) {
+ ex.printStackTrace();
throw new IllegalStateException("Cannot instanciate service", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/8e2a5cb6/core/src/main/java/org/apache/tamaya/core/provider/JavaConfigurationProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/provider/JavaConfigurationProvider.java b/core/src/main/java/org/apache/tamaya/core/provider/JavaConfigurationProvider.java
index bc6a4ec..9c04926 100644
--- a/core/src/main/java/org/apache/tamaya/core/provider/JavaConfigurationProvider.java
+++ b/core/src/main/java/org/apache/tamaya/core/provider/JavaConfigurationProvider.java
@@ -42,10 +42,13 @@ public class JavaConfigurationProvider implements PropertySourceProvider {
public Collection<PropertySource> getPropertySources() {
List<PropertySource> propertySources = new ArrayList<>();
try {
- Enumeration<URL> urls = Thread.currentThread().getContextClassLoader()
- .getResources(DEFAULT_PROPERTIES_FILE_NAME);
- while (urls.hasMoreElements()) {
- propertySources.add(new SimplePropertySource(urls.nextElement()));
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ if(cl!=null) {
+ Enumeration<URL> urls = Thread.currentThread().getContextClassLoader()
+ .getResources(DEFAULT_PROPERTIES_FILE_NAME);
+ while (urls.hasMoreElements()) {
+ propertySources.add(new SimplePropertySource(urls.nextElement()));
+ }
}
} catch (IOException e) {