Skip to content

Commit 3b1490f

Browse files
gguussgguuss
committed
Merging with master
2 parents e3bb44a + 4d98005 commit 3b1490f

File tree

123 files changed

+3305
-1044
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+3305
-1044
lines changed

‎.github/templates/README.md

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Markdown Templates for Google Cloud Platform Samples for Java
2+
3+
The `.mdpp` files in this directory are templates used in READMEs relating to
4+
Google Cloud samples for Java.
5+
6+
## Before you begin
7+
8+
Install [MarkdownPP](https://github.com/jreese/markdown-pp), a preprocessor for
9+
Markdown files. (Requires Python and PIP)
10+
11+
pip install MarkdownPP
12+
13+
## Rendering the templates
14+
15+
for readme in **/README.mdpp; do
16+
(
17+
cd $(dirname "$readme")
18+
markdown-pp README.mdpp -o README.md
19+
)
20+
done
21+
22+
Java is a registered trademark of Oracle Corporation and/or its affiliates.
23+

‎.github/templates/appengine-flexible-before-you-begin.mdpp

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
## Before you begin
2+
3+
1. Follow the [quickstart for Java in the App Engine flexible
4+
environment](https://cloud.google.com/appengine/docs/flexible/java/quickstart) to
5+
set up your environment to deploy the sample applications App Engine.
6+
1. Download and install the [Google Cloud SDK](https://cloud.google.com/sdk/docs/).
7+
1. [Install and configure Apache Maven](http://maven.apache.org/index.html).
8+
1. [Create a new Google Cloud Platform project, or use an existing
9+
one](https://console.cloud.google.com/project).
10+
1. [Enable billing for your
11+
project](https://support.google.com/cloud/answer/6293499#enable-billing).
12+
1. Initialize the Cloud SDK.
13+
14+
gcloud init

‎.github/templates/appengine-flexible-deploy.mdpp

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
## Deploying to App Engine
2+
3+
To run the application locally, use the Maven Jetty plugin.
4+
5+
mvn clean jetty:run-exploded
6+
7+
View the app at [localhost:8080](http://localhost:8080).
8+
9+
To deploy the app to App Engine, run
10+
11+
mvn clean appengine:deploy
12+
13+
After the deploy finishes (can take up to 10 minutes), you can view your application at
14+
`https://YOUR_PROJECT.appspot.com`, where `YOUR_PROJECT` is your Google Cloud project ID. You can
15+
see the new version deployed on the [App Engine section of the Google Cloud
16+
Console](https://console.cloud.google.com/appengine/versions).
17+
18+
For a more detailed walkthrough, see the [getting started
19+
guide for Java in the App Engine flexible
20+
environment](https://cloud.google.com/java/getting-started/hello-world).
21+

‎.github/templates/getting-sample-code.mdpp

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
## Getting the sample code
2+
3+
Get the latest sample code from GitHub using Git or download the repository as a ZIP file.
4+
([Download](https://github.com/GoogleCloudPlatform/java-docs-samples/archive/master.zip))
5+
6+
git clone https://github.com/GoogleCloudPlatform/java-docs-samples.git
7+

‎appengine/appidentity/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<dependency>
4141
<groupId>com.google.guava</groupId>
4242
<artifactId>guava</artifactId>
43-
<version>19.0</version>
43+
<version>20.0</version>
4444
</dependency>
4545
<dependency>
4646
<groupId>javax.servlet</groupId>

‎appengine/cloudsql/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>mysql</groupId>
4646
<artifactId>mysql-connector-java</artifactId>
47-
<version>6.0.4</version>
47+
<version>6.0.5</version>
4848
</dependency>
4949
<!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
5050
<dependency>

‎appengine/datastore/geo/src/main/java/com/example/appengine/GeoServlet.java

-175
This file was deleted.

‎appengine/datastore/geo/src/main/java/com/example/appengine/StartupServlet.java

-80
This file was deleted.

‎appengine/datastore/geo/src/main/webapp/WEB-INF/appengine-web.xml

-21
This file was deleted.

‎appengine/datastore/geo/src/main/webapp/WEB-INF/datastore-indexes.xml

-26
This file was deleted.

0 commit comments

Comments
 (0)