tamaya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anat...@apache.org
Subject [2/2] incubator-tamaya git commit: Fixed several build warnings.
Date Tue, 15 Mar 2016 09:42:19 GMT
Fixed several build warnings.


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

Branch: refs/heads/master
Commit: 5a5d637cbd3d3286c5dcc0e5dac624d6c1177219
Parents: 8f37dd7
Author: anatole <anatole@apache.org>
Authored: Tue Mar 15 10:42:00 2016 +0100
Committer: anatole <anatole@apache.org>
Committed: Tue Mar 15 10:42:00 2016 +0100

----------------------------------------------------------------------
 modules/integration/cdi-se/pom.xml                              | 3 +--
 .../org/apache/tamaya/integration/cdi/DefaultDynamicValue.java  | 1 -
 modules/integration/osgi/pom.xml                                | 5 +----
 .../main/java/org/apache/tamaya/model/spi/ParameterModel.java   | 2 +-
 .../java/org/apache/tamaya/optional/OptionalConfiguration.java  | 4 +---
 modules/server/pom.xml                                          | 3 ---
 .../java/org/apache/tamaya/server/ConfigurationResource.java    | 3 ---
 .../main/java/org/apache/tamaya/server/VersionProperties.java   | 2 +-
 8 files changed, 5 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/5a5d637c/modules/integration/cdi-se/pom.xml
----------------------------------------------------------------------
diff --git a/modules/integration/cdi-se/pom.xml b/modules/integration/cdi-se/pom.xml
index c3bda9a..a0dfc3f 100644
--- a/modules/integration/cdi-se/pom.xml
+++ b/modules/integration/cdi-se/pom.xml
@@ -60,8 +60,7 @@ under the License.
                 <configuration>
                     <instructions>
                         <Export-Package>
-                            org.apache.tamaya.integration.cdi,
-                            org.apache.tamaya.integration.cdi.config,
+                            org.apache.tamaya.integration.cdi.config
                         </Export-Package>
                         <Private-Package>
                             org.apache.tamaya.integration.cdi.internal

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/5a5d637c/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/DefaultDynamicValue.java
----------------------------------------------------------------------
diff --git a/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/DefaultDynamicValue.java
b/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/DefaultDynamicValue.java
index 3b436a5..98ee05a 100644
--- a/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/DefaultDynamicValue.java
+++ b/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/DefaultDynamicValue.java
@@ -20,7 +20,6 @@ package org.apache.tamaya.integration.cdi;
 
 import org.apache.tamaya.ConfigException;
 import org.apache.tamaya.Configuration;
-import org.apache.tamaya.ConfigurationProvider;
 import org.apache.tamaya.TypeLiteral;
 import org.apache.tamaya.inject.api.BaseDynamicValue;
 import org.apache.tamaya.inject.api.DynamicValue;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/5a5d637c/modules/integration/osgi/pom.xml
----------------------------------------------------------------------
diff --git a/modules/integration/osgi/pom.xml b/modules/integration/osgi/pom.xml
index f668edc..3d25028 100644
--- a/modules/integration/osgi/pom.xml
+++ b/modules/integration/osgi/pom.xml
@@ -48,11 +48,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-Activator>
-                            org.apache.tamaya.integration.osgi.genereal.Activator
+                            org.apache.tamaya.integration.osgi.Activator
                         </Bundle-Activator>
-                        <Private-Package>
-                            org.tamaya.integration.osgi.general
-                        </Private-Package>
                         <Export-Service>
                             org.osgi.service.cm.ConfigurationAdmin
                         </Export-Service>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/5a5d637c/modules/model/src/main/java/org/apache/tamaya/model/spi/ParameterModel.java
----------------------------------------------------------------------
diff --git a/modules/model/src/main/java/org/apache/tamaya/model/spi/ParameterModel.java b/modules/model/src/main/java/org/apache/tamaya/model/spi/ParameterModel.java
index 7e28682..43d7174 100644
--- a/modules/model/src/main/java/org/apache/tamaya/model/spi/ParameterModel.java
+++ b/modules/model/src/main/java/org/apache/tamaya/model/spi/ParameterModel.java
@@ -169,7 +169,7 @@ public class ParameterModel extends AbstractModel {
                 try {
                     this.type = Class.forName("java.lang."+type);
                 } catch (ClassNotFoundException e2) {
-                    Logger.getLogger(getClass().getName()).log(Level.WARNING, "Failed to
load parameter type: " + type, e2);
+                    Logger.getLogger(getClass().getName()).log(Level.INFO, "Failed to load
parameter type: " + type, e2);
                 }
             }
             return this;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/5a5d637c/modules/optional/src/main/java/org/apache/tamaya/optional/OptionalConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/optional/src/main/java/org/apache/tamaya/optional/OptionalConfiguration.java
b/modules/optional/src/main/java/org/apache/tamaya/optional/OptionalConfiguration.java
index fe5c15d..4868bc1 100644
--- a/modules/optional/src/main/java/org/apache/tamaya/optional/OptionalConfiguration.java
+++ b/modules/optional/src/main/java/org/apache/tamaya/optional/OptionalConfiguration.java
@@ -105,8 +105,6 @@ public final class OptionalConfiguration {
 
     /**
      * Returns an instance of OptionalConfiguration, which uses the given provider and policy
for evaluating the values.
-     * @param policy the policy how a value should be evaluated depending if Tamaya is available
or not.
-     * @param provider the non Tamaya-based provider to be used to evaluate values.
      *
      * @param policy   the policy how a value should be evaluated depending if Tamaya is
available or not.
      * @param provider the non Tamaya-based provider to be used to evaluate values.
@@ -119,7 +117,7 @@ public final class OptionalConfiguration {
     /**
      * Returns a default instance, which uses a default provider returning values from system
properties and environment
      * only.
-     * @param policy the policy how a value should be evaluated depending if Tamaya is available
or not.
+     *
      * @param policy the policy how a value should be evaluated depending if Tamaya is available
or not.
      * @return a default OptionalConfiguration instance, never null.
      */

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/5a5d637c/modules/server/pom.xml
----------------------------------------------------------------------
diff --git a/modules/server/pom.xml b/modules/server/pom.xml
index 31db1cc..7e34018 100644
--- a/modules/server/pom.xml
+++ b/modules/server/pom.xml
@@ -177,9 +177,6 @@ under the License.
                             org.apache.tamaya.server,
                             org.apache.tamaya.server.spi
                         </Export-Package>
-                        <Private-Package>
-                            org.apache.tamaya.server.internal
-                        </Private-Package>
                     </instructions>
                 </configuration>
             </plugin>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/5a5d637c/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
----------------------------------------------------------------------
diff --git a/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
b/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
index 0dc99f2..ebc6eca 100644
--- a/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
+++ b/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
@@ -188,13 +188,10 @@ public class ConfigurationResource {
      * }
      * </pre>
      *
-     * @param key   name of the key to show
      * @param key name of the key to show
      * @param value configuration value for the given key
      * @param ttl time to live
      * @return written configuration value.
-     * @param ttl   time to live
-     * @return written configuration value.
      */
     @PUT
     @Path("/keys/{key}")

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/5a5d637c/modules/server/src/main/java/org/apache/tamaya/server/VersionProperties.java
----------------------------------------------------------------------
diff --git a/modules/server/src/main/java/org/apache/tamaya/server/VersionProperties.java
b/modules/server/src/main/java/org/apache/tamaya/server/VersionProperties.java
index e6136fb..e271694 100644
--- a/modules/server/src/main/java/org/apache/tamaya/server/VersionProperties.java
+++ b/modules/server/src/main/java/org/apache/tamaya/server/VersionProperties.java
@@ -27,7 +27,7 @@ import java.util.Properties;
  * at runtime.</p>
  *
  * <p>All information offered by this is loaded from a properties file at
- * {@value #VERSION_PROPERTY_FILE}.</p>
+ * {@link VersionProperties#VERSION_PROPERTY_FILE}.</p>
  */
 public class VersionProperties {
     private static final String VERSION_PROPERTY_FILE = "/META-INF/tamaya-server-version.properties";


Mime
View raw message