Repository: incubator-reef Updated Branches: refs/heads/master 774a5d75e -> 0da6b504b
[REEF-268] Moved `ConfigurationProvider` into Tang This moves the `ConfigurationProvider` interface into Tang such that e.g. Wake can use it. JIRA: [REEF-268](https://issues.apache.org/jira/browse/REEF-268) Pull Request: This closes #152 Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/0da6b504 Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/0da6b504 Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/0da6b504 Branch: refs/heads/master Commit: 0da6b504b2660d274cecb66bc142bc9675521b15 Parents: 774a5d7 Author: Markus Weimer <[email protected]> Authored: Fri Apr 17 17:55:28 2015 -0700 Committer: Beysim Sezgin <[email protected]> Committed: Fri Apr 17 18:36:55 2015 -0700 ---------------------------------------------------------------------- .../DriverConfigurationProviders.java | 2 +- .../reef/common/ConfigurationProvider.java | 32 -------------------- .../EvaluatorConfigurationProviders.java | 2 +- .../common/client/REEFImplementation.java | 4 +-- .../evaluator/AllocatedEvaluatorImpl.java | 2 +- .../driver/evaluator/EvaluatorManager.java | 2 +- .../apache/reef/tang/ConfigurationProvider.java | 30 ++++++++++++++++++ .../local/client/LocalRuntimeConfiguration.java | 2 +- .../yarn/client/YarnClientConfiguration.java | 2 +- 9 files changed, 37 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/0da6b504/lang/java/reef-common/src/main/java/org/apache/reef/client/parameters/DriverConfigurationProviders.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/client/parameters/DriverConfigurationProviders.java b/lang/java/reef-common/src/main/java/org/apache/reef/client/parameters/DriverConfigurationProviders.java index 85cee64..87ecadb 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/client/parameters/DriverConfigurationProviders.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/client/parameters/DriverConfigurationProviders.java @@ -18,7 +18,7 @@ */ package org.apache.reef.client.parameters; -import org.apache.reef.common.ConfigurationProvider; +import org.apache.reef.tang.ConfigurationProvider; import org.apache.reef.tang.annotations.Name; import org.apache.reef.tang.annotations.NamedParameter; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/0da6b504/lang/java/reef-common/src/main/java/org/apache/reef/common/ConfigurationProvider.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/common/ConfigurationProvider.java b/lang/java/reef-common/src/main/java/org/apache/reef/common/ConfigurationProvider.java deleted file mode 100644 index 7eeb42d..0000000 --- a/lang/java/reef-common/src/main/java/org/apache/reef/common/ConfigurationProvider.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.reef.common; - -import org.apache.reef.tang.Configuration; - -/** - * Objects that can provide a Configuration implement this interface. - */ -public interface ConfigurationProvider { - - /** - * @return a Configuration provided by this instance. - */ - Configuration getConfiguration(); -} http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/0da6b504/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/EvaluatorConfigurationProviders.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/EvaluatorConfigurationProviders.java b/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/EvaluatorConfigurationProviders.java index a1dbff8..b4adcd7 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/EvaluatorConfigurationProviders.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/EvaluatorConfigurationProviders.java @@ -18,7 +18,7 @@ */ package org.apache.reef.driver.parameters; -import org.apache.reef.common.ConfigurationProvider; +import org.apache.reef.tang.ConfigurationProvider; import org.apache.reef.tang.annotations.Name; import org.apache.reef.tang.annotations.NamedParameter; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/0da6b504/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/REEFImplementation.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/REEFImplementation.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/REEFImplementation.java index cb9f982..42bf1fd 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/REEFImplementation.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/REEFImplementation.java @@ -23,7 +23,7 @@ import org.apache.reef.annotations.audience.ClientSide; import org.apache.reef.annotations.audience.Private; import org.apache.reef.client.REEF; import org.apache.reef.client.parameters.DriverConfigurationProviders; -import org.apache.reef.common.ConfigurationProvider; +import org.apache.reef.tang.ConfigurationProvider; import org.apache.reef.proto.ClientRuntimeProtocol.JobSubmissionProto; import org.apache.reef.runtime.common.client.api.JobSubmissionHandler; import org.apache.reef.runtime.common.launch.parameters.ErrorHandlerRID; @@ -34,13 +34,11 @@ import org.apache.reef.tang.annotations.Name; import org.apache.reef.tang.annotations.NamedParameter; import org.apache.reef.tang.annotations.Parameter; import org.apache.reef.util.REEFVersion; -import org.apache.reef.util.logging.Config; import org.apache.reef.util.logging.LoggingScope; import org.apache.reef.util.logging.LoggingScopeFactory; import javax.inject.Inject; import java.util.Set; -import java.util.logging.Level; import java.util.logging.Logger; @ClientSide http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/0da6b504/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/AllocatedEvaluatorImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/AllocatedEvaluatorImpl.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/AllocatedEvaluatorImpl.java index 754cd3a..d96d369 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/AllocatedEvaluatorImpl.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/AllocatedEvaluatorImpl.java @@ -20,7 +20,7 @@ package org.apache.reef.runtime.common.driver.evaluator; import org.apache.reef.annotations.audience.DriverSide; import org.apache.reef.annotations.audience.Private; -import org.apache.reef.common.ConfigurationProvider; +import org.apache.reef.tang.ConfigurationProvider; import org.apache.reef.driver.context.ContextConfiguration; import org.apache.reef.driver.evaluator.AllocatedEvaluator; import org.apache.reef.driver.evaluator.EvaluatorDescriptor; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/0da6b504/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManager.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManager.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManager.java index 241892a..ce148b8 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManager.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManager.java @@ -20,7 +20,7 @@ package org.apache.reef.runtime.common.driver.evaluator; import org.apache.reef.annotations.audience.DriverSide; import org.apache.reef.annotations.audience.Private; -import org.apache.reef.common.ConfigurationProvider; +import org.apache.reef.tang.ConfigurationProvider; import org.apache.reef.driver.context.ActiveContext; import org.apache.reef.driver.context.FailedContext; import org.apache.reef.driver.evaluator.AllocatedEvaluator; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/0da6b504/lang/java/reef-common/src/main/java/org/apache/reef/tang/ConfigurationProvider.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/tang/ConfigurationProvider.java b/lang/java/reef-common/src/main/java/org/apache/reef/tang/ConfigurationProvider.java new file mode 100644 index 0000000..b94a6c6 --- /dev/null +++ b/lang/java/reef-common/src/main/java/org/apache/reef/tang/ConfigurationProvider.java @@ -0,0 +1,30 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.reef.tang; + +/** + * Objects that can provide a Configuration implement this interface. + */ +public interface ConfigurationProvider { + + /** + * @return a Configuration provided by this instance. + */ + Configuration getConfiguration(); +} http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/0da6b504/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/LocalRuntimeConfiguration.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/LocalRuntimeConfiguration.java b/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/LocalRuntimeConfiguration.java index 55e305b..03b3087 100644 --- a/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/LocalRuntimeConfiguration.java +++ b/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/LocalRuntimeConfiguration.java @@ -19,7 +19,7 @@ package org.apache.reef.runtime.local.client; import org.apache.reef.client.parameters.DriverConfigurationProviders; -import org.apache.reef.common.ConfigurationProvider; +import org.apache.reef.tang.ConfigurationProvider; import org.apache.reef.runtime.common.client.CommonRuntimeConfiguration; import org.apache.reef.runtime.common.client.api.JobSubmissionHandler; import org.apache.reef.runtime.common.files.RuntimeClasspathProvider; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/0da6b504/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/YarnClientConfiguration.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/YarnClientConfiguration.java b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/YarnClientConfiguration.java index c5a7e23..4351a3f 100644 --- a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/YarnClientConfiguration.java +++ b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/YarnClientConfiguration.java @@ -21,7 +21,7 @@ package org.apache.reef.runtime.yarn.client; import org.apache.reef.annotations.audience.ClientSide; import org.apache.reef.annotations.audience.Public; import org.apache.reef.client.parameters.DriverConfigurationProviders; -import org.apache.reef.common.ConfigurationProvider; +import org.apache.reef.tang.ConfigurationProvider; import org.apache.reef.runtime.common.client.CommonRuntimeConfiguration; import org.apache.reef.runtime.common.client.api.JobSubmissionHandler; import org.apache.reef.runtime.common.files.RuntimeClasspathProvider;
