Skip to content

Commit

Permalink
Merge branch 'master' into language-encoding-test
Browse files Browse the repository at this point in the history
  • Loading branch information
gguuss authored May 18, 2017
2 parents dd23041 + 9dd1fbe commit 8391dd6
Showing 1 changed file with 22 additions and 0 deletions.
22 changes: 22 additions & 0 deletions appengine-java8/bigtable/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,13 @@ buildscript { // Configuration for building
}
dependencies {
classpath 'com.google.cloud.tools:appengine-gradle-plugin:1.3.1'
classpath 'org.akhikhl.gretty:gretty:+'
}
}

apply plugin: 'java'
apply plugin: 'war'
apply plugin: 'org.akhikhl.gretty' // To get webappcopy
apply plugin: 'com.google.cloud.tools.appengine'

group = 'com.example.google.cloud.bigtable'
Expand Down Expand Up @@ -55,6 +57,26 @@ dependencies {
testCompile group: 'org.mockito', name: 'mockito-all', version:'1.10.19'
}

import org.apache.tools.ant.filters.ReplaceTokens
gretty {
contextPath = '/'
servletContainer = 'jetty9'

jvmArgs = [ '-DBIGTABLE_PROJECT=' + System.getProperty("bigtable.projectID"),
'-DBIGTABLE_INSTANCE=' + System.getProperty("bigtable.instanceID")]

webappCopy {
// Enable filtering on all xml files in WEB-INF
filesMatching "**/WEB-INF/*.xml", { FileCopyDetails fileDetails ->
logger.lifecycle 'File filtered: {}', fileDetails.path
filter (ReplaceTokens, tokens: [
'bigtable.projectID' : System.getProperty("bigtable.projectID"),
'bigtable.instanceID': System.getProperty("bigtable.instanceID")
])
}
}
}

// Always run unit tests
appengineDeploy.dependsOn test

Expand Down

0 comments on commit 8391dd6

Please sign in to comment.