Skip to content

Commit f5ce930

Browse files
Convert to Kotlin
1 parent b76dfce commit f5ce930

16 files changed

+566
-693
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
build
22
/.apt_generated/
33
/.gradle/
4+
/bin/

build.gradle.kts

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
import net.wasdev.wlp.gradle.plugins.extensions.FeatureExtension
2+
import net.wasdev.wlp.gradle.plugins.extensions.ServerExtension
3+
import kotlin.collections.mapOf
4+
5+
plugins {
6+
kotlin("jvm") version "1.2.50"
7+
id("net.wasdev.wlp.gradle.plugins.Liberty") version "2.2"
8+
war
9+
}
10+
11+
repositories {
12+
mavenCentral()
13+
}
14+
15+
dependencies {
16+
compile(kotlin("stdlib-jdk8"))
17+
providedCompile("javax", "javaee-api", "8.0")
18+
}
19+
20+
java.sourceCompatibility = JavaVersion.VERSION_1_8
21+
22+
val httpPort by extra { 8080 }
23+
val httpsPort by extra { 9443 }
24+
25+
liberty {
26+
server = ServerExtension()
27+
server.name = "forecastServer"
28+
server.dropins = listOf(tasks.getByName("war"))
29+
server.bootstrapProperties = mapOf("httpPort" to httpPort, "httpsPort" to httpsPort)
30+
server.configDirectory = file("src/main/liberty/config")
31+
32+
server.features = FeatureExtension()
33+
server.features.acceptLicense = true
34+
}
35+
36+
tasks.getByName("clean").dependsOn("libertyStop")
37+

gradle/wrapper/gradle-wrapper.jar

-366 Bytes
Binary file not shown.
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Jul 20 22:53:37 CDT 2017
1+
#Sun Jul 01 11:00:29 CDT 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-all.zip

gradlew

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
3333
# Use the maximum available, or set MAX_FD != -1 to use that value.
3434
MAX_FD="maximum"
3535

36-
warn ( ) {
36+
warn () {
3737
echo "$*"
3838
}
3939

40-
die ( ) {
40+
die () {
4141
echo
4242
echo "$*"
4343
echo
@@ -155,7 +155,7 @@ if $cygwin ; then
155155
fi
156156

157157
# Escape application args
158-
save ( ) {
158+
save () {
159159
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160160
echo " "
161161
}

settings.gradle.kts

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/*
2+
* This file was generated by the Gradle 'init' task.
3+
*
4+
* The settings file is used to specify which projects to include in your build.
5+
*
6+
* Detailed information about configuring a multi-project build in Gradle can be found
7+
* in the user guide at https://docs.gradle.org/4.8.1/userguide/multi_project_builds.html
8+
*/
9+
10+
rootProject.name = "ForecastDiscussions"

src/main/java/forecast/CurrentForecastServlet.java

-310
This file was deleted.

0 commit comments

Comments
 (0)