You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by st...@apache.org on 2017/10/28 10:24:08 UTC
svn commit: r1813599 - in /geronimo/components/config/branches/ConfigJSR: ./
impl/ impl/src/main/java/org/apache/geronimo/config/
impl/src/main/java/org/apache/geronimo/config/cdi/
impl/src/main/java/org/apache/geronimo/config/configsource/ impl/src/ma...
Author: struberg
Date: Sat Oct 28 10:24:07 2017
New Revision: 1813599
URL: http://svn.apache.org/viewvc?rev=1813599&view=rev
Log:
GERONIMO-6593 implement javax.config features
Modified:
geronimo/components/config/branches/ConfigJSR/README.adoc
geronimo/components/config/branches/ConfigJSR/impl/ci-suite.xml
geronimo/components/config/branches/ConfigJSR/impl/debug-suite.xml
geronimo/components/config/branches/ConfigJSR/impl/pom.xml
geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/ConfigImpl.java
geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/ConfigValueImpl.java
geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/DefaultConfigBuilder.java
geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/DefaultConfigProvider.java
geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/cdi/ConfigExtension.java
geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/cdi/ConfigInjectionBean.java
geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/cdi/ConfigInjectionProducer.java
geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/cdi/ConfigSupplier.java
geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/configsource/BaseConfigSource.java
geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/configsource/PropertyFileConfigSourceProvider.java
geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/configsource/SystemEnvConfigSource.java
geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/configsource/SystemPropertyConfigSource.java
geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/BooleanConverter.java
geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/DoubleConverter.java
geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/DurationConverter.java
geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/FloatConverter.java
geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/InstantConverter.java
geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/IntegerConverter.java
geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/LocalDateConverter.java
geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/LocalDateTimeConverter.java
geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/LocalTimeConverter.java
geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/LongConverter.java
geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/OffsetDateTimeConverter.java
geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/OffsetTimeConverter.java
geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/StringConverter.java
geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/URLConverter.java
geronimo/components/config/branches/ConfigJSR/impl/src/test/java/org/apache/geronimo/config/test/GeronimoConfigArchiveProcessor.java
geronimo/components/config/branches/ConfigJSR/impl/src/test/java/org/apache/geronimo/config/test/internal/ProviderTest.java
geronimo/components/config/branches/ConfigJSR/impl/src/test/java/org/apache/geronimo/config/test/internal/SupplierTest.java
geronimo/components/config/branches/ConfigJSR/impl/tck-suite.xml
geronimo/components/config/branches/ConfigJSR/pom.xml
Modified: geronimo/components/config/branches/ConfigJSR/README.adoc
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/README.adoc?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/README.adoc (original)
+++ geronimo/components/config/branches/ConfigJSR/README.adoc Sat Oct 28 10:24:07 2017
@@ -19,7 +19,7 @@
## Status
-Implementation of the MicroProfile Config Specification.
+Implementation of the JSR-382, Configuration API for Java, v1.0 Specification.
== Rationale
@@ -37,6 +37,9 @@ In 2010 it got moved over to the Apache
In 2011 we further enhanced it while moving CODI to the Apache DeltaSpike project.
Romain Manni-Bucau (Apache/Tomitribe), Ron Smeral (JBoss) and Anatole Tresch also gave appreciated input in the last years.
+This work did lead to the MicroProfile Config specification.
+Which in turn was used as baseline for JSR-382.
+
== How it works
A 'Configuration' consists of the information collected from the registered `ConfigSource` s.
@@ -47,9 +50,9 @@ By default there are 3 default ConfigSou
* `System.getenv()` (ordinal=400)
* `System.getProperties()` (ordinal=300)
-* all `META-INF/microprofile-config.properties` files on the ClassPath. (ordinal=100, separately configurable via a config_ordinal property inside each file)
+* all `META-INF/javaconfig.properties` files on the ClassPath. (ordinal=100, separately configurable via a config_ordinal property inside each file)
-That means that I can put my default configuration in a `META-INF/microprofile-config.properties` anywhere on the classpath.
+That means that I can put my default configuration in a `META-INF/javaconfig.properties` anywhere on the classpath.
And I can later simply e.g set a system property to change this default configuration.
== Custom ConfigSources
@@ -77,7 +80,7 @@ To add Geronimo Config to your project,
<dependency>
<groupId>org.apache.geronimo.config</groupId>
<artifactId>geronimo-config-impl</artifactId>
- <version>1.0</version>
+ <version>2.0</version>
</dependency>
----
@@ -93,9 +96,9 @@ The API is also available as Maven Artif
[source,xml]
----
<dependency>
- <groupId>org.eclipse.microprofile.config</groupId>
- <artifactId>microprofile-config-api</artifactId>
- <version>1.1</version>
+ <groupId>javax.config</groupId>
+ <artifactId>javaconfig-api</artifactId>
+ <version>1.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
----
Modified: geronimo/components/config/branches/ConfigJSR/impl/ci-suite.xml
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/impl/ci-suite.xml?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/impl/ci-suite.xml (original)
+++ geronimo/components/config/branches/ConfigJSR/impl/ci-suite.xml Sat Oct 28 10:24:07 2017
@@ -17,9 +17,9 @@
-->
<suite name="microprofileconfig-TCK" verbose="2" configfailurepolicy="continue" >
- <test name="Microprofile-config 1_0 TCK">
+ <test name="javaconfig 1_0 TCK">
<packages>
- <package name="org.eclipse.microprofile.config.tck.*">
+ <package name="org.eclipse.javaconfig.tck.*">
</package>
</packages>
Modified: geronimo/components/config/branches/ConfigJSR/impl/debug-suite.xml
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/impl/debug-suite.xml?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/impl/debug-suite.xml (original)
+++ geronimo/components/config/branches/ConfigJSR/impl/debug-suite.xml Sat Oct 28 10:24:07 2017
@@ -23,8 +23,7 @@
<classes>
<!-- Issues in the spec -->
- <!-- CDI-437 -->
- <class name="org.eclipse.microprofile.config.tck.CDIPlainInjectionTest">
+ <class name="org.eclipse.javaconfig.tck.CDIPlainInjectionTest">
<methods>
<include name=".*"/>
</methods>
Modified: geronimo/components/config/branches/ConfigJSR/impl/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/impl/pom.xml?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/impl/pom.xml (original)
+++ geronimo/components/config/branches/ConfigJSR/impl/pom.xml Sat Oct 28 10:24:07 2017
@@ -43,15 +43,15 @@
<dependencies>
<dependency>
- <groupId>org.eclipse.microprofile.config</groupId>
- <artifactId>microprofile-config-api</artifactId>
- <version>${microprofile-config.version}</version>
+ <groupId>javax.config</groupId>
+ <artifactId>javaconfig-api</artifactId>
+ <version>${javaconfig.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.microprofile.config</groupId>
- <artifactId>microprofile-config-tck</artifactId>
- <version>${microprofile-config.version}</version>
+ <groupId>javax.config</groupId>
+ <artifactId>javaconfig-tck</artifactId>
+ <version>${javaconfig.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/ConfigImpl.java
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/ConfigImpl.java?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/ConfigImpl.java (original)
+++ geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/ConfigImpl.java Sat Oct 28 10:24:07 2017
@@ -51,9 +51,9 @@ import org.apache.geronimo.config.conver
import org.apache.geronimo.config.converters.OffsetTimeConverter;
import org.apache.geronimo.config.converters.StringConverter;
import org.apache.geronimo.config.converters.URLConverter;
-import org.eclipse.microprofile.config.Config;
-import org.eclipse.microprofile.config.spi.ConfigSource;
-import org.eclipse.microprofile.config.spi.Converter;
+import javax.config.Config;
+import javax.config.spi.ConfigSource;
+import javax.config.spi.Converter;
import javax.annotation.Priority;
import javax.enterprise.inject.Typed;
Modified: geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/ConfigValueImpl.java
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/ConfigValueImpl.java?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/ConfigValueImpl.java (original)
+++ geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/ConfigValueImpl.java Sat Oct 28 10:24:07 2017
@@ -16,7 +16,7 @@
*/
package org.apache.geronimo.config;
-import org.eclipse.microprofile.config.spi.Converter;
+import javax.config.spi.Converter;
import java.util.ArrayList;
import java.util.List;
Modified: geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/DefaultConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/DefaultConfigBuilder.java?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/DefaultConfigBuilder.java (original)
+++ geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/DefaultConfigBuilder.java Sat Oct 28 10:24:07 2017
@@ -16,11 +16,11 @@
*/
package org.apache.geronimo.config;
-import org.eclipse.microprofile.config.Config;
-import org.eclipse.microprofile.config.spi.ConfigBuilder;
-import org.eclipse.microprofile.config.spi.ConfigSource;
-import org.eclipse.microprofile.config.spi.ConfigSourceProvider;
-import org.eclipse.microprofile.config.spi.Converter;
+import javax.config.Config;
+import javax.config.spi.ConfigBuilder;
+import javax.config.spi.ConfigSource;
+import javax.config.spi.ConfigSourceProvider;
+import javax.config.spi.Converter;
import org.apache.geronimo.config.configsource.PropertyFileConfigSourceProvider;
import org.apache.geronimo.config.configsource.SystemEnvConfigSource;
import org.apache.geronimo.config.configsource.SystemPropertyConfigSource;
@@ -132,7 +132,7 @@ public class DefaultConfigBuilder implem
configSources.add(new SystemEnvConfigSource());
configSources.add(new SystemPropertyConfigSource());
- configSources.addAll(new PropertyFileConfigSourceProvider("/META-INF/microprofile-config.properties", true, forClassLoader).getConfigSources(forClassLoader));
+ configSources.addAll(new PropertyFileConfigSourceProvider("/META-INF/javaconfig.properties", true, forClassLoader).getConfigSources(forClassLoader));
return configSources;
}
Modified: geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/DefaultConfigProvider.java
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/DefaultConfigProvider.java?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/DefaultConfigProvider.java (original)
+++ geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/DefaultConfigProvider.java Sat Oct 28 10:24:07 2017
@@ -25,9 +25,9 @@ import java.util.WeakHashMap;
import javax.enterprise.inject.Typed;
import javax.enterprise.inject.Vetoed;
-import org.eclipse.microprofile.config.Config;
-import org.eclipse.microprofile.config.spi.ConfigBuilder;
-import org.eclipse.microprofile.config.spi.ConfigProviderResolver;
+import javax.config.Config;
+import javax.config.spi.ConfigBuilder;
+import javax.config.spi.ConfigProviderResolver;
/**
Modified: geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/cdi/ConfigExtension.java
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/cdi/ConfigExtension.java?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/cdi/ConfigExtension.java (original)
+++ geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/cdi/ConfigExtension.java Sat Oct 28 10:24:07 2017
@@ -17,9 +17,9 @@
package org.apache.geronimo.config.cdi;
import org.apache.geronimo.config.DefaultConfigProvider;
-import org.eclipse.microprofile.config.Config;
-import org.eclipse.microprofile.config.ConfigProvider;
-import org.eclipse.microprofile.config.inject.ConfigProperty;
+import javax.config.Config;
+import javax.config.ConfigProvider;
+import javax.config.inject.ConfigProperty;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
Modified: geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/cdi/ConfigInjectionBean.java
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/cdi/ConfigInjectionBean.java?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/cdi/ConfigInjectionBean.java (original)
+++ geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/cdi/ConfigInjectionBean.java Sat Oct 28 10:24:07 2017
@@ -17,9 +17,9 @@
package org.apache.geronimo.config.cdi;
import org.apache.geronimo.config.ConfigImpl;
-import org.eclipse.microprofile.config.Config;
-import org.eclipse.microprofile.config.ConfigProvider;
-import org.eclipse.microprofile.config.inject.ConfigProperty;
+import javax.config.Config;
+import javax.config.ConfigProvider;
+import javax.config.inject.ConfigProperty;
import javax.enterprise.context.Dependent;
import javax.enterprise.context.spi.CreationalContext;
Modified: geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/cdi/ConfigInjectionProducer.java
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/cdi/ConfigInjectionProducer.java?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/cdi/ConfigInjectionProducer.java (original)
+++ geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/cdi/ConfigInjectionProducer.java Sat Oct 28 10:24:07 2017
@@ -21,8 +21,8 @@ import javax.annotation.PostConstruct;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Produces;
-import org.eclipse.microprofile.config.Config;
-import org.eclipse.microprofile.config.ConfigProvider;
+import javax.config.Config;
+import javax.config.ConfigProvider;
/**
* @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
Modified: geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/cdi/ConfigSupplier.java
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/cdi/ConfigSupplier.java?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/cdi/ConfigSupplier.java (original)
+++ geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/cdi/ConfigSupplier.java Sat Oct 28 10:24:07 2017
@@ -19,7 +19,7 @@
package org.apache.geronimo.config.cdi;
import org.apache.geronimo.config.ConfigImpl;
-import org.eclipse.microprofile.config.inject.ConfigProperty;
+import javax.config.inject.ConfigProperty;
import java.util.function.Supplier;
Modified: geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/configsource/BaseConfigSource.java
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/configsource/BaseConfigSource.java?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/configsource/BaseConfigSource.java (original)
+++ geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/configsource/BaseConfigSource.java Sat Oct 28 10:24:07 2017
@@ -21,7 +21,7 @@ package org.apache.geronimo.config.confi
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.eclipse.microprofile.config.spi.ConfigSource;
+import javax.config.spi.ConfigSource;
/**
Modified: geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/configsource/PropertyFileConfigSourceProvider.java
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/configsource/PropertyFileConfigSourceProvider.java?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/configsource/PropertyFileConfigSourceProvider.java (original)
+++ geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/configsource/PropertyFileConfigSourceProvider.java Sat Oct 28 10:24:07 2017
@@ -29,8 +29,8 @@ import java.util.logging.Logger;
import javax.enterprise.inject.Typed;
import javax.enterprise.inject.Vetoed;
-import org.eclipse.microprofile.config.spi.ConfigSource;
-import org.eclipse.microprofile.config.spi.ConfigSourceProvider;
+import javax.config.spi.ConfigSource;
+import javax.config.spi.ConfigSourceProvider;
/**
Modified: geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/configsource/SystemEnvConfigSource.java
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/configsource/SystemEnvConfigSource.java?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/configsource/SystemEnvConfigSource.java (original)
+++ geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/configsource/SystemEnvConfigSource.java Sat Oct 28 10:24:07 2017
@@ -24,7 +24,7 @@ import java.util.Map;
import javax.enterprise.inject.Typed;
import javax.enterprise.inject.Vetoed;
-import org.eclipse.microprofile.config.spi.ConfigSource;
+import javax.config.spi.ConfigSource;
/**
* {@link ConfigSource} which uses {@link System#getenv()}
Modified: geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/configsource/SystemPropertyConfigSource.java
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/configsource/SystemPropertyConfigSource.java?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/configsource/SystemPropertyConfigSource.java (original)
+++ geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/configsource/SystemPropertyConfigSource.java Sat Oct 28 10:24:07 2017
@@ -18,7 +18,7 @@
*/
package org.apache.geronimo.config.configsource;
-import org.eclipse.microprofile.config.spi.ConfigSource;
+import javax.config.spi.ConfigSource;
import javax.enterprise.inject.Typed;
import javax.enterprise.inject.Vetoed;
Modified: geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/BooleanConverter.java
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/BooleanConverter.java?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/BooleanConverter.java (original)
+++ geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/BooleanConverter.java Sat Oct 28 10:24:07 2017
@@ -16,7 +16,7 @@
*/
package org.apache.geronimo.config.converters;
-import org.eclipse.microprofile.config.spi.Converter;
+import javax.config.spi.Converter;
import javax.annotation.Priority;
import javax.enterprise.inject.Vetoed;
Modified: geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/DoubleConverter.java
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/DoubleConverter.java?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/DoubleConverter.java (original)
+++ geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/DoubleConverter.java Sat Oct 28 10:24:07 2017
@@ -16,7 +16,7 @@
*/
package org.apache.geronimo.config.converters;
-import org.eclipse.microprofile.config.spi.Converter;
+import javax.config.spi.Converter;
import javax.annotation.Priority;
import javax.enterprise.inject.Vetoed;
Modified: geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/DurationConverter.java
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/DurationConverter.java?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/DurationConverter.java (original)
+++ geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/DurationConverter.java Sat Oct 28 10:24:07 2017
@@ -22,7 +22,7 @@ import java.time.format.DateTimeParseExc
import javax.annotation.Priority;
import javax.enterprise.inject.Vetoed;
-import org.eclipse.microprofile.config.spi.Converter;
+import javax.config.spi.Converter;
/**
* @author <a href="mailto:struberg@apache.org">Mark Struberg</a>
Modified: geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/FloatConverter.java
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/FloatConverter.java?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/FloatConverter.java (original)
+++ geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/FloatConverter.java Sat Oct 28 10:24:07 2017
@@ -19,7 +19,7 @@ package org.apache.geronimo.config.conve
import javax.annotation.Priority;
import javax.enterprise.inject.Vetoed;
-import org.eclipse.microprofile.config.spi.Converter;
+import javax.config.spi.Converter;
/**
* @author <a href="mailto:struberg@apache.org">Mark Struberg</a>
Modified: geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/InstantConverter.java
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/InstantConverter.java?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/InstantConverter.java (original)
+++ geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/InstantConverter.java Sat Oct 28 10:24:07 2017
@@ -16,7 +16,7 @@
*/
package org.apache.geronimo.config.converters;
-import org.eclipse.microprofile.config.spi.Converter;
+import javax.config.spi.Converter;
import javax.annotation.Priority;
import javax.enterprise.inject.Vetoed;
Modified: geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/IntegerConverter.java
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/IntegerConverter.java?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/IntegerConverter.java (original)
+++ geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/IntegerConverter.java Sat Oct 28 10:24:07 2017
@@ -19,7 +19,7 @@ package org.apache.geronimo.config.conve
import javax.annotation.Priority;
import javax.enterprise.inject.Vetoed;
-import org.eclipse.microprofile.config.spi.Converter;
+import javax.config.spi.Converter;
/**
* @author <a href="mailto:struberg@apache.org">Mark Struberg</a>
Modified: geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/LocalDateConverter.java
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/LocalDateConverter.java?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/LocalDateConverter.java (original)
+++ geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/LocalDateConverter.java Sat Oct 28 10:24:07 2017
@@ -22,7 +22,7 @@ import java.time.format.DateTimeParseExc
import javax.annotation.Priority;
import javax.enterprise.inject.Vetoed;
-import org.eclipse.microprofile.config.spi.Converter;
+import javax.config.spi.Converter;
/**
* @author <a href="mailto:struberg@apache.org">Mark Struberg</a>
Modified: geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/LocalDateTimeConverter.java
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/LocalDateTimeConverter.java?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/LocalDateTimeConverter.java (original)
+++ geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/LocalDateTimeConverter.java Sat Oct 28 10:24:07 2017
@@ -22,7 +22,7 @@ import java.time.format.DateTimeParseExc
import javax.annotation.Priority;
import javax.enterprise.inject.Vetoed;
-import org.eclipse.microprofile.config.spi.Converter;
+import javax.config.spi.Converter;
/**
* @author <a href="mailto:struberg@apache.org">Mark Struberg</a>
Modified: geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/LocalTimeConverter.java
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/LocalTimeConverter.java?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/LocalTimeConverter.java (original)
+++ geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/LocalTimeConverter.java Sat Oct 28 10:24:07 2017
@@ -22,7 +22,7 @@ import java.time.format.DateTimeParseExc
import javax.annotation.Priority;
import javax.enterprise.inject.Vetoed;
-import org.eclipse.microprofile.config.spi.Converter;
+import javax.config.spi.Converter;
/**
* @author <a href="mailto:struberg@apache.org">Mark Struberg</a>
Modified: geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/LongConverter.java
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/LongConverter.java?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/LongConverter.java (original)
+++ geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/LongConverter.java Sat Oct 28 10:24:07 2017
@@ -16,7 +16,7 @@
*/
package org.apache.geronimo.config.converters;
-import org.eclipse.microprofile.config.spi.Converter;
+import javax.config.spi.Converter;
import javax.annotation.Priority;
import javax.enterprise.inject.Vetoed;
Modified: geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/OffsetDateTimeConverter.java
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/OffsetDateTimeConverter.java?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/OffsetDateTimeConverter.java (original)
+++ geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/OffsetDateTimeConverter.java Sat Oct 28 10:24:07 2017
@@ -16,7 +16,7 @@
*/
package org.apache.geronimo.config.converters;
-import org.eclipse.microprofile.config.spi.Converter;
+import javax.config.spi.Converter;
import javax.annotation.Priority;
import javax.enterprise.inject.Vetoed;
Modified: geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/OffsetTimeConverter.java
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/OffsetTimeConverter.java?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/OffsetTimeConverter.java (original)
+++ geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/OffsetTimeConverter.java Sat Oct 28 10:24:07 2017
@@ -22,7 +22,7 @@ import java.time.format.DateTimeParseExc
import javax.annotation.Priority;
import javax.enterprise.inject.Vetoed;
-import org.eclipse.microprofile.config.spi.Converter;
+import javax.config.spi.Converter;
/**
* @author <a href="mailto:johndament@apache.org">John D. Ament</a>
Modified: geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/StringConverter.java
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/StringConverter.java?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/StringConverter.java (original)
+++ geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/StringConverter.java Sat Oct 28 10:24:07 2017
@@ -19,7 +19,7 @@ package org.apache.geronimo.config.conve
import javax.annotation.Priority;
import javax.enterprise.inject.Vetoed;
-import org.eclipse.microprofile.config.spi.Converter;
+import javax.config.spi.Converter;
/**
* 1:1 string output. Just to make converter logic happy.
Modified: geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/URLConverter.java
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/URLConverter.java?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/URLConverter.java (original)
+++ geronimo/components/config/branches/ConfigJSR/impl/src/main/java/org/apache/geronimo/config/converters/URLConverter.java Sat Oct 28 10:24:07 2017
@@ -16,7 +16,7 @@
*/
package org.apache.geronimo.config.converters;
-import org.eclipse.microprofile.config.spi.Converter;
+import javax.config.spi.Converter;
import javax.annotation.Priority;
import javax.enterprise.inject.Vetoed;
Modified: geronimo/components/config/branches/ConfigJSR/impl/src/test/java/org/apache/geronimo/config/test/GeronimoConfigArchiveProcessor.java
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/impl/src/test/java/org/apache/geronimo/config/test/GeronimoConfigArchiveProcessor.java?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/impl/src/test/java/org/apache/geronimo/config/test/GeronimoConfigArchiveProcessor.java (original)
+++ geronimo/components/config/branches/ConfigJSR/impl/src/test/java/org/apache/geronimo/config/test/GeronimoConfigArchiveProcessor.java Sat Oct 28 10:24:07 2017
@@ -21,7 +21,7 @@ import org.apache.geronimo.config.Defaul
import org.apache.geronimo.config.cdi.ConfigInjectionProducer;
import org.apache.geronimo.config.configsource.BaseConfigSource;
import org.apache.geronimo.config.converters.BooleanConverter;
-import org.eclipse.microprofile.config.spi.ConfigProviderResolver;
+import javax.config.spi.ConfigProviderResolver;
import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor;
import org.jboss.arquillian.test.spi.TestClass;
import org.jboss.shrinkwrap.api.Archive;
Modified: geronimo/components/config/branches/ConfigJSR/impl/src/test/java/org/apache/geronimo/config/test/internal/ProviderTest.java
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/impl/src/test/java/org/apache/geronimo/config/test/internal/ProviderTest.java?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/impl/src/test/java/org/apache/geronimo/config/test/internal/ProviderTest.java (original)
+++ geronimo/components/config/branches/ConfigJSR/impl/src/test/java/org/apache/geronimo/config/test/internal/ProviderTest.java Sat Oct 28 10:24:07 2017
@@ -20,7 +20,7 @@ import javax.enterprise.context.RequestS
import javax.inject.Inject;
import javax.inject.Provider;
-import org.eclipse.microprofile.config.inject.ConfigProperty;
+import javax.config.inject.ConfigProperty;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.testng.Arquillian;
import org.jboss.shrinkwrap.api.ShrinkWrap;
Modified: geronimo/components/config/branches/ConfigJSR/impl/src/test/java/org/apache/geronimo/config/test/internal/SupplierTest.java
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/impl/src/test/java/org/apache/geronimo/config/test/internal/SupplierTest.java?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/impl/src/test/java/org/apache/geronimo/config/test/internal/SupplierTest.java (original)
+++ geronimo/components/config/branches/ConfigJSR/impl/src/test/java/org/apache/geronimo/config/test/internal/SupplierTest.java Sat Oct 28 10:24:07 2017
@@ -18,7 +18,7 @@
*/
package org.apache.geronimo.config.test.internal;
-import org.eclipse.microprofile.config.inject.ConfigProperty;
+import javax.config.inject.ConfigProperty;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.testng.Arquillian;
import org.jboss.shrinkwrap.api.ShrinkWrap;
Modified: geronimo/components/config/branches/ConfigJSR/impl/tck-suite.xml
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/impl/tck-suite.xml?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/impl/tck-suite.xml (original)
+++ geronimo/components/config/branches/ConfigJSR/impl/tck-suite.xml Sat Oct 28 10:24:07 2017
@@ -19,7 +19,7 @@
<test name="Microprofile Config TCK">
<packages>
- <package name="org.eclipse.microprofile.config.tck.*"/>
+ <package name="org.eclipse.javaconfig.tck.*"/>
</packages>
</test>
Modified: geronimo/components/config/branches/ConfigJSR/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/components/config/branches/ConfigJSR/pom.xml?rev=1813599&r1=1813598&r2=1813599&view=diff
==============================================================================
--- geronimo/components/config/branches/ConfigJSR/pom.xml (original)
+++ geronimo/components/config/branches/ConfigJSR/pom.xml Sat Oct 28 10:24:07 2017
@@ -50,7 +50,10 @@
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
+
+ <javaconfig.version>1.0-SNAPSHOT</javaconfig.version>
<microprofile-config.version>1.1</microprofile-config.version>
+
<owb.version>1.7.4</owb.version>
<owb2.version>2.0.1</owb2.version>
<arquillian.version>1.1.13.Final</arquillian.version>