geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlmonte...@apache.org
Subject svn commit: r1832823 - in /geronimo/components/config/trunk: ./ impl/ impl/src/main/java/org/apache/geronimo/config/ impl/src/main/java/org/apache/geronimo/config/configsource/ impl/src/main/java/org/apache/geronimo/config/converters/
Date Mon, 04 Jun 2018 12:05:27 GMT
Author: jlmonteiro
Date: Mon Jun  4 12:05:27 2018
New Revision: 1832823

URL: http://svn.apache.org/viewvc?rev=1832823&view=rev
Log:
Apply patch from Daniel Soro - Thanks (pull/2)

Modified:
    geronimo/components/config/trunk/impl/ci-suite.xml
    geronimo/components/config/trunk/impl/pom.xml
    geronimo/components/config/trunk/impl/src/main/java/org/apache/geronimo/config/ConfigImpl.java
    geronimo/components/config/trunk/impl/src/main/java/org/apache/geronimo/config/configsource/SystemEnvConfigSource.java
    geronimo/components/config/trunk/impl/src/main/java/org/apache/geronimo/config/converters/ImplicitConverter.java
    geronimo/components/config/trunk/pom.xml

Modified: geronimo/components/config/trunk/impl/ci-suite.xml
URL: http://svn.apache.org/viewvc/geronimo/components/config/trunk/impl/ci-suite.xml?rev=1832823&r1=1832822&r2=1832823&view=diff
==============================================================================
--- geronimo/components/config/trunk/impl/ci-suite.xml (original)
+++ geronimo/components/config/trunk/impl/ci-suite.xml Mon Jun  4 12:05:27 2018
@@ -17,7 +17,7 @@
 -->
 <suite name="microprofileconfig-TCK" verbose="2" configfailurepolicy="continue" >
 
-    <test name="Microprofile-config 1_0 TCK">
+    <test name="Microprofile-config 1_3 TCK">
         <packages>
             <package name="org.eclipse.microprofile.config.tck.*">
             </package>

Modified: geronimo/components/config/trunk/impl/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/components/config/trunk/impl/pom.xml?rev=1832823&r1=1832822&r2=1832823&view=diff
==============================================================================
--- geronimo/components/config/trunk/impl/pom.xml (original)
+++ geronimo/components/config/trunk/impl/pom.xml Mon Jun  4 12:05:27 2018
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.geronimo.config</groupId>
         <artifactId>geronimo-config</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>geronimo-config-impl</artifactId>
@@ -99,6 +99,10 @@
                         <HISTTIMEFORMAT>value-for-tck-since-we-ignore-empty</HISTTIMEFORMAT>
                         <INSTANCE>value-for-tck-since-we-ignore-empty</INSTANCE>
                         <UPSTART_INSTANCE>value-for-tck-since-we-ignore-empty</UPSTART_INSTANCE>
+                        <my_int_property>45</my_int_property>
+                        <MY_BOOLEAN_PROPERTY>true</MY_BOOLEAN_PROPERTY>
+                        <my_string_property>haha</my_string_property>
+                        <MY_STRING_PROPERTY>woohoo</MY_STRING_PROPERTY>
                     </environmentVariables>
                     <systemPropertyVariables>
                         <!-- TCKs assume it but this is not really a good option for prod
-->

Modified: geronimo/components/config/trunk/impl/src/main/java/org/apache/geronimo/config/ConfigImpl.java
URL: http://svn.apache.org/viewvc/geronimo/components/config/trunk/impl/src/main/java/org/apache/geronimo/config/ConfigImpl.java?rev=1832823&r1=1832822&r2=1832823&view=diff
==============================================================================
--- geronimo/components/config/trunk/impl/src/main/java/org/apache/geronimo/config/ConfigImpl.java
(original)
+++ geronimo/components/config/trunk/impl/src/main/java/org/apache/geronimo/config/ConfigImpl.java
Mon Jun  4 12:05:27 2018
@@ -340,4 +340,4 @@ public class ConfigImpl implements Confi
     }
 
 
-}
\ No newline at end of file
+}

Modified: geronimo/components/config/trunk/impl/src/main/java/org/apache/geronimo/config/configsource/SystemEnvConfigSource.java
URL: http://svn.apache.org/viewvc/geronimo/components/config/trunk/impl/src/main/java/org/apache/geronimo/config/configsource/SystemEnvConfigSource.java?rev=1832823&r1=1832822&r2=1832823&view=diff
==============================================================================
--- geronimo/components/config/trunk/impl/src/main/java/org/apache/geronimo/config/configsource/SystemEnvConfigSource.java
(original)
+++ geronimo/components/config/trunk/impl/src/main/java/org/apache/geronimo/config/configsource/SystemEnvConfigSource.java
Mon Jun  4 12:05:27 2018
@@ -58,7 +58,7 @@ public class SystemEnvConfigSource exten
     public String getValue(String key) {
         String val = configValues.get(key);
         if (val == null) {
-            val = configValues.get(key.replace('.', '_'));
+            val = configValues.get(key.replaceAll("[^Aa-zZ0-9]", "_"));
         }
 
         return val;

Modified: geronimo/components/config/trunk/impl/src/main/java/org/apache/geronimo/config/converters/ImplicitConverter.java
URL: http://svn.apache.org/viewvc/geronimo/components/config/trunk/impl/src/main/java/org/apache/geronimo/config/converters/ImplicitConverter.java?rev=1832823&r1=1832822&r2=1832823&view=diff
==============================================================================
--- geronimo/components/config/trunk/impl/src/main/java/org/apache/geronimo/config/converters/ImplicitConverter.java
(original)
+++ geronimo/components/config/trunk/impl/src/main/java/org/apache/geronimo/config/converters/ImplicitConverter.java
Mon Jun  4 12:05:27 2018
@@ -16,7 +16,6 @@
  */
 package org.apache.geronimo.config.converters;
 
-
 import org.eclipse.microprofile.config.spi.Converter;
 
 import java.lang.reflect.Array;
@@ -52,7 +51,6 @@ public abstract class ImplicitConverter
         if (converter == null) {
             converter = hasConverterMethod(clazz, "parse", CharSequence.class);
         }
-
         return converter;
     }
 

Modified: geronimo/components/config/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/components/config/trunk/pom.xml?rev=1832823&r1=1832822&r2=1832823&view=diff
==============================================================================
--- geronimo/components/config/trunk/pom.xml (original)
+++ geronimo/components/config/trunk/pom.xml Mon Jun  4 12:05:27 2018
@@ -28,7 +28,7 @@
 
     <groupId>org.apache.geronimo.config</groupId>
     <artifactId>geronimo-config</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Geronimo Microprofile Configuration</name>
 



Mime
View raw message