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 2016/08/16 13:51:44 UTC
[07/15] incubator-tamaya git commit: Implemented UI improvements and
bugfixes. Fixed some impl details.
Implemented UI improvements and bugfixes.
Fixed some impl details.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/3b9c16fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/3b9c16fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/3b9c16fd
Branch: refs/heads/master
Commit: 3b9c16fdd97e32614038bc4f1c58a073ca934478
Parents: d86d527
Author: anatole <an...@apache.org>
Authored: Sat Jun 25 01:21:43 2016 +0200
Committer: anatole <an...@apache.org>
Committed: Tue Aug 16 15:51:30 2016 +0200
----------------------------------------------------------------------
.../core/internal/PropertyConverterManager.java | 2 +-
modules/integration/karaf/pom.xml | 273 ++++---------------
src/site/asciidoc/Core.adoc | 20 +-
src/site/asciidoc/HighLevelDesign.adoc | 2 +-
src/site/asciidoc/extensions/mod_model.adoc | 4 +-
src/site/asciidoc/usecasesAndReqs.adoc | 2 +-
6 files changed, 70 insertions(+), 233 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/3b9c16fd/attic/java8/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
----------------------------------------------------------------------
diff --git a/attic/java8/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java b/attic/java8/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
index 3cb0656..1c7cce5 100644
--- a/attic/java8/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
+++ b/attic/java8/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
@@ -226,7 +226,7 @@ public class PropertyConverterManager {
if (converters != null) {
converterList.addAll(converters);
}
- // handling of java.lang wrapper classes
+ // handling of java.ui.lang wrapper classes
TypeLiteral<T> boxedType = mapBoxedType(targetType);
if(boxedType!=null){
try {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/3b9c16fd/modules/integration/karaf/pom.xml
----------------------------------------------------------------------
diff --git a/modules/integration/karaf/pom.xml b/modules/integration/karaf/pom.xml
index 9c23459..a94e54c 100644
--- a/modules/integration/karaf/pom.xml
+++ b/modules/integration/karaf/pom.xml
@@ -25,234 +25,71 @@ under the License.
<version>0.3-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <name>Apache Tamaya Integration - Karaf Features</name>
- <artifactId>tamaya-karaf</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.tamaya</groupId>
- <artifactId>tamaya-api</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <version>${project.version}</version>
- </dependency>
+ <name>Apache Tamaya Integration - Karaf Features Parent</name>
+ <artifactId>tamaya-integration-karaf-all</artifactId>
+ <groupId>org.apache.tamaya.ext.karaf</groupId>
+ <packaging>pom</packaging>
- <dependency>
- <groupId>org.apache.tamaya</groupId>
- <artifactId>tamaya-core</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <version>${project.version}</version>
- </dependency>
+ <properties>
+ <karaf.version>4.0.5</karaf.version>
+ </properties>
- <dependency>
- <groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-builder</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-classloader-support</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-collections</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-events</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-filter</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-formats</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-functions</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-injection</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-injection-api</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-json</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-management</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-model</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-mutable-config</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-optional</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-resolver</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-resources</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-spisupport</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-camel</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-yaml</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-cdi</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-cdi-se</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-consul</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-etcd</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-osgi</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-spring</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <version>${karaf.version}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <javase>1.7</javase>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
<plugins>
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
<configuration>
- <aggregateFeatures>true</aggregateFeatures>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
+
+ <modules>
+ <module>tamaya-api-feature</module>
+ <module>tamaya-core-feature</module>
+ <module>tamaya-json-feature</module>
+ <module>tamaya-yaml-feature</module>
+ <module>tamaya-filter-feature</module>
+ <module>tamaya-mutable-config-feature</module>
+ <module>tamaya-injection-feature</module>
+ <module>tamaya-model-feature</module>
+ <module>tamaya-events-feature</module>
+ <module>tamaya-etcd-feature</module>
+ <module>tamaya-consul-feature</module>
+ <module>tamaya-all-feature</module>
+ <module>tamaya-assembly</module>
+ </modules>
+
</project>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/3b9c16fd/src/site/asciidoc/Core.adoc
----------------------------------------------------------------------
diff --git a/src/site/asciidoc/Core.adoc b/src/site/asciidoc/Core.adoc
index e1d223c..e31c319 100644
--- a/src/site/asciidoc/Core.adoc
+++ b/src/site/asciidoc/Core.adoc
@@ -66,21 +66,21 @@ listing of converters automatically registered with the Core module:
|_Target Type_ |_Class Name_ |_Supported Formats_
|java.math.BigDecimal |BigDecimalConverter |1.2345, 0xFF
|java.math.BigInteger |BigIntegerConverter |0xFF, 1234
-|java.lang.Boolean |BooleanConverter |true, false, T, F, 1 ,0
-|java.lang.Byte |ByteConverter |0xFF, MIN_VALUE, MAX_VALUE, 123
-|java.lang.Character |CharConverter |0xFF, 'a', 'H', 123
-|java.lang.Class |ClassConverter |<fully qualified class name>
+|java.ui.lang.Boolean |BooleanConverter |true, false, T, F, 1 ,0
+|java.ui.lang.Byte |ByteConverter |0xFF, MIN_VALUE, MAX_VALUE, 123
+|java.ui.lang.Character |CharConverter |0xFF, 'a', 'H', 123
+|java.ui.lang.Class |ClassConverter |<fully qualified class name>
|java.util.Currency |CurrencyConverter |CHF, 123
-|java.lang.Double |DoubleConverter |1, 0xFF, 1.2334, NaN, NEGATIVE_INFITIY, POSITIVE_INFINITY, MIN_VALUE, MAX_VALUE
+|java.ui.lang.Double |DoubleConverter |1, 0xFF, 1.2334, NaN, NEGATIVE_INFITIY, POSITIVE_INFINITY, MIN_VALUE, MAX_VALUE
|_Enums_ |EnumConverter |<Enum item name>
-|java.lang.Float |FloatConverter |1, 0xFF, 1.2334, NaN, NEGATIVE_INFITIY, POSITIVE_INFINITY, MIN_VALUE, MAX_VALUE
-|java.lang.Integer |IntegerConverter |1, 0xD3, MIN_VALUE, MAX_VALUE
+|java.ui.lang.Float |FloatConverter |1, 0xFF, 1.2334, NaN, NEGATIVE_INFITIY, POSITIVE_INFINITY, MIN_VALUE, MAX_VALUE
+|java.ui.lang.Integer |IntegerConverter |1, 0xD3, MIN_VALUE, MAX_VALUE
|LocalDate |LocalDateConverter |<Date as defined by LocalDate.parse(String)
|LocalTime |LocalTimeConverter |<Time as defined by LocalTime.parse(String)
|LocalDateTime |LocalDateTimeConverter |<LocalDateTime as defined by LocalDateTime.parse(String)>
-|java.lang.Long |LongConverter |1, 0xD3, MIN_VALUE, MAX_VALUE
-|java.lang.Number |NumberConverter |1, 0xFF, 1.2334, NaN, NEGATIVE_INFITIY, POSITIVE_INFINITY
-|java.lang.Short |ShortConverter |1, 0xD3, MIN_VALUE, MAX_VALUE
+|java.ui.lang.Long |LongConverter |1, 0xD3, MIN_VALUE, MAX_VALUE
+|java.ui.lang.Number |NumberConverter |1, 0xFF, 1.2334, NaN, NEGATIVE_INFITIY, POSITIVE_INFINITY
+|java.ui.lang.Short |ShortConverter |1, 0xD3, MIN_VALUE, MAX_VALUE
|java.net.URI |URIConverter |http://localhost:2020/testresource?api=true
|java.net.URL |URLConverter |http://localhost:2020/testresource?api=true
|ZoneId |ZoneIdConverter |Europe/Zurich
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/3b9c16fd/src/site/asciidoc/HighLevelDesign.adoc
----------------------------------------------------------------------
diff --git a/src/site/asciidoc/HighLevelDesign.adoc b/src/site/asciidoc/HighLevelDesign.adoc
index 013c567..b3a3539 100644
--- a/src/site/asciidoc/HighLevelDesign.adoc
+++ b/src/site/asciidoc/HighLevelDesign.adoc
@@ -110,7 +110,7 @@ process is aborted, since a non-resolvable circular filter issue is assumed.
The output is the final configuration value as type +String+.
=== Applying type conversion:
-Finally, if the required target type, does not match +Java.lang.String+, all registered +PropertyConverter+
+Finally, if the required target type, does not match +Java.ui.lang.String+, all registered +PropertyConverter+
instances targeting the corresponding target type are asked to convert the given (String-based) configuration
entry to the required (non String) target type.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/3b9c16fd/src/site/asciidoc/extensions/mod_model.adoc
----------------------------------------------------------------------
diff --git a/src/site/asciidoc/extensions/mod_model.adoc b/src/site/asciidoc/extensions/mod_model.adoc
index 4a501ee..0bc9f74 100644
--- a/src/site/asciidoc/extensions/mod_model.adoc
+++ b/src/site/asciidoc/extensions/mod_model.adoc
@@ -74,7 +74,7 @@ Now with only these 2 concepts a simple configuration meta-model can be defined
** may have an optional description
* Parameters additionally have
** a _type_ (+.model.type=Classname+), described by the fully qualified class name, into which any configured (String)
- value must be convertable into. If no type is configured +java.lang.String+ is assumed as default.
+ value must be convertable into. If no type is configured +java.ui.lang.String+ is assumed as default.
** an optional regular expression that can be used to validate the +String+ values returned from a
configuration (+.model.expression=regexpression+).
@@ -180,7 +180,7 @@ but are optional.
Since the parameter is the default type for model entries, a minmal parameter model entry only only needs it's
parameter type to be defined. In the example above we define a parameter +minimalClass+ of type +Class+.
-Types hereby are fully qualified class names, whereas as 'java.lang' for built-in language types can be
+Types hereby are fully qualified class names, whereas as 'java.ui.lang' for built-in language types can be
ommitted.
==== Model Locations
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/3b9c16fd/src/site/asciidoc/usecasesAndReqs.adoc
----------------------------------------------------------------------
diff --git a/src/site/asciidoc/usecasesAndReqs.adoc b/src/site/asciidoc/usecasesAndReqs.adoc
index 02fdb3a..66ee0dc 100644
--- a/src/site/asciidoc/usecasesAndReqs.adoc
+++ b/src/site/asciidoc/usecasesAndReqs.adoc
@@ -73,7 +73,7 @@ ones like EL are required. This is especially useful to deal with low resource e
=== Type Safe Properties
Users just want to access properties not only as Strings, but let Tamaya do the conversion to the required
-or the configred target type. By defauklt all java.lang wrapper and primitive types should be supported, but also
+or the configred target type. By defauklt all java.ui.lang wrapper and primitive types should be supported, but also
other common types like date/time types, math numeric types and more.
It must be possible that users can register their own custom types.