You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by pl...@apache.org on 2015/03/30 23:39:27 UTC
[2/2] incubator-tamaya git commit: Sandbox modules: Let it compile
again.
Sandbox modules: Let it compile again.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/80c14b6f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/80c14b6f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/80c14b6f
Branch: refs/heads/master
Commit: 80c14b6f42834f26359ebfee748d3589bc394cf3
Parents: 84ed643
Author: Oliver B. Fischer <pl...@apache.org>
Authored: Mon Mar 30 23:39:05 2015 +0200
Committer: Oliver B. Fischer <pl...@apache.org>
Committed: Mon Mar 30 23:39:05 2015 +0200
----------------------------------------------------------------------
sandbox/integration/cdi/pom.xml | 9 ++++-----
.../commons/IniConfigurationFormat.java | 19 +++++++++++++++++--
sandbox/integration/pom.xml | 6 +++---
sandbox/management/pom.xml | 3 ++-
sandbox/pom.xml | 2 +-
5 files changed, 27 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c14b6f/sandbox/integration/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/integration/cdi/pom.xml b/sandbox/integration/cdi/pom.xml
index 1909bcc..f97333f 100644
--- a/sandbox/integration/cdi/pom.xml
+++ b/sandbox/integration/cdi/pom.xml
@@ -21,14 +21,13 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.tamaya.integration</groupId>
- <artifactId>tamaya-integration-all</artifactId>
- <version>0.1-SNAPSHOT</version>
- <relativePath>..</relativePath>
+ <groupId>org.apache.tamaya.ext.integration</groupId>
+ <artifactId>tamaya-integrations</artifactId>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
+
<artifactId>tamaya-cdi</artifactId>
<name>Apache Tamaya Modules Integration - CDI</name>
- <packaging>jar</packaging>
<properties>
<owb.version>1.5.0-SNAPSHOT</owb.version>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c14b6f/sandbox/integration/commons/src/main/java/org/apache/tamaya/integration/commons/IniConfigurationFormat.java
----------------------------------------------------------------------
diff --git a/sandbox/integration/commons/src/main/java/org/apache/tamaya/integration/commons/IniConfigurationFormat.java b/sandbox/integration/commons/src/main/java/org/apache/tamaya/integration/commons/IniConfigurationFormat.java
index 2f80977..0e21f4f 100644
--- a/sandbox/integration/commons/src/main/java/org/apache/tamaya/integration/commons/IniConfigurationFormat.java
+++ b/sandbox/integration/commons/src/main/java/org/apache/tamaya/integration/commons/IniConfigurationFormat.java
@@ -26,6 +26,7 @@ import org.apache.tamaya.format.ConfigurationData;
import org.apache.tamaya.format.ConfigurationDataBuilder;
import org.apache.tamaya.format.ConfigurationFormat;
+import java.io.InputStream;
import java.net.URL;
import java.util.HashMap;
import java.util.Iterator;
@@ -37,9 +38,8 @@ import java.util.Map;
*/
public class IniConfigurationFormat implements ConfigurationFormat {
- @Override
public ConfigurationData readConfiguration(URL url) {
- ConfigurationDataBuilder builder = ConfigurationDataBuilder.of(url, this);
+ ConfigurationDataBuilder builder = ConfigurationDataBuilder.of(url.toString(), this);
try {
HierarchicalINIConfiguration commonIniConfiguration = new HierarchicalINIConfiguration(url);
for(String section:commonIniConfiguration.getSections()){
@@ -57,4 +57,19 @@ public class IniConfigurationFormat implements ConfigurationFormat {
}
return builder.build();
}
+
+ @Override
+ public String getName() {
+ throw new RuntimeException("Not implemented yet!");
+ }
+
+ @Override
+ public boolean accepts(URL url) {
+ throw new RuntimeException("Not implemented yet!");
+ }
+
+ @Override
+ public ConfigurationData readConfiguration(String resource, InputStream inputStream) {
+ throw new RuntimeException("Not implemented yet!");
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c14b6f/sandbox/integration/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/integration/pom.xml b/sandbox/integration/pom.xml
index 145988d..c239396 100644
--- a/sandbox/integration/pom.xml
+++ b/sandbox/integration/pom.xml
@@ -20,12 +20,13 @@ 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">
+
<parent>
- <artifactId>tamaya-sandbox</artifactId>
<groupId>org.apache.tamaya.ext</groupId>
+ <artifactId>tamaya-sandbox</artifactId>
<version>0.1-incubating-SNAPSHOT</version>
- <relativePath>..</relativePath>
</parent>
+
<packaging>pom</packaging>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tamaya.ext.integration</groupId>
@@ -33,7 +34,6 @@ under the License.
<modules>
<module>cdi</module>
- <module>se</module>
<module>commons</module>
</modules>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c14b6f/sandbox/management/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/management/pom.xml b/sandbox/management/pom.xml
index 1c18af0..bdab1d7 100644
--- a/sandbox/management/pom.xml
+++ b/sandbox/management/pom.xml
@@ -26,13 +26,14 @@ under the License.
<version>0.1-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
+
<artifactId>tamaya-management</artifactId>
<name>Apache Tamaya Modules Integration - Java Management Extensions</name>
<packaging>jar</packaging>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-core</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c14b6f/sandbox/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/pom.xml b/sandbox/pom.xml
index 3e6baf9..3d39b16 100644
--- a/sandbox/pom.xml
+++ b/sandbox/pom.xml
@@ -24,11 +24,11 @@ under the License.
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-all</artifactId>
<version>0.1-incubating-SNAPSHOT</version>
- <relativePath>..</relativePath>
</parent>
<artifactId>tamaya-sandbox</artifactId>
<groupId>org.apache.tamaya.ext</groupId>
+
<name>Apache Tamaya Sandbox Modules</name>
<description>This project contains the several extensions that can be used with Tamaya, but are not (yet) ready for
a release.</description>