You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by ma...@apache.org on 2014/01/15 22:38:08 UTC
[45/50] [abbrv] git commit: more code review feedback.
more code review feedback.
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/7d71ef74
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/7d71ef74
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/7d71ef74
Branch: refs/heads/mansu/AURORA-4187_scheduler_home_page-no-seed
Commit: 7d71ef74ba32336a5bb1f0f37309ddcd54a8a0c4
Parents: a306c0d
Author: Suman Karumuri <sk...@twitter.com>
Authored: Mon Jan 13 11:37:16 2014 -0800
Committer: Suman Karumuri <sk...@twitter.com>
Committed: Mon Jan 13 15:24:40 2014 -0800
----------------------------------------------------------------------
build.gradle | 2 --
.../aurora/scheduler/http/ServletModule.java | 21 +++++++-------------
2 files changed, 7 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/7d71ef74/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index e59c5e8..4a0372f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -203,7 +203,6 @@ task generateSources(dependsOn: 'bootstrapThrift') {
inputs.file inputFiles
outputs.dir outputDir
doFirst {
- // Generate Java and Javascript thrift files.
outputDir.exists() || outputDir.mkdirs()
inputFiles.each { File file ->
exec {
@@ -211,7 +210,6 @@ task generateSources(dependsOn: 'bootstrapThrift') {
args = ['--gen', 'java:hashcode', '--gen', 'js', '-o', outputDir, file]
}
}
-
// These are the 'root' structs, the tool recursively generates all composed structs.
// TODO(wfarner): Change codegen tool to generate for all structs in a thrift file.
['JobConfiguration', 'Lock', 'ScheduledTask', 'Quota'].each {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/7d71ef74/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java b/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
index df1739c..2c20de0 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
@@ -31,6 +31,11 @@ import com.google.inject.servlet.GuiceFilter;
import com.sun.jersey.api.container.filter.GZIPContentEncodingFilter;
import com.sun.jersey.guice.JerseyServletModule;
import com.sun.jersey.guice.spi.container.servlet.GuiceContainer;
+
+import org.apache.aurora.scheduler.quota.QuotaManager;
+import org.apache.aurora.scheduler.state.CronJobManager;
+import org.apache.aurora.scheduler.state.SchedulerCore;
+
import com.twitter.common.application.http.Registration;
import com.twitter.common.application.modules.LifecycleModule;
import com.twitter.common.application.modules.LocalServiceRegistry;
@@ -39,10 +44,6 @@ import com.twitter.common.net.pool.DynamicHostSet;
import com.twitter.common.net.pool.DynamicHostSet.MonitorException;
import com.twitter.thrift.ServiceInstance;
-import org.apache.aurora.scheduler.quota.QuotaManager;
-import org.apache.aurora.scheduler.state.CronJobManager;
-import org.apache.aurora.scheduler.state.SchedulerCore;
-
import static com.sun.jersey.api.core.ResourceConfig.PROPERTY_CONTAINER_REQUEST_FILTERS;
import static com.sun.jersey.api.core.ResourceConfig.PROPERTY_CONTAINER_RESPONSE_FILTERS;
import static com.sun.jersey.api.json.JSONConfiguration.FEATURE_POJO_MAPPING;
@@ -175,8 +176,8 @@ public class ServletModule extends AbstractModule {
* A function to handle all assets related to the UI client.
*/
private void registerUIClient() {
- registerAngular();
- registerSmartTable();
+ registerAsset("bower_components/smart-table/Smart-Table.debug.js", "/js/smartTable.js", false);
+ registerAsset("bower_components/angular/angular.js", "/js/angular.js", false);
registerAsset("ReadOnlyScheduler.js", "/js/readOnlyScheduler.js", false);
registerAsset("api_types.js", "/js/apiTypes.js", false);
@@ -193,14 +194,6 @@ public class ServletModule extends AbstractModule {
registerAsset("ui/js/services.js", "/js/services.js");
}
- private void registerSmartTable() {
- registerAsset("bower_components/smart-table/Smart-Table.debug.js", "/js/smartTable.js", false);
- }
-
- private void registerAngular() {
- registerAsset("bower_components/angular/angular.js", "/js/angular.js", false);
- }
-
private void registerAsset(String resourceLocation, String registerLocation) {
registerAsset(resourceLocation, registerLocation, true);
}