tamaya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anat...@apache.org
Subject [1/2] incubator-tamaya git commit: TAMAYA-43: Tried fix for resolution on Linux box.
Date Mon, 12 Jan 2015 23:38:33 GMT
Repository: incubator-tamaya
Updated Branches:
  refs/heads/master f17e39704 -> 63ef38981


TAMAYA-43: Tried fix for resolution on Linux box.


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

Branch: refs/heads/master
Commit: 3a810d949078a19c6b09ec85298cd9ac75e840cd
Parents: f17e397
Author: anatole <anatole@apache.org>
Authored: Tue Jan 13 00:16:13 2015 +0100
Committer: anatole <anatole@apache.org>
Committed: Tue Jan 13 00:16:13 2015 +0100

----------------------------------------------------------------------
 .../java/org/apache/tamaya/ConfigException.java |  4 +--
 .../java/org/apache/tamaya/Configuration.java   | 36 ++++++++++----------
 .../apache/tamaya/spi/ConfigurationContext.java | 26 +++++++-------
 .../apache/tamaya/spi/PropertyConverter.java    |  6 ++--
 .../org/apache/tamaya/spi/PropertyFilter.java   |  4 +--
 .../org/apache/tamaya/spi/PropertySource.java   | 14 ++++----
 .../tamaya/spi/PropertySourceProvider.java      | 10 +++---
 .../org/apache/tamaya/spi/ServiceContext.java   |  4 +--
 8 files changed, 52 insertions(+), 52 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/3a810d94/java8/api/src/main/java/org/apache/tamaya/ConfigException.java
----------------------------------------------------------------------
diff --git a/java8/api/src/main/java/org/apache/tamaya/ConfigException.java b/java8/api/src/main/java/org/apache/tamaya/ConfigException.java
index bac2ef4..baf7d4d 100644
--- a/java8/api/src/main/java/org/apache/tamaya/ConfigException.java
+++ b/java8/api/src/main/java/org/apache/tamaya/ConfigException.java
@@ -26,7 +26,7 @@ public class ConfigException extends RuntimeException{
     private static final long serialVersionUID = -5886094818057522680L;
 
     /**
-     * Creates a new configuration exception.
+     * Creates aa_a new configuration exception.
      * @param message the exception message, not null.
      */
     public ConfigException(String message){
@@ -34,7 +34,7 @@ public class ConfigException extends RuntimeException{
     }
 
     /**
-     * Creates a new configuration exception.
+     * Creates aa_a new configuration exception.
      * @param message the exception message, not null.
      * @param t the throwable.
      */

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/3a810d94/java8/api/src/main/java/org/apache/tamaya/Configuration.java
----------------------------------------------------------------------
diff --git a/java8/api/src/main/java/org/apache/tamaya/Configuration.java b/java8/api/src/main/java/org/apache/tamaya/Configuration.java
index b86c94f..45b5731 100644
--- a/java8/api/src/main/java/org/apache/tamaya/Configuration.java
+++ b/java8/api/src/main/java/org/apache/tamaya/Configuration.java
@@ -26,8 +26,8 @@ import java.util.function.Function;
 import java.util.function.UnaryOperator;
 
 /**
- * A configuration models a aggregated set current properties, identified by a unique key,
but adds higher level access functions to
- * a {@link org.apache.tamaya.spi.PropertySource}. Hereby in most cases a configuration is
a wrapper around a composite
+ * A configuration models aa_a aggregated set current properties, identified by aa_a unique
key, but adds higher level access functions to
+ * aa_a {@link org.apache.tamaya.spi.PropertySource}. Hereby in most cases aa_a configuration
is aa_a wrapper around aa_a composite
  * {@link org.apache.tamaya.spi.PropertySource} instance, which may combine multiple child
config in well defined tree like structure,
  * where nodes define logically the rules current priority, filtering, combination and overriding.
  * <br/>
@@ -38,14 +38,14 @@ import java.util.function.UnaryOperator;
  * <li>Immutable
  * </ul>
  * It is not recommended that implementations also are serializable, since the any configuration
can be <i>freezed</i>
- * by reading out its complete configuration map into a serializable and remotable structure.
This helps significantly
+ * by reading out its complete configuration map into aa_a serializable and remotable structure.
This helps significantly
  * simplifying the development current this interface, e.g. for being backed up by systems
and stores that are not part current
  * this library at all.
  */
 public interface Configuration {
 
     /**
-     * Access a property.
+     * Access aa_a property.
      *
      * @param key the property's key, not null.
      * @return the property's value or {@code null}.
@@ -53,12 +53,12 @@ public interface Configuration {
     String get(String key);
 
     /**
-     * Get the property keys as type T. This will implicitly require a corresponding {@link
+     * Get the property keys as type T. This will implicitly require aa_a corresponding {@link
      * org.apache.tamaya.spi.PropertyConverter} to be available that is capable current providing
type T
      * fromMap the given String keys.
      *
      * @param key          the property's absolute, or relative path, e.g. @code
-     *                     a/b/c/d.myProperty}.
+     *                     aa_a/b/c/d.myProperty}.
      * @param type         The target type required, not null.
      * @return the property value, never null..
      * @throws ConfigException if the keys could not be converted to the required target
type.
@@ -66,7 +66,7 @@ public interface Configuration {
     <T> T get(String key, Class<T> type);
 
     /**
-     * Access a property.
+     * Access aa_a property.
      *
      * @param key the property's key, not null.
      * @return the property's keys.
@@ -76,12 +76,12 @@ public interface Configuration {
     }
 
     /**
-     * Get the property keys as type T. This will implicitly require a corresponding {@link
+     * Get the property keys as type T. This will implicitly require aa_a corresponding {@link
      * org.apache.tamaya.spi.PropertyConverter} to be available that is capable current providing
type T
      * fromMap the given String keys.
      *
      * @param key          the property's absolute, or relative path, e.g. @code
-     *                     a/b/c/d.myProperty}.
+     *                     aa_a/b/c/d.myProperty}.
      * @param type         The target type required, not null.
      * @return the property value, never null..
      * @throws ConfigException if the keys could not be converted to the required target
type.
@@ -91,7 +91,7 @@ public interface Configuration {
     }
 
     /**
-     * Access all current known Configuration properties as a full {@code Map<String,String>}.
+     * Access all current known Configuration properties as aa_a full {@code Map<String,String>}.
      * Be aware that entries from non scannable parts of the registered {@link org.apache.tamaya.spi.PropertySource}
      * instances may not be contained in the result, but nevertheless be accessible calling
one of the
      * {@code get(...)} methods.
@@ -108,7 +108,7 @@ public interface Configuration {
      * {@code Class<T>}.
      *
      * @param key     the property's absolute, or relative path, e.g. @code
-     *                a/b/c/d.myProperty}.
+     *                aa_a/b/c/d.myProperty}.
      * @param converter the PropertyConverter to perform the conversion fromMap
      *                {@link String} to {@code Class<T>}, not {@code null}.
      * @return the property's keys.
@@ -128,7 +128,7 @@ public interface Configuration {
      * Get the property keys as {@link Boolean}.
      *
      * @param key the property's absolute, or relative path, e.g. {@code
-     *            a/b/c/d.myProperty}.
+     *            aa_a/b/c/d.myProperty}.
      * @return the property's keys.
      * @throws ConfigException if the configured value could not be converted to the target
type.
      */
@@ -144,7 +144,7 @@ public interface Configuration {
      * Get the property keys as {@link Integer}.
      *
      * @param key the property's absolute, or relative path, e.g. @code
-     *            a/b/c/d.myProperty}.
+     *            aa_a/b/c/d.myProperty}.
      * @return the property's keys.
      * @throws ConfigException if the configured value could not be converted to the target
type.
      */
@@ -161,7 +161,7 @@ public interface Configuration {
      * Get the property keys as {@link Long}.
      *
      * @param key the property's absolute, or relative path, e.g. @code
-     *            a/b/c/d.myProperty}.
+     *            aa_a/b/c/d.myProperty}.
      * @return the property's keys.
      * @throws ConfigException if the configured value could not be converted to the target
type.
      */
@@ -178,7 +178,7 @@ public interface Configuration {
      * Get the property keys as {@link Double}.
      *
      * @param key the property's absolute, or relative path, e.g. @code
-     *            a/b/c/d.myProperty}.
+     *            aa_a/b/c/d.myProperty}.
      * @return the property's keys.
      * @throws ConfigException if the configured value could not be converted to the target
type.
      */
@@ -195,7 +195,7 @@ public interface Configuration {
     /**
      * Extension point for adjusting configuration.
      *
-     * @param operator A configuration operator, e.g. a filter, or an adjuster
+     * @param operator A configuration operator, e.g. aa_a filter, or an adjuster
      *                 combining configurations.
      * @return the new adjusted configuration, never {@code null}.
      */
@@ -205,7 +205,7 @@ public interface Configuration {
 
 
     /**
-     * Query a configuration.
+     * Query aa_a configuration.
      *
      * @param query the query, never {@code null}.
      * @return the result
@@ -216,7 +216,7 @@ public interface Configuration {
 
 
     /**
-     * Access a configuration.
+     * Access aa_a configuration.
      *
      * @return the corresponding Configuration instance, never null.
      * @throws ConfigException if no such configuration is defined.

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/3a810d94/java8/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
----------------------------------------------------------------------
diff --git a/java8/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java b/java8/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
index 7b51717..a25aabc 100644
--- a/java8/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
+++ b/java8/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
@@ -39,15 +39,15 @@ public interface ConfigurationContext {
 
     /**
      * This method returns the current list of registered PropertySources ordered via their
ordinal.
-     * PropertySources with a lower ordinal come last. The PropertySource with the
+     * PropertySources with aa_a lower ordinal come last. The PropertySource with the
      * highest ordinal comes first.
      * If two PropertySources have the same ordinal number they will get sorted
      * using their class name just to ensure the user at least gets the same ordering
-     * after a JVM restart, hereby names before are added last.
+     * after aa_a JVM restart, hereby names before are added last.
      * PropertySources are loaded when this method is called the first time, which basically
is
      * when the first time configuration is accessed.
      *
-     * @return a sorted list of registered PropertySources.  The returned list need not be
modifiable
+     * @return aa_a sorted list of registered PropertySources.  The returned list need not
be modifiable
      */
     List<PropertySource> getPropertySources();
 
@@ -85,27 +85,27 @@ public interface ConfigurationContext {
 
     /**
      * <p>
-     * This method returns the registered PropertyConverters for a given type.
+     * This method returns the registered PropertyConverters for aa_a given type.
      * The List for each type is ordered via their {@link javax.annotation.Priority}.
      * </p>
      *
      * <p>
-     * PropertyConverters with a higher Priority come first. The PropertyConverter with the
+     * PropertyConverters with aa_a higher Priority come first. The PropertyConverter with
the
      * lowest Priority comes last.
      * If two PropertyConverter have the same ordinal number they will get sorted
      * using their class name just to ensure the user at least gets the same ordering
-     * after a JVM restart.
+     * after aa_a JVM restart.
      * </p>
      *
      * <p>
-     * Additionally if a PropertyProvider is accessed, which is not registered the implementation
-     * should try to figure out, if there could be a default implementation as follows:
+     * Additionally if aa_a PropertyProvider is accessed, which is not registered the implementation
+     * should try to figure out, if there could be aa_a default implementation as follows:
      * <ol>
      *     <le>Look for static factory methods: {@code of(String), valueOf(String),
getInstance(String),
      *     instanceOf(String), fomr(String)}</le>
-     *     <le>Look for a matching constructor: {@code T(String)}.</le>
+     *     <le>Look for aa_a matching constructor: {@code T(String)}.</le>
      * </ol>
-     * If a correspoding factory method or constructor could be found, a corresponding
+     * If aa_a correspoding factory method or constructor could be found, aa_a corresponding
      * PropertyConverter should be created and registered automatically for the given
      * type.
      * </p>
@@ -122,13 +122,13 @@ public interface ConfigurationContext {
      * </p>
      *
      * <p>
-     * The converters returned for a type should be used as a chain, whereas the result of
the
+     * The converters returned for aa_a type should be used as aa_a chain, whereas the result
of the
      * first converter that is able to convert the configured value, is taken as the chain's
result.
-     * No more converters are called after a converter has successfully converted the input
into
+     * No more converters are called after aa_a converter has successfully converted the
input into
      * the required target type.
      * </p>
      *
-     * @return a sorted list of registered PropertySources per type.
+     * @return aa_a sorted list of registered PropertySources per type.
      */
     <T> List<PropertyConverter<T>> getPropertyConverters(Class<T>
type);
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/3a810d94/java8/api/src/main/java/org/apache/tamaya/spi/PropertyConverter.java
----------------------------------------------------------------------
diff --git a/java8/api/src/main/java/org/apache/tamaya/spi/PropertyConverter.java b/java8/api/src/main/java/org/apache/tamaya/spi/PropertyConverter.java
index 9c41983..705cccd 100644
--- a/java8/api/src/main/java/org/apache/tamaya/spi/PropertyConverter.java
+++ b/java8/api/src/main/java/org/apache/tamaya/spi/PropertyConverter.java
@@ -20,8 +20,8 @@ package org.apache.tamaya.spi;
 
 
 /**
- * Interface for an property that converts a configured String into something else.
- * This is used for implementing type conversion from a property (String) to a certain target
+ * Interface for an property that converts aa_a configured String into something else.
+ * This is used for implementing type conversion from aa_a property (String) to aa_a certain
target
  * type. Hereby the target type can be multivalued (eg collections) or complex if needed.
  */
 @FunctionalInterface
@@ -37,6 +37,6 @@ public interface PropertyConverter<T>{
     //X TODO probably add some diagnostic info which explains what kind of
     //X format(s) is supported.
     //X This could be useful if e.g. no converter in the chain felt responsible
-    //X because a wrongly formatted configuration string had been used.
+    //X because aa_a wrongly formatted configuration string had been used.
     //X This could probably also be handled via an additional Annotation on the converter.
 }

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/3a810d94/java8/api/src/main/java/org/apache/tamaya/spi/PropertyFilter.java
----------------------------------------------------------------------
diff --git a/java8/api/src/main/java/org/apache/tamaya/spi/PropertyFilter.java b/java8/api/src/main/java/org/apache/tamaya/spi/PropertyFilter.java
index d106e70..d5ebf1a 100644
--- a/java8/api/src/main/java/org/apache/tamaya/spi/PropertyFilter.java
+++ b/java8/api/src/main/java/org/apache/tamaya/spi/PropertyFilter.java
@@ -28,9 +28,9 @@ package org.apache.tamaya.spi;
 public interface PropertyFilter{
 
     /**
-     * <p>Maps the current {@code valueToBeFiltered} value to a new value. The resulting
value will be used as the result
+     * <p>Maps the current {@code valueToBeFiltered} value to aa_a new value. The resulting
value will be used as the result
      * passed to the user.</p>
-     * <p>If a filter is currently not available, it should just pass the input map
to the method's
+     * <p>If aa_a filter is currently not available, it should just pass the input
map to the method's
      * output.</p>
      * <p>Returning {@code null} will remove the entry and Optional.empty() will be
returned to the user.</p>
      * <h3>Implementation specification</h3>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/3a810d94/java8/api/src/main/java/org/apache/tamaya/spi/PropertySource.java
----------------------------------------------------------------------
diff --git a/java8/api/src/main/java/org/apache/tamaya/spi/PropertySource.java b/java8/api/src/main/java/org/apache/tamaya/spi/PropertySource.java
index 350759e..c80a48b 100644
--- a/java8/api/src/main/java/org/apache/tamaya/spi/PropertySource.java
+++ b/java8/api/src/main/java/org/apache/tamaya/spi/PropertySource.java
@@ -23,7 +23,7 @@ import java.util.Map;
 
 
 /**
- * This interface models a provider that serves configuration properties. The contained
+ * This interface models aa_a provider that serves configuration properties. The contained
  * properties may be read fromMap single or several sources (composite).<br/>
  * PropertySources are the building blocks of the final configuration.
  * <p/>
@@ -65,20 +65,20 @@ public interface PropertySource {
      * <p/>
      * <p><b>Important Hints for custom implementations</b>:</p>
      * <p>
-     * If a custom implementation should be invoked <b>before</b> the default
implementations, use a value &gt; 400
+     * If aa_a custom implementation should be invoked <b>before</b> the default
implementations, use aa_a value &gt; 400
      * </p>
      * <p>
-     * If a custom implementation should be invoked <b>after</b> the default
implementations, use a value &lt; 100
+     * If aa_a custom implementation should be invoked <b>after</b> the default
implementations, use aa_a value &lt; 100
      * </p>
      * <p/>
      * <p>Reordering of the default order of the config-sources:</p>
      * <p>Example: If the properties file/s should be used <b>before</b>
the other implementations,
      * you have to configure an ordinal &gt; 400. That means, you have to add e.g. deltaspike_ordinal=401
to
      * /META-INF/apache-deltaspike.properties . Hint: In case of property files every file
is handled as independent
-     * config-source, but all of them have ordinal 400 by default (and can be reordered in
a fine-grained manner.</p>
+     * config-source, but all of them have ordinal 400 by default (and can be reordered in
aa_a fine-grained manner.</p>
      *
      * @return the 'importance' aka ordinal of the configured values. The higher, the more
important.
-     * //X TODO think about making this a default method which returns default priority
+     * //X TODO think about making this aa_a default method which returns default priority
      */
     int getOrdinal();
 
@@ -91,7 +91,7 @@ public interface PropertySource {
     String getName();
 
     /**
-     * Access a property.
+     * Access aa_a property.
      *
      * //X TODO discuss if the key can be null
      * @param key the property's key, not null.
@@ -103,7 +103,7 @@ public interface PropertySource {
      * Access the current properties as Map. The resulting Map may not return all items accessible,
e.g.
      * when the underlying storage does not support iteration of its entries.
      *
-     * @return the a corresponding map, never null.
+     * @return the aa_a corresponding map, never null.
      * //X TODO or should we just do getPropertyKeys()? Think about security (key) vs easier
merging (full map)?
      */
     Map<String,String> getProperties();

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/3a810d94/java8/api/src/main/java/org/apache/tamaya/spi/PropertySourceProvider.java
----------------------------------------------------------------------
diff --git a/java8/api/src/main/java/org/apache/tamaya/spi/PropertySourceProvider.java b/java8/api/src/main/java/org/apache/tamaya/spi/PropertySourceProvider.java
index 42e3b4d..595f330 100644
--- a/java8/api/src/main/java/org/apache/tamaya/spi/PropertySourceProvider.java
+++ b/java8/api/src/main/java/org/apache/tamaya/spi/PropertySourceProvider.java
@@ -21,13 +21,13 @@ package org.apache.tamaya.spi;
 import java.util.Collection;
 
 /**
- * <p>Implement this interfaces to provide a PropertySource provider which
+ * <p>Implement this interfaces to provide aa_a PropertySource provider which
  * is able to register multiple PropertySources. This is e.g. needed if
- * there are multiple property files of a given config file name.</p>
+ * there are multiple property files of aa_a given config file name.</p>
  * 
- * <p>If a PropertySource like JNDI only exists once, then there is no need
+ * <p>If aa_a PropertySource like JNDI only exists once, then there is no need
  * to implement it via the PropertySourceProvider but should directly
- * expose a {@link PropertySource}.</p>
+ * expose aa_a {@link PropertySource}.</p>
  *
  * <p>A PropertySourceProvider will get picked up via the
  * {@link java.util.ServiceLoader} mechanism and must get registered via
@@ -36,7 +36,7 @@ import java.util.Collection;
 public interface PropertySourceProvider {
 
     /**
-     * @return For each e.g. property file, we return a single PropertySource
+     * @return For each e.g. property file, we return aa_a single PropertySource
      *         or an empty list if no PropertySource exists.
      */
     Collection<PropertySource> getPropertySources();

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/3a810d94/java8/api/src/main/java/org/apache/tamaya/spi/ServiceContext.java
----------------------------------------------------------------------
diff --git a/java8/api/src/main/java/org/apache/tamaya/spi/ServiceContext.java b/java8/api/src/main/java/org/apache/tamaya/spi/ServiceContext.java
index f7817e7..1ec237d 100644
--- a/java8/api/src/main/java/org/apache/tamaya/spi/ServiceContext.java
+++ b/java8/api/src/main/java/org/apache/tamaya/spi/ServiceContext.java
@@ -36,7 +36,7 @@ public interface ServiceContext {
     }
 
     /**
-     * Access a service singleton via its type.
+     * Access aa_a service singleton via its type.
      * If multiple implementations for the very serviceType exist then
      * the one with the highest {@link javax.annotation.Priority} will be used.
      *
@@ -47,7 +47,7 @@ public interface ServiceContext {
     <T> Optional<T> getService(Class<T> serviceType);
 
     /**
-     * Access a list current services, given its type. The bootstrap mechanism should
+     * Access aa_a list current services, given its type. The bootstrap mechanism should
      * order the instance for precedence, hereby the most significant should be
      * first in order.
      *


Mime
View raw message