Skip to content

Commit 636778b

Browse files
authored
Merge branch 'master' into videointelligence_v1beta1
2 parents 1312548 + b09f9fd commit 636778b

File tree

18 files changed

+1069
-1
lines changed

18 files changed

+1069
-1
lines changed
+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pom.xml
2+
src/*
3+
web/*
4+
Dockerfile
5+
app.yaml

appengine-java8/bigtable/README.md

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
Bigtable-hello-j8
2+
=================
3+
4+
Moves the Bigtable Hello World application to Google App Engine Standard for Java 8.
5+
6+
7+
* [Java 8](http://www.oracle.com/technetwork/java/javase/downloads/index.html)
8+
* [Maven](https://maven.apache.org/download.cgi) (at least 3.3.9)
9+
* [Gradle](https://gradle.org)
10+
* [Google Cloud SDK](https://cloud.google.com/sdk/) (aka gcloud)
11+
12+
Initialize the Google Cloud SDK using:
13+
14+
gcloud init
15+
16+
gcloud auth application-default login
17+
18+
Then you need to [Create a Cloud Bigtable Instance](https://cloud.google.com/bigtable/docs/creating-instance)
19+
20+
21+
## Using Maven
22+
23+
### Run Locally
24+
25+
mvn -Dbigtable.projectID=PROJECTID -Dbigtable.instanceID=INSTANCEID appengine:run
26+
27+
### Deploy to App Engine Standard for Java 8
28+
29+
mvn -Dbigtable.projectID=PROJECTID -Dbigtable.instanceID=INSTANCEID appengine:deploy
30+
31+
### Run Integration Tests
32+
33+
mvn -Dbigtable.projectID=PROJECTID -Dbigtable.instanceID=INSTANCEID verify
34+
35+
## Using Gradle
36+
37+
### Run Locally
38+
39+
gradle -Dbigtable.projectID=PROJECTID -Dbigtable.instanceID=INSTANCEID appengineRun
40+
41+
### Integration Tests & Deploy to App Engine Standard for Java 8
42+
43+
gradle -Dbigtable.projectID=PROJECTID -Dbigtable.instanceID=INSTANCEID appengineDeploy
44+
45+
As you add / modify the source code (`src/main/java/...`) it's very useful to add
46+
[unit testing](https://cloud.google.com/appengine/docs/java/tools/localunittesting)
47+
to (`src/main/test/...`). The following resources are quite useful:
48+
49+
* [JUnit4](http://junit.org/junit4/)
50+
* [Mockito](http://mockito.org/)
51+
* [Truth](http://google.github.io/truth/)
52+
53+
### When done
54+
55+
Cloud Bigtable Instances should be [deleted](https://cloud.google.com/bigtable/docs/deleting-instance)
56+
when they are no longer being used as they use significant resources.

appengine-java8/bigtable/build.gradle

+113
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
// Copyright 2017 Google Inc.
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
// [START gradle]
15+
buildscript { // Configuration for building
16+
repositories {
17+
jcenter() // Bintray's repository - a fast Maven Central mirror & more
18+
mavenCentral()
19+
}
20+
dependencies {
21+
classpath 'com.google.cloud.tools:appengine-gradle-plugin:1.3.1'
22+
classpath 'org.akhikhl.gretty:gretty:+'
23+
}
24+
}
25+
26+
apply plugin: 'java'
27+
apply plugin: 'war'
28+
apply plugin: 'org.akhikhl.gretty' // To get webappcopy
29+
apply plugin: 'com.google.cloud.tools.appengine'
30+
31+
group = 'com.example.google.cloud.bigtable'
32+
version = '0.1-SNAPSHOT'
33+
34+
sourceCompatibility = 1.8
35+
targetCompatibility = 1.8
36+
37+
tasks.withType(JavaCompile) {
38+
options.encoding = 'UTF-8'
39+
}
40+
41+
repositories {
42+
maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
43+
jcenter()
44+
mavenCentral()
45+
}
46+
47+
dependencies {
48+
compile group: 'com.google.cloud.bigtable', name: 'bigtable-hbase-1.2', version:'0.9.6.2'
49+
compile group: 'org.apache.hbase', name: 'hbase-client', version:'1.2.4'
50+
compile group: 'io.netty', name: 'netty-tcnative-boringssl-static', version:'1.1.33.Fork26'
51+
compile group: 'jstl', name: 'jstl', version:'1.2'
52+
53+
providedCompile group: 'javax.servlet', name: 'javax.servlet-api', version:'3.1.0'
54+
55+
testCompile group: 'com.google.truth', name: 'truth', version:'0.30'
56+
testCompile group: 'junit', name: 'junit', version:'4.12'
57+
testCompile group: 'org.mockito', name: 'mockito-all', version:'1.10.19'
58+
}
59+
60+
import org.apache.tools.ant.filters.ReplaceTokens
61+
gretty {
62+
contextPath = '/'
63+
servletContainer = 'jetty9'
64+
65+
jvmArgs = [ '-DBIGTABLE_PROJECT=' + System.getProperty("bigtable.projectID"),
66+
'-DBIGTABLE_INSTANCE=' + System.getProperty("bigtable.instanceID")]
67+
68+
webappCopy {
69+
// Enable filtering on all xml files in WEB-INF
70+
filesMatching "**/WEB-INF/*.xml", { FileCopyDetails fileDetails ->
71+
logger.lifecycle 'File filtered: {}', fileDetails.path
72+
filter (ReplaceTokens, tokens: [
73+
'bigtable.projectID' : System.getProperty("bigtable.projectID"),
74+
'bigtable.instanceID': System.getProperty("bigtable.instanceID")
75+
])
76+
}
77+
}
78+
}
79+
80+
// Always run unit tests
81+
appengineDeploy.dependsOn test
82+
83+
// [START model]
84+
appengine {
85+
run {
86+
87+
}
88+
deploy { // deploy configuration
89+
stopPreviousVersion = true // default - stop the current version
90+
promote = true // default - & make this the current version
91+
}
92+
}
93+
94+
test {
95+
useJUnit()
96+
testLogging.showStandardStreams = true
97+
98+
systemProperty 'BIGTABLE_PROJECT', System.getProperty("bigtable.projectID")
99+
systemProperty 'BIGTABLE_INSTANCE',System.getProperty("bigtable.instanceID")
100+
101+
beforeTest { descriptor ->
102+
logger.lifecycle("test: " + descriptor + " Running")
103+
}
104+
105+
onOutput { descriptor, event ->
106+
logger.lifecycle("test: " + descriptor + ": " + event.message )
107+
}
108+
afterTest { descriptor, result ->
109+
logger.lifecycle("test: " + descriptor + ": " + result )
110+
}
111+
}
112+
// [END model]
113+
// [END gradle]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#Mon Apr 03 21:11:48 PDT 2017
2+
distributionBase=GRADLE_USER_HOME
3+
distributionPath=wrapper/dists
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip

appengine-java8/bigtable/gradlew

+172
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,172 @@
1+
#!/usr/bin/env sh
2+
3+
##############################################################################
4+
##
5+
## Gradle start up script for UN*X
6+
##
7+
##############################################################################
8+
9+
# Attempt to set APP_HOME
10+
# Resolve links: $0 may be a link
11+
PRG="$0"
12+
# Need this for relative symlinks.
13+
while [ -h "$PRG" ] ; do
14+
ls=`ls -ld "$PRG"`
15+
link=`expr "$ls" : '.*-> \(.*\)$'`
16+
if expr "$link" : '/.*' > /dev/null; then
17+
PRG="$link"
18+
else
19+
PRG=`dirname "$PRG"`"/$link"
20+
fi
21+
done
22+
SAVED="`pwd`"
23+
cd "`dirname \"$PRG\"`/" >/dev/null
24+
APP_HOME="`pwd -P`"
25+
cd "$SAVED" >/dev/null
26+
27+
APP_NAME="Gradle"
28+
APP_BASE_NAME=`basename "$0"`
29+
30+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31+
DEFAULT_JVM_OPTS=""
32+
33+
# Use the maximum available, or set MAX_FD != -1 to use that value.
34+
MAX_FD="maximum"
35+
36+
warn ( ) {
37+
echo "$*"
38+
}
39+
40+
die ( ) {
41+
echo
42+
echo "$*"
43+
echo
44+
exit 1
45+
}
46+
47+
# OS specific support (must be 'true' or 'false').
48+
cygwin=false
49+
msys=false
50+
darwin=false
51+
nonstop=false
52+
case "`uname`" in
53+
CYGWIN* )
54+
cygwin=true
55+
;;
56+
Darwin* )
57+
darwin=true
58+
;;
59+
MINGW* )
60+
msys=true
61+
;;
62+
NONSTOP* )
63+
nonstop=true
64+
;;
65+
esac
66+
67+
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
68+
69+
# Determine the Java command to use to start the JVM.
70+
if [ -n "$JAVA_HOME" ] ; then
71+
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
72+
# IBM's JDK on AIX uses strange locations for the executables
73+
JAVACMD="$JAVA_HOME/jre/sh/java"
74+
else
75+
JAVACMD="$JAVA_HOME/bin/java"
76+
fi
77+
if [ ! -x "$JAVACMD" ] ; then
78+
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
79+
80+
Please set the JAVA_HOME variable in your environment to match the
81+
location of your Java installation."
82+
fi
83+
else
84+
JAVACMD="java"
85+
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
86+
87+
Please set the JAVA_HOME variable in your environment to match the
88+
location of your Java installation."
89+
fi
90+
91+
# Increase the maximum file descriptors if we can.
92+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
93+
MAX_FD_LIMIT=`ulimit -H -n`
94+
if [ $? -eq 0 ] ; then
95+
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
96+
MAX_FD="$MAX_FD_LIMIT"
97+
fi
98+
ulimit -n $MAX_FD
99+
if [ $? -ne 0 ] ; then
100+
warn "Could not set maximum file descriptor limit: $MAX_FD"
101+
fi
102+
else
103+
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
104+
fi
105+
fi
106+
107+
# For Darwin, add options to specify how the application appears in the dock
108+
if $darwin; then
109+
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
110+
fi
111+
112+
# For Cygwin, switch paths to Windows format before running java
113+
if $cygwin ; then
114+
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
115+
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
116+
JAVACMD=`cygpath --unix "$JAVACMD"`
117+
118+
# We build the pattern for arguments to be converted via cygpath
119+
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
120+
SEP=""
121+
for dir in $ROOTDIRSRAW ; do
122+
ROOTDIRS="$ROOTDIRS$SEP$dir"
123+
SEP="|"
124+
done
125+
OURCYGPATTERN="(^($ROOTDIRS))"
126+
# Add a user-defined pattern to the cygpath arguments
127+
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
128+
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
129+
fi
130+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
131+
i=0
132+
for arg in "$@" ; do
133+
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
134+
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
135+
136+
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
137+
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
138+
else
139+
eval `echo args$i`="\"$arg\""
140+
fi
141+
i=$((i+1))
142+
done
143+
case $i in
144+
(0) set -- ;;
145+
(1) set -- "$args0" ;;
146+
(2) set -- "$args0" "$args1" ;;
147+
(3) set -- "$args0" "$args1" "$args2" ;;
148+
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
149+
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
150+
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
151+
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
152+
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
153+
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
154+
esac
155+
fi
156+
157+
# Escape application args
158+
save ( ) {
159+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160+
echo " "
161+
}
162+
APP_ARGS=$(save "$@")
163+
164+
# Collect all arguments for the java command, following the shell quoting and substitution rules
165+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
166+
167+
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
168+
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
169+
cd "$(dirname "$0")"
170+
fi
171+
172+
exec "$JAVACMD" "$@"

0 commit comments

Comments
 (0)