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

Add Templating #792

Merged
merged 3 commits into from
Aug 8, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
add to parent
1. add a few things to the parent pom.xml (both app engine &
appengine-java8)
2. Fix some copyrights.
  • Loading branch information
Les Vogel committed Aug 8, 2017
commit 380cc7036b83c845b1eefab22d50a5d33b44cb55
6 changes: 6 additions & 0 deletions appengine-java8/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,15 @@
<module>mailgun</module>
<module>mailjet</module>
<module>memcache</module>

<module>metadata</module>

<module>multitenancy</module>

<module>oauth2</module>

<module>postgres</module>

<module>requests</module>

<module>remote-client</module>
Expand Down
7 changes: 7 additions & 0 deletions appengine/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@
<module>endpoints-frameworks-v2/migration-example</module>
<module>firebase-event-proxy/gae-firebase-event-proxy</module>
<module>firebase-tictactoe</module>

<module>gaeinfo</module>

<module>guestbook-objectify</module>
<module>helloworld</module>
<module>helloworld-new-plugins</module>
Expand All @@ -74,7 +77,11 @@
<module>sendgrid</module>
<module>remote/remote-client</module>
<module>remote/remote-server</module>

<module>sockets</module>

<module>static-files</module>

<module>taskqueue-push</module>
<module>twilio</module>
<module>urlfetch</module>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/**
* Copyright 2017 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.
*/
package com.example.appengine.sockets;

import java.io.IOException;
Expand Down
15 changes: 15 additions & 0 deletions appengine/sockets/src/main/webapp/WEB-INF/appengine-web.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright 2017 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.
-->
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
<threadsafe>true</threadsafe>
<ssl-enabled>true</ssl-enabled>
Expand Down
15 changes: 15 additions & 0 deletions appengine/sockets/src/main/webapp/WEB-INF/web.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright 2017 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.
-->
<!DOCTYPE web-app PUBLIC
"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd">
Expand Down
15 changes: 15 additions & 0 deletions appengine/sockets/src/main/webapp/redirect.jsp
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
<!--
~ Copyright 2017 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.
-->
<%
request.getRequestDispatcher("/whois").forward(request, response);
%>