Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ifwe #1

Open
wants to merge 413 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
413 commits
Select commit Hold shift + click to select a range
a585795
tryint to get null timestamp working for endTime
Jun 13, 2014
5ea9167
refactor TrackHistory a little bit; wire into ProofEngine
jeromebanks Jun 13, 2014
d6c8c18
timestamp null is broken
Jun 13, 2014
f693fd2
fixed null timestamp errors
Jun 13, 2014
244c838
start unit tests for abort
jeromebanks Jun 13, 2014
11b300e
fixing completeRun
Jun 13, 2014
88a26fa
finished testing start/completeRun
Jun 13, 2014
37c8616
tested lookupGoalRun
Jun 13, 2014
979d438
finish Abort and Restart logic
jeromebanks Jun 13, 2014
66e1d4b
implemented jobhistory
Jun 14, 2014
74f5147
Merge remote-tracking branch 'upstream/master'
Jun 16, 2014
84a076e
finished TrackHistory but willrogers global is broken. Huh?
Jun 16, 2014
750cfd8
trackhistory
Jun 16, 2014
33074a8
clean up jobhistory
Jun 16, 2014
67c78d7
first pass through TrackHistory done
Jun 16, 2014
aec94cc
fix non-partitioned table'
jeromebanks Jun 17, 2014
1e4cd9d
Merge pull request #43 from yyin/master
Jun 17, 2014
6ff6f65
rm .cache file
jeromebanks Jun 17, 2014
49faf3c
Merge branch 'master' of https://github.tagged.com/jbanks/satisfactio…
jeromebanks Jun 17, 2014
17da268
patching willrogers trackhistory
Jun 17, 2014
9f61b68
refactor again; add witness to json mapping function
jeromebanks Jun 17, 2014
50b719f
update readme for deployment
jeromebanks Jun 17, 2014
2513772
first stable trackhistory UI - still lots of work to do
Jun 18, 2014
b193598
willrogers talks to trackhistory now keep truckin along
Jun 18, 2014
421c883
get service running on stagine
jeromebanks Jun 18, 2014
c5b58ac
implement UI for lookup Goals - just truckin along
Jun 18, 2014
db872d2
filter has been implemented need to check if startTime and endTime ac…
Jun 18, 2014
ba5286b
core trackHistory is implemented
Jun 18, 2014
f36412b
attemp to publish to maven
jeromebanks Jun 18, 2014
e656273
jobhistory complete
Jun 19, 2014
e4af340
Merge remote-tracking branch 'upstream/master'
Jun 19, 2014
111324e
Merge pull request #54 from yyin/master
Jun 19, 2014
0f5b184
a
Jun 19, 2014
87294a8
update track history
jeromebanks Jun 20, 2014
39bcf64
Merge remote-tracking branch 'upstream/master'
Jun 20, 2014
ca963c4
trying to fix build issues
Jun 20, 2014
f62fbe9
corrected SOME build issues
Jun 20, 2014
1890507
working on autoscrolling issue in willrogers
Jun 20, 2014
fbf5d81
finished willrogers scrollbottom and reloadfactory - need to get newe…
Jun 21, 2014
90224ba
prepare for merge with jbanks master
Jun 21, 2014
830fce2
change to newer trackhistory ready to merge with master
Jun 21, 2014
40b2a15
attempt to build project on jenkins
jeromebanks Jun 23, 2014
18decea
bump minor version
jeromebanks Jun 23, 2014
ab892ba
bump minor version
jeromebanks Jun 23, 2014
0106be6
bump up version
jeromebanks Jun 23, 2014
a1bb040
Merge branch 'yyin-master'
jeromebanks Jun 23, 2014
8dd7435
balance braces
jeromebanks Jun 23, 2014
ac93535
set jenkins file to 'jobs'
jeromebanks Jun 23, 2014
4c0e558
rm rpmbuild option
jeromebanks Jun 23, 2014
7160763
move placement of jdk
jeromebanks Jun 23, 2014
fe8e9cb
publish each project individually
jeromebanks Jun 23, 2014
cc9536b
add typesafe repo
jeromebanks Jun 24, 2014
4c66a68
remove overrides property
jeromebanks Jun 24, 2014
f54a022
temporarily remove dependency on avro-serde
jeromebanks Jun 24, 2014
a895098
fix logwindow
Jun 24, 2014
021ed0b
Merge remote-tracking branch 'upstream/master'
Jun 24, 2014
6f32100
fix for logwindow - remove fake log progression
Jun 24, 2014
a04e24f
for plugins, publish ivy style
jeromebanks Jun 24, 2014
73767db
Merge pull request #57 from yyin/master
Jun 25, 2014
4328965
enhance willrogers scheduler - dont run duplicate jobs
Jun 30, 2014
0478ff6
added run-forever-trait
Jun 30, 2014
79920da
Merge pull request #60 from yyin/master
Jul 1, 2014
9a6875d
fixed unscheduling
Jul 2, 2014
f8b24ae
adding willrogers ui for scheduler update
Jul 2, 2014
5213e8a
last minute fixes for sourcing
jeromebanks Jul 2, 2014
2caf24f
settup logging for rpm deployment
jeromebanks Jul 3, 2014
27d9d47
fixes to installer
jeromebanks Jul 7, 2014
5ec2f96
added logic to run constant jobs
Jul 7, 2014
8d29224
Merge remote-tracking branch 'upstream/master'
Jul 7, 2014
8f8f5ee
Merge pull request #65 from yyin/master
Jul 7, 2014
7af545c
make trackHistory table usable
Jul 8, 2014
b198e7d
refactor scheduling
jeromebanks Jul 9, 2014
5b04b94
updates to scheduling
jeromebanks Jul 10, 2014
84af432
normalize names generated from witnesses
jeromebanks Jul 10, 2014
b803fe2
partial fix for logwindow page
Jul 11, 2014
7b0abcc
fixes to goal and sheduling
jeromebanks Jul 11, 2014
e8e8f8e
Merge remote-tracking branch 'upstream/master'
Jul 14, 2014
e4a3e35
tests around reharvesting ..
jeromebanks Jul 14, 2014
16de6dc
Merge pull request #72 from yyin/master
Jul 14, 2014
513910d
bug fix to logwrapper paths; attempt reharvest changes...
jeromebanks Jul 16, 2014
7ac7cbd
fixes to scheduling; specify scheduling offset
jeromebanks Jul 21, 2014
c5bf7a3
fix typo
jeromebanks Jul 23, 2014
0c0851d
handle goals with slashes
jeromebanks Jul 23, 2014
269f69a
fix bugs in scheduler ; refactor interface
jeromebanks Jul 25, 2014
6dd16fc
fixes to lowenstein branch
jeromebanks Jul 28, 2014
2058cfb
fix encoding for goal and track names
jeromebanks Jul 28, 2014
b6f7b89
bump up version; and remove references to com.klout
jeromebanks Aug 4, 2014
642b678
very simple email notification
jeromebanks Aug 5, 2014
d6abdb1
allow hive goals to create HivePartitionGroups, instead of just Hive…
jeromebanks Aug 5, 2014
0929873
clean up HiveTablePartitionGroup
jeromebanks Aug 6, 2014
d822f5f
check in wip; notifications, retries, refactorings
jeromebanks Aug 16, 2014
e233742
added partition variables for last-partition
Aug 19, 2014
1e7e71b
Merge remote-tracking branch 'upstream/master'
Aug 19, 2014
217a153
add logic for previous partition
Aug 19, 2014
2e95f64
rm shell references
Aug 19, 2014
a51e2f8
Merge pull request #114 from yyin/master
Aug 19, 2014
9a25ebb
wip; addding progressable; retry notifications
jeromebanks Aug 20, 2014
68cd3a1
Merge branch 'master' of https://github.tagged.com/jbanks/satisfactio…
jeromebanks Aug 20, 2014
b2db33f
up RPM version
jeromebanks Aug 20, 2014
0fb2c05
bug fix in track ordering
jeromebanks Aug 21, 2014
aae88e3
change alterPartition method and added twoHoursAgoVariable
Aug 22, 2014
def0ad5
Merge remote-tracking branch 'upstream/master'
Aug 22, 2014
2fccf08
After creating a partition, mark it as complete
jeromebanks Aug 23, 2014
39ce836
try to urlencode track and witness names
jeromebanks Aug 23, 2014
e2d2d88
Merge pull request #116 from yyin/master
Aug 23, 2014
3a034f1
try to fix classloader nonsense
jeromebanks Aug 28, 2014
3d5c03e
catch errors on sourced files; try to improve logging
jeromebanks Aug 29, 2014
bcc7706
refactor Metrics and Progress; try to hide exposure to publish vars
jeromebanks Aug 30, 2014
3cd8f7e
fix problems with progress refactor
jeromebanks Sep 2, 2014
ba834e0
merge
Sep 2, 2014
65e4824
Merge remote-tracking branch 'upstream/master'
Sep 2, 2014
b780591
add more checks to HiveDriver; try to refactor TrackFactory; some UI…
jeromebanks Sep 3, 2014
a1c012f
use slickgrid for track history
Sep 3, 2014
56a448f
Merge remote-tracking branch 'upstream/master'
Sep 3, 2014
db28624
Merge pull request #119 from yyin/master
Sep 3, 2014
6e406e9
enhance trackHistory with slickgrid - same functionality as before bu…
Sep 4, 2014
93210cd
allow logwindow to view multiple attempts of a job run
jeromebanks Sep 4, 2014
002c548
fixes in HiveDriver; multiple job attempts
jeromebanks Sep 5, 2014
31fd891
trackHistory : change slickgrid to use dataview
Sep 5, 2014
b028faa
updates to global and evidence
jeromebanks Sep 8, 2014
4ed1ff2
git simple retry working
jeromebanks Sep 8, 2014
d2d4c49
trackHistory UI: substring filtering is working!
Sep 8, 2014
7839bd0
separate log output for multiple attempts on retries
jeromebanks Sep 8, 2014
1e898db
fix actor leak ...
jeromebanks Sep 8, 2014
87016f8
trackHistory: filter is complete
Sep 9, 2014
d26293f
fix to partitionExists
jeromebanks Sep 9, 2014
194f7a9
trackHistory: only load recent tracks
Sep 9, 2014
59c529e
implement functions for parentID in TrackHistory
Sep 10, 2014
74eb6e8
Merge remote-tracking branch 'upstream/master'
Sep 10, 2014
0cda6ac
make tests compile after refactor
jeromebanks Sep 10, 2014
1354575
Merge remote-tracking branch 'upstream/master'
Sep 10, 2014
7c2c0c9
trackHistory: set up subgoal - waiting for hooks
Sep 12, 2014
7ed24c4
Merge pull request #125 from yyin/master
Sep 12, 2014
4cf4861
logic for partition pruning
jeromebanks Sep 16, 2014
b8ca3ab
track down MapredLocalTaskBug and configuration bug ;
jeromebanks Sep 17, 2014
793a037
logHistory : core functionality complete. Need to style it
Sep 17, 2014
a8a95ef
Merge remote-tracking branch 'upstream/master'
Sep 17, 2014
b5cbc79
Add HistoryAgent; refactor and clean up akka proof engine
jeromebanks Sep 18, 2014
bd719a6
trying to get slickgrid to work for loghistory
Sep 19, 2014
bd31b14
refactor ProofEngine .. Add history; avoid actor leaks
jeromebanks Sep 19, 2014
cd68020
trackHistory : fix not-updating bug
Sep 22, 2014
12b28fe
Merge remote-tracking branch 'upstream/master'
Sep 22, 2014
1433274
Merge pull request #129 from yyin/master
Sep 22, 2014
c565a73
trackHistory: changed witness from table to string. Also added witnes…
Sep 22, 2014
ca37d7f
logHistory : finished. Need to fix attempt @ logWindow
Sep 23, 2014
9206a18
remove reference to ATS , add fold Dependencies
jeromebanks Sep 23, 2014
28a5d57
logHistory: logWindow displays correct file
Sep 24, 2014
28b8ef3
Merge remote-tracking branch 'upstream/master'
Sep 24, 2014
68bf5b4
Merge pull request #130 from yyin/master
Sep 24, 2014
7c9f00d
clean up logHistory code
Sep 24, 2014
70bc659
clean up goals on abort
jeromebanks Sep 25, 2014
6f8595d
Update Build.scala
Sep 25, 2014
d22e427
Merge pull request #131 from mdougherty/patch-1
Sep 26, 2014
6fbf0b6
rewire history agent
jeromebanks Sep 30, 2014
3d7129f
Merge branch 'master' of https://github.tagged.com/jbanks/satisfactio…
jeromebanks Sep 30, 2014
46211f3
rewire logHistory: allow attempts for logHistory only
Sep 30, 2014
1bc3791
Merge remote-tracking branch 'upstream/master'
Sep 30, 2014
1a99a63
allow dots in property names
jeromebanks Oct 1, 2014
3ccb661
Merge pull request #133 from yyin/master
Oct 1, 2014
a525abe
don't use jerome's trackpath
jeromebanks Oct 1, 2014
02aec3a
add simple filtering to uploadDependencies
jeromebanks Oct 3, 2014
29279c8
fix broken log windows
jeromebanks Oct 3, 2014
9c50442
more satisfy plugin
jeromebanks Oct 8, 2014
63e98d8
use environment variable to set build number
jeromebanks Oct 14, 2014
2c3d6f9
change version to be build number
jeromebanks Oct 14, 2014
0808df0
fix typo
jeromebanks Oct 14, 2014
a2dcd82
add dynamic dependencies to support auto partitioning
jeromebanks Oct 21, 2014
cd1bb22
bug fixes with job runner
jeromebanks Oct 22, 2014
fd441db
Use actors for evidence checking , in order to avoid blocking ...
jeromebanks Oct 23, 2014
3a58486
fix chained dependencies by forceing satisfy for now
jeromebanks Oct 24, 2014
a44701f
bugs in partition exists; allow forceSatisfy to use checked evidence
jeromebanks Oct 27, 2014
64fc344
check for no evidence
jeromebanks Oct 28, 2014
7402997
check evidence to see if already satisfied
jeromebanks Oct 28, 2014
117f2ec
bring RPM version down to 1
jeromebanks Oct 29, 2014
29bfdd3
as a workaround for HBASE-10304 , and hbase-protocol.jar as unmanage…
jeromebanks Oct 29, 2014
42e34cb
add if statement around rpm PREUN script
jeromebanks Oct 29, 2014
1af6007
add missing comma
jeromebanks Oct 29, 2014
3710549
add rpm publisher
jeromebanks Oct 29, 2014
06c1e78
use satisfierFactory instead of satisfiers ...
jeromebanks Nov 12, 2014
64d5234
problems with getAuxJars and hive.aux.jars.path
jeromebanks Nov 13, 2014
0b00824
remove spurious logging
jeromebanks Nov 13, 2014
3ff2674
cleanup hive driver auxjars
jeromebanks Nov 21, 2014
6dc0bc3
clean up HiveDriver
jeromebanks Nov 21, 2014
440340c
bump version again
jeromebanks Nov 21, 2014
5a3697d
try to workarond ClassNotFoundException
jeromebanks Dec 1, 2014
0d0b32d
try to diagnose hivedriver problems
jeromebanks Dec 5, 2014
0a8e397
fix issues with classloader isolation
jeromebanks Dec 18, 2014
e324e4a
create a caching streamhandler factory, so URLClassloaders with HDFS…
jeromebanks Dec 18, 2014
b72961e
force rpmRelease to 1 for TDS
jeromebanks Dec 19, 2014
241b9e0
WIP refactor HiveDriver; HBase problem ...
jeromebanks Dec 23, 2014
9e99e2a
fixes to caching urlclassloader
jeromebanks Dec 29, 2014
c94cfb5
use differnet Cacheing StreamHandlerFactory
jeromebanks Dec 29, 2014
4a2c152
change rpm version back
jeromebanks Dec 29, 2014
217de7f
fix SatisfierFactory to produce true isolation for Hive satisfiers !!!
jeromebanks Dec 31, 2014
e5a1929
Updated job DSL for stash move
Jan 9, 2015
aace77b
Fix whitespacE
Jan 9, 2015
bfe53be
plug Hive classloader leak
jeromebanks Jan 16, 2015
ee4ad6a
Merge branch 'master' of code.tagged.com:HADOOP/satisfaction-limbo
jeromebanks Jan 16, 2015
c1557ec
code cleanup
jeromebanks Jan 22, 2015
b957c89
code cleanup ; bump version number
jeromebanks Jan 22, 2015
5c3cb6f
add rpm templates; fix open file leak; upgrade versions of Akka, Pla…
jeromebanks Feb 4, 2015
b48408d
refactor JMX agent
jeromebanks Feb 5, 2015
a7d2fa7
reset rpmRelease to 1
jeromebanks Feb 9, 2015
ad63cb4
try to make currentProgress more resilient in less parallel environm…
jeromebanks Feb 12, 2015
f73a2be
try to do more akka configuration; remove some logging
jeromebanks Feb 12, 2015
ba463b3
bump rpmReleaes
jeromebanks Feb 12, 2015
b085512
change publishing style
jeromebanks Feb 23, 2015
bbdccf5
refactor to move out hive metastore dependencies
jeromebanks Feb 28, 2015
d1bcd20
remove possible classloader leaks ..
jeromebanks Mar 4, 2015
2d50bdf
remove zookeeper reference
jeromebanks Mar 4, 2015
7d69e05
fix ClassNotFound Exception
jeromebanks Mar 5, 2015
81e7f71
recurring is not constantly, schedule recurring jobs even if they a…
jeromebanks Mar 10, 2015
b0600d1
try to isolate Hive ThreadLocal
jeromebanks Mar 10, 2015
e63094d
add a poison pill if out of Perm Gen space
jeromebanks Mar 11, 2015
fe01cf4
make sure that close gets called
jeromebanks Mar 11, 2015
b84a01b
try to simplify hive closing; and JobRunner releasing
jeromebanks Mar 11, 2015
cc01ce1
don't produce metrics anymore
jeromebanks Mar 11, 2015
4693d10
trace loader closing; bump version
jeromebanks Mar 11, 2015
9463df8
add satisfaction-hive-ms module
jeromebanks Mar 11, 2015
f0a13dd
remove classloader leak from ms refactor
jeromebanks Mar 19, 2015
633d720
set rpmRelease back to 1
jeromebanks Mar 19, 2015
91db681
hold onto a metastore for 5 minutes ..
jeromebanks Mar 19, 2015
5c2370d
try to make continuous more robust; clean up output
jeromebanks Mar 24, 2015
958f1d9
try to workaround Cluster init bug
jeromebanks Mar 26, 2015
8523f43
fix diamond graph bug
jeromebanks Apr 14, 2015
f54a2f0
use RemoteIterator for accessing files on HDFS;
jeromebanks Apr 15, 2015
08f3836
change rpm release to 1
jeromebanks Apr 15, 2015
f3936df
fix new HDFS remoteiterator
jeromebanks Apr 15, 2015
5f42feb
revert implemention of Hdfs.listFiles
jeromebanks Apr 17, 2015
7f34833
fix constant jobs; add on thread pool for JobRunner; add Add file , …
jeromebanks May 5, 2015
87c94c1
configure akka threadpools for better throughput
jeromebanks May 6, 2015
4d6f658
remove @Override to force compile
jeromebanks May 6, 2015
056ffb2
avoid match error for isRunning
jeromebanks May 6, 2015
4e90a49
specify hive.aux.jars in properties;
jeromebanks May 7, 2015
2854850
don't have to specify version for hive.aux.jars.path
jeromebanks May 7, 2015
50f7c0f
fix ADD FILE regexes; Disctcp args; bump version
jeromebanks May 11, 2015
e2dca88
try one static thread pool for all jobs, not one per job
jeromebanks May 13, 2015
c7d8d91
set rpmRelease to 1
jeromebanks May 13, 2015
655665c
remove var dependency on paths; add PathExists satisfier
jeromebanks May 15, 2015
6d24c87
fix problems with temporals and paths, plug leaks
jeromebanks May 18, 2015
b35423b
bump version
jeromebanks May 18, 2015
d84aea3
fix naming on Hive MS data outputs
jeromebanks May 20, 2015
e212c07
No more poison pill
jeromebanks May 26, 2015
557ace5
update version of Hadoop
jeromebanks May 26, 2015
a4c9420
change location of HADOOP_HOME
jeromebanks May 26, 2015
ea2bd24
update hive version
jeromebanks May 27, 2015
ae3cf1f
use hdp and conjars repos
jeromebanks May 27, 2015
dc65ac3
fix mortbay dependency exclusion
jeromebanks May 27, 2015
ffdd051
fix typo
jeromebanks May 27, 2015
62fc46c
Merge branch 'master' of https://github.com/jeromebanks/satisfaction …
jeromebanks May 29, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions .jenkins/jobs/suite.dsl.groovy
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
@GrabResolver('https://artifactory.tagged.com/artifactory/libs-release-local/')
@Grab('com.tagged.build:jenkins-dsl-common:[0.1.0,)')

import com.tagged.build.scm.*
import com.tagged.build.common.*

def satisfaction = new Project(
jobFactory,
[
scm: new StashSCM(project: "hadoop", name: "satisfaction-limbo"),
hipchatRoom: 'Cluster Corner',
email: '[email protected]',
]
).basicJob {
description "Satisfaction Scheduler"
label "scala"
jdk "jdk 7u51"
steps {
sbt('sbt',
'\'project satisfaction-core\' clean publish',
'-Dsbt.log.noformat=true',
'-Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m')
sbt('sbt',
'\'project satisfaction-engine\' clean publish',
'-Dsbt.log.noformat=true',
'-Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m')
sbt('sbt',
'\'project satisfaction-hadoop\' clean publish',
'-Dsbt.log.noformat=true',
'-Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m')
sbt('sbt',
'\'project satisfaction-hive\' clean publish',
'-Dsbt.log.noformat=true',
'-Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m')
sbt('sbt',
'\'project satisfaction-hive-ms\' clean publish',
'-Dsbt.log.noformat=true',
'-Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m')
sbt('sbt',
'\'project willrogers\' package rpm:packageBin',
'-Dsbt.log.noformat=true',
'-Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m')
}
publishers {
archiveArtifacts('apps/willrogers/target/rpm/RPMS/noarch/*.rpm')
}
}
26 changes: 20 additions & 6 deletions apps/willrogers/app/controllers/ProjectPage.scala
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,32 @@ object ProjectPage extends Controller {
val trackOpt : Option[Track] = trackFactory.getTrack( trackDesc)
trackOpt match {
case Some(track) =>
val internalGoals = track.topLevelGoals.toList
val externalGoals = track.externalGoals.toList
val internalGoals = track.topLevelGoals.toList
val externalGoals = track.externalGoals.toList

val goalLogMap = LogWrapper.getGoalLogName(projName)
.filterNot(line => line == ".DS_Store")
Ok(views.html.showproject(track.descriptor, internalGoals map (_.name), externalGoals map (_.name), goalLogMap))
val goalLogMap = LogWrapper.getGoalLogName(track.descriptor.trackName)
.filterNot(line => line == ".DS_Store")

Ok(views.html.showproject(track.descriptor, internalGoals map (_.name), externalGoals map (_.name), goalLogMap))
case None =>
Ok( views.html.brokenproject( projName))
}

}


def refreshTrack( trackName : String ) = Action {
val td = TrackDescriptor(trackName)
val track = trackFactory.refreshTrack(td)
val internalGoals = track.topLevelGoals.toList
val externalGoals = track.externalGoals.toList

val goalLogMap = LogWrapper.getGoalLogName(track.descriptor.trackName)
.filterNot(line => line == ".DS_Store")

Ok(views.html.showproject(track.descriptor, internalGoals map (_.name), externalGoals map (_.name), goalLogMap))
}


def showProjectRuns (projName :String, goalName : String) = Action { // don't forget to add paging here later!
//for logHistory ( on track page)
Expand Down
3 changes: 1 addition & 2 deletions apps/willrogers/app/controllers/SatisfyGoalPage.scala
Original file line number Diff line number Diff line change
Expand Up @@ -357,5 +357,4 @@ object SatisfyGoalPage extends Controller with Logging {
val trackOpt : Option[Track] = ProjectPage.trackFactory.getTrack( trackDesc)
trackOpt.get
}

}
}
6 changes: 3 additions & 3 deletions apps/willrogers/app/controllers/ScheduleTrackPage.scala
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ object ScheduleTrackPage extends Controller {
val tdList = trackFactory.getAllTracks
//val tdList = Seq()

Ok(views.html.scheduletrack(tdList, scList.toSeq))
Ok(views.html.scheduletrack(tdList.toSeq, scList.toSeq))
}


Expand Down Expand Up @@ -119,8 +119,8 @@ object ScheduleTrackPage extends Controller {
println(" willrogers scheduler - I should be unscheduled!")

val scList = scheduler.getScheduledTracks.map(_._1).toSeq
val tdList = trackFactory.getAllTracks.diff(scList)
val tdList = trackFactory.getAllTracks.toSeq.diff(scList)
//Ok(views.html.scheduletrack(tdList, scList))
Ok(s"track "+trackName+" unscheduled")
}
}
}
6 changes: 4 additions & 2 deletions apps/willrogers/app/views/showproject.scala.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@



@main( s"Track ${trackDesc.trackName} ") {
@main(s"Track ${trackDesc.trackName} ") {

<h1>Track @trackDesc.trackName </h1>

Expand Down Expand Up @@ -39,6 +39,8 @@ <h3>External Dependencies</h3>


</tr>
<tr><td>Refresh Track</td>
<td> <button id="refreshTrackButton" onClick="window.location.href='/refreshTrack/@helper.urlEncode(trackDesc.trackName)'">Refresh</button></td></tr>
</table>

<div id ="[email protected]">
Expand Down Expand Up @@ -137,4 +139,4 @@ <h3> Goals</h3>
</script>


}
}
1 change: 1 addition & 0 deletions apps/willrogers/conf/routes
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ GET /logwindow/:trackName/:goalName/:varString willrogers.
GET /rawlog/:trackName/:goalName/:varString willrogers.controllers.SatisfyGoalPage.rawLog(trackName: String, goalName: String, varString : String)
GET /restart/:trackName/:goalName/:varString willrogers.controllers.SatisfyGoalPage.restartJob(trackName: String, goalName: String, varString : String)
GET /abort/:trackName/:goalName/:varString willrogers.controllers.SatisfyGoalPage.abortJob(trackName: String, goalName: String, varString : String)
GET /refreshTrack/:trackName willrogers.controllers.ProjectPage.refreshTrack(trackName: String)

POST /scheduletrack/:trackName/:forUser/:version willrogers.controllers.ScheduleTrackPage.scheduleTrack(trackName: String, forUser: String, version: String)
GET /unscheduleonejob/:trackName/:forUser/:version willrogers.controllers.ScheduleTrackPage.unscheduleOneTrack(trackName: String, forUser:String, version:String)
Expand Down
4 changes: 0 additions & 4 deletions apps/willrogers/public/booger.js

This file was deleted.

1 change: 1 addition & 0 deletions apps/willrogers/public/javascripts/ace-builds
Submodule ace-builds added at cf5367
4 changes: 0 additions & 4 deletions apps/willrogers/src/main/public/booger.js

This file was deleted.

Binary file removed apps/willrogers/src/main/public/images/favicon.png
Binary file not shown.
Binary file removed apps/willrogers/src/main/public/images/sort-asc.gif
Binary file not shown.
Binary file removed apps/willrogers/src/main/public/images/sort-asc.png
Binary file not shown.
Binary file removed apps/willrogers/src/main/public/images/sort-desc.gif
Binary file not shown.
Binary file removed apps/willrogers/src/main/public/images/sort-desc.png
Binary file not shown.
Loading