Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
gate
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
openmole
gate
Commits
ef432cd3
Commit
ef432cd3
authored
May 21, 2015
by
Mathieu leclaire
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add go Taskkey
parent
5188f1f6
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
48 additions
and
10 deletions
+48
-10
web.xml
client/src/main/resources/webapp/WEB-INF/web.xml
+0
-0
bootstrap.min.css
client/src/main/resources/webapp/css/bootstrap.min.css
+0
-0
d3.css
client/src/main/resources/webapp/css/d3.css
+0
-0
Client.scala
client/src/main/scala/fr/iscpif/client/Client.scala
+2
-1
ScalaWUIBuild.scala
project/ScalaWUIBuild.scala
+46
-4
d3.v3.min.js
server/src/main/webapp/js/d3.v3.min.js
+0
-5
No files found.
server/src/main
/webapp/WEB-INF/web.xml
→
client/src/main/resources
/webapp/WEB-INF/web.xml
View file @
ef432cd3
File moved
server/src/main
/webapp/css/bootstrap.min.css
→
client/src/main/resources
/webapp/css/bootstrap.min.css
View file @
ef432cd3
File moved
server/src/main
/webapp/css/d3.css
→
client/src/main/resources
/webapp/css/d3.css
View file @
ef432cd3
File moved
client/src/main/scala/fr/iscpif/client/Client.scala
View file @
ef432cd3
...
...
@@ -11,7 +11,8 @@ import scala.scalajs.concurrent.JSExecutionContext.Implicits.runNow
import
shared._
import
upickle._
import
autowire._
@JSExport
@JSExport
(
"Client"
)
object
Client
{
val
helloValue
=
Var
(
0
)
...
...
project/Scala
TraJSTagsWireRx
Build.scala
→
project/Scala
WUI
Build.scala
View file @
ef432cd3
...
...
@@ -5,8 +5,10 @@ import org.scalatra.sbt._
import
org.scalatra.sbt.PluginKeys._
import
org.scalajs.sbtplugin.ScalaJSPlugin
import
org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
import
com.earldouglas.xsbtwebplugin.PluginKeys.webappResources
import
java.io.File
object
Scala
TraJSTagsWireRx
Build
extends
Build
{
object
Scala
WUI
Build
extends
Build
{
val
Organization
=
"fr.iscpif"
val
Name
=
"ScalaTraJSTagsWireRx"
val
Version
=
"0.1.0-SNAPSHOT"
...
...
@@ -22,7 +24,7 @@ object ScalaTraJSTagsWireRxBuild extends Build {
lazy
val
client
=
Project
(
"client"
,
file
(
"
./
client"
),
file
(
"client"
),
settings
=
Seq
(
version
:=
Version
,
scalaVersion
:=
ScalaVersion
,
...
...
@@ -40,13 +42,14 @@ object ScalaTraJSTagsWireRxBuild extends Build {
lazy
val
server
=
Project
(
"server"
,
file
(
"
./
server"
),
file
(
"server"
),
settings
=
ScalatraPlugin
.
scalatraWithJRebel
++
Seq
(
organization
:=
Organization
,
name
:=
Name
,
version
:=
Version
,
scalaVersion
:=
ScalaVersion
,
resolvers
++=
Resolvers
,
webappResources
in
Compile
:=
Seq
(
target
.
value
/
"webapp"
),
libraryDependencies
++=
Seq
(
"com.lihaoyi"
%%
"autowire"
%
"0.2.5"
,
"com.lihaoyi"
%%
"upickle"
%
"0.2.7"
,
...
...
@@ -55,8 +58,47 @@ object ScalaTraJSTagsWireRxBuild extends Build {
"org.scalatra"
%%
"scalatra-specs2"
%
ScalatraVersion
%
"test"
,
"ch.qos.logback"
%
"logback-classic"
%
"1.0.12"
%
"runtime"
,
"org.eclipse.jetty"
%
"jetty-webapp"
%
"8.1.17.v20150415"
%
"container"
,
"org.eclipse.jetty.orbit"
%
"javax.servlet"
%
"3.0.0.v201112011016"
%
"container;provided;test"
/*artifacts (Artifact("javax.servlet", "jar", "jar"))*/
"org.eclipse.jetty.orbit"
%
"javax.servlet"
%
"3.0.0.v201112011016"
%
"container;provided;test"
)
)
).
dependsOn
(
shared
)
lazy
val
go
=
taskKey
[
Unit
](
"go"
)
lazy
val
bootstrap
=
Project
(
"bootstrap"
,
file
(
"target/bootstrap"
),
settings
=
Seq
(
version
:=
Version
,
scalaVersion
:=
ScalaVersion
,
(
go
<<=
(
fullOptJS
in
client
in
Compile
,
resourceDirectory
in
client
in
Compile
,
target
in
server
in
Compile
)
map
{
(
ct
,
r
,
st
)
=>
copy
(
ct
,
r
,
st
)
}
)
)
)
dependsOn
(
client
,
server
)
private
def
copy
(
clientTarget
:
Attributed
[
File
],
resources
:
File
,
serverTarget
:
File
)
=
{
clientTarget
.
map
{
ct
=>
recursiveCopy
(
new
File
(
resources
,
"webapp"
),
new
File
(
serverTarget
.
getAbsolutePath
,
"webapp"
))
recursiveCopy
(
ct
,
new
File
(
serverTarget
,
"webapp/js/"
+
ct
.
getName
))
}
}
private
def
recursiveCopy
(
from
:
File
,
to
:
File
)
:
Unit
=
{
if
(
from
.
isDirectory
)
{
to
.
mkdirs
()
for
{
f
←
from
.
listFiles
()
}
recursiveCopy
(
f
,
new
File
(
to
,
f
.
getName
))
}
else
if
(!
to
.
exists
()
||
from
.
lastModified
()
>
to
.
lastModified
)
{
println
(
s
"Copy file $from to $to "
)
from
.
getParentFile
.
mkdirs
IO
.
copyFile
(
from
,
to
,
preserveLastModified
=
true
)
}
}
}
server/src/main/webapp/js/d3.v3.min.js
deleted
100644 → 0
View file @
5188f1f6
This source diff could not be displayed because it is too large. You can
view the blob
instead.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment