Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Flex app merge #632

Closed
wants to merge 13 commits into from
Closed
Prev Previous commit
Next Next commit
cleanup : pom, readme
jabubake committed Apr 25, 2017
commit 83695baf0967922152f1570a45ec6fedff9e698f
201 changes: 0 additions & 201 deletions flexible/custom-runtime/async-rest/LICENSE

This file was deleted.

1 change: 0 additions & 1 deletion flexible/custom-runtime/async-rest/README.md
Original file line number Diff line number Diff line change
@@ -45,4 +45,3 @@ To automatically stage and deploy the webapp to your project in the cloud do:
mvn appengine:deploy

See here for more information on the [GCloud Maven Plugin](https://github.com/GoogleCloudPlatform/gcloud-maven-plugin).

Original file line number Diff line number Diff line change
@@ -16,4 +16,3 @@ org.eclipse.jetty.STACKS=true

## If LONG is true, fully qualified package names are used rather than abbreviations
org.eclipse.jetty.LONG=false

Original file line number Diff line number Diff line change
@@ -57,6 +57,5 @@ <h1>Blocking vs Asynchronous REST</h1>
</tfoot>
</table>


</body>
</html>
15 changes: 15 additions & 0 deletions flexible/custom-runtime/endpoints/pom.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2015 Google Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

15 changes: 15 additions & 0 deletions flexible/custom-runtime/endpoints/src/main/appengine/app.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# Copyright 2015 Google Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# [START appyaml]
runtime: custom
env: flex

@@ -10,3 +24,4 @@ beta_settings:
use_endpoints_api_management: true
# Specify the Open API specification.
endpoints_swagger_spec_file: openapi.yaml
# [END appyaml]
15 changes: 15 additions & 0 deletions flexible/custom-runtime/endpoints/src/main/appengine/openapi.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# Copyright 2015 Google Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# [START openapiyaml]
swagger: "2.0"
info:
description: "A simple Google Cloud Endpoints API example."
@@ -104,3 +118,4 @@ securityDefinitions:
type: "oauth2"
x-issuer: "accounts.google.com"
x-jwks_uri: "https://www.googleapis.com/oauth2/v1/certs"
# [END openapiyaml]
4 changes: 0 additions & 4 deletions flexible/custom-runtime/extending-runtime/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
# Java extending runtime sample for Google App Engine Flexible
This sample demonstrates how to use custom runtime on Google App Engine Flexible

## Setup

... ??
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
# Copyright 2016 Google Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# [START appyaml]
runtime: custom
env: flexible

handlers:
- url: /.*
script: this field is required, but ignored
# [END appyaml]
15 changes: 15 additions & 0 deletions flexible/custom-runtime/sparkjava/src/main/appengine/app.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,17 @@
# Copyright 2016 Google Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# [START appyaml]
runtime: custom
env: flex
# [END appyaml]
5 changes: 2 additions & 3 deletions flexible/java-runtime/samples/README.md
Original file line number Diff line number Diff line change
@@ -16,7 +16,6 @@ Get the latest sample code from GitHub using Git or download the repository as a

git clone https://github.com/GoogleCloudPlatform/java-docs-samples.git


## Before you begin

1. Follow the [quickstart for Java in the App Engine flexible
@@ -39,8 +38,8 @@ parameter in [pom.xml](pom.xml).
`flexible.samples` accepts `all`as default, or a string separated list of package names,
eg. `cloudsql, analytics`

To build and deploy individual samples, navigate to the appropriate package under
the [samples-source](samples-source) directory.
To build and deploy individual samples, navigate to the README.md of the package under
the [samples-source](samples-source) director


To run the application locally, use the Maven Jetty plugin.
9 changes: 9 additions & 0 deletions flexible/java-runtime/samples/samples-builder/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Samples Builder

Creates a single deployable Flex application from Flex sample applications under
[samples-source](../samples-source).

# Run
`mvn package` creates the single Flex application under [samples](..).
Packages included in the application can be configured using `flexible.samples` property
in the parent [pom.xml](../pom.xml)
5 changes: 3 additions & 2 deletions flexible/java-runtime/samples/samples-builder/pom.xml
Original file line number Diff line number Diff line change
@@ -29,6 +29,7 @@
<properties>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<samples-output.dir>${project.parent.basedir}/samples-runner</samples-output.dir>
</properties>

<dependencies>
@@ -77,7 +78,7 @@
</goals>
<inherited>false</inherited>
<configuration>
<workingDirectory>${project.parent.basedir}/samples-runner</workingDirectory>
<workingDirectory>${samples-output.dir}</workingDirectory>
<executable>mvn</executable>
<arguments>
<argument>
@@ -94,7 +95,7 @@
</goals>
<inherited>false</inherited>
<configuration>
<workingDirectory>${project.parent.basedir}/samples-runner</workingDirectory>
<workingDirectory>${samples-output.dir}</workingDirectory>
<executable>mvn</executable>
<arguments>
<argument>
Original file line number Diff line number Diff line change
@@ -29,7 +29,6 @@
import java.util.Map;
import java.util.stream.Collectors;


class MergeYaml {

Yaml yaml;
Loading