Skip to content

Commit 5de7575

Browse files
author
Jonathan Simon
committed
Updates to pom.xml and more licences added
1 parent 5e3de39 commit 5de7575

File tree

5 files changed

+66
-50
lines changed

5 files changed

+66
-50
lines changed

‎appengine/taskqueue/pull/pom.xml

Lines changed: 9 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright 2015 Google Inc. All Rights Reserved.
3+
Copyright 2016 Google Inc. All Rights Reserved.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.
@@ -22,23 +22,17 @@ Copyright 2015 Google Inc. All Rights Reserved.
2222
<groupId>com.example.taskqueue</groupId>
2323
<artifactId>taskqueue</artifactId>
2424

25-
<properties>
26-
<app.version>1</app.version>
27-
<appengine.version>1.9.34</appengine.version>
28-
<gcloud.plugin.version>2.0.9.74.v20150814</gcloud.plugin.version>
29-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
30-
<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
31-
</properties>
32-
33-
<prerequisites>
34-
<maven>3.1.0</maven>
35-
</prerequisites>
25+
<parent>
26+
<artifactId>doc-samples</artifactId>
27+
<groupId>com.google.cloud</groupId>
28+
<version>1.0.0</version>
29+
<relativePath>../../..</relativePath>
30+
</parent>
3631
<dependencies>
3732
<!-- Compile/runtime dependencies -->
3833
<dependency>
3934
<groupId>com.google.appengine</groupId>
4035
<artifactId>appengine-api-1.0-sdk</artifactId>
41-
<version>${appengine.version}</version>
4236
</dependency>
4337
<dependency>
4438
<groupId>javax.servlet</groupId>
@@ -56,13 +50,11 @@ Copyright 2015 Google Inc. All Rights Reserved.
5650
<dependency>
5751
<groupId>com.google.appengine</groupId>
5852
<artifactId>appengine-testing</artifactId>
59-
<version>${appengine.version}</version>
6053
<scope>test</scope>
6154
</dependency>
6255
<dependency>
6356
<groupId>com.google.appengine</groupId>
6457
<artifactId>appengine-api-stubs</artifactId>
65-
<version>${appengine.version}</version>
6658
<scope>test</scope>
6759
</dependency>
6860
</dependencies>
@@ -74,7 +66,6 @@ Copyright 2015 Google Inc. All Rights Reserved.
7466
<plugin>
7567
<groupId>org.codehaus.mojo</groupId>
7668
<artifactId>versions-maven-plugin</artifactId>
77-
<version>2.1</version>
7869
<executions>
7970
<execution>
8071
<phase>compile</phase>
@@ -87,56 +78,25 @@ Copyright 2015 Google Inc. All Rights Reserved.
8778
</plugin>
8879
<plugin>
8980
<groupId>org.apache.maven.plugins</groupId>
90-
<version>3.1</version>
9181
<artifactId>maven-compiler-plugin</artifactId>
9282
<configuration>
9383
<source>1.7</source>
9484
<target>1.7</target>
9585
</configuration>
9686
</plugin>
97-
<plugin>
98-
<groupId>org.apache.maven.plugins</groupId>
99-
<artifactId>maven-war-plugin</artifactId>
100-
<version>2.4</version>
101-
<configuration>
102-
<archiveClasses>true</archiveClasses>
103-
<webResources>
104-
<!-- in order to interpolate version from pom into appengine-web.xml -->
105-
<resource>
106-
<directory>${basedir}/src/main/webapp/WEB-INF</directory>
107-
<filtering>true</filtering>
108-
<targetPath>WEB-INF</targetPath>
109-
</resource>
110-
</webResources>
111-
</configuration>
112-
</plugin>
113-
11487
<plugin>
11588
<groupId>com.google.appengine</groupId>
11689
<artifactId>appengine-maven-plugin</artifactId>
117-
<version>${appengine.version}</version>
118-
<configuration>
119-
<enableJarClasses>false</enableJarClasses>
120-
<version>${app.version}</version>
121-
<!-- Comment in the below snippet to bind to all IPs instead of just localhost -->
122-
<!-- address>0.0.0.0</address>
123-
<port>8080</port -->
124-
<!-- Comment in the below snippet to enable local debugging with a remote debugger
125-
like those included with Eclipse or IntelliJ -->
126-
<!-- jvmFlags>
127-
<jvmFlag>-agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n</jvmFlag>
128-
</jvmFlags -->
129-
</configuration>
90+
<version>${appengine.sdk.version}</version>
13091
</plugin>
13192
<plugin>
13293
<groupId>com.google.appengine</groupId>
13394
<artifactId>gcloud-maven-plugin</artifactId>
134-
<version>${gcloud.plugin.version}</version>
95+
<version>${appengine.sdk.version}</version>
13596
<configuration>
13697
<set_default>true</set_default>
13798
</configuration>
13899
</plugin>
139100
</plugins>
140101
</build>
141102
</project>
142-

‎appengine/taskqueue/pull/src/main/webapp/WEB-INF/appengine-web.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- [START_EXCLUDE] -->
3+
<!--
4+
Copyright 2016 Google Inc. All Rights Reserved.
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
http://www.apache.org/licenses/LICENSE-2.0
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+
-->
15+
<!-- [END_EXCLUDE] -->
216
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
317
<application>YOUR-PROJECT-ID</application>
418
<version>YOUR-VERSION-ID</version>

‎appengine/taskqueue/pull/src/main/webapp/WEB-INF/logging.properties

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# Copyright 2016 Google Inc. All Rights Reserved.
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+
115
# A default java.util.logging configuration.
216
# (All App Engine logging is through java.util.logging by default).
317
#

‎appengine/taskqueue/pull/src/main/webapp/WEB-INF/web.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- [START_EXCLUDE] -->
3+
<!--
4+
Copyright 2016 Google Inc. All Rights Reserved.
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
http://www.apache.org/licenses/LICENSE-2.0
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+
-->
15+
<!-- [END_EXCLUDE] -->
216
<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
317
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
418
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee

‎appengine/taskqueue/pull/src/main/webapp/tasks.jsp

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
<!DOCTYPE html>
2+
<!--
3+
Copyright 2016 Google Inc. All Rights Reserved.
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
http://www.apache.org/licenses/LICENSE-2.0
8+
Unless required by applicable law or agreed to in writing, software
9+
distributed under the License is distributed on an "AS IS" BASIS,
10+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
See the License for the specific language governing permissions and
12+
limitations under the License.
13+
-->
114
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
215
<%@ page import="java.util.List" %>
316
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
@@ -18,10 +31,11 @@
1831
<textarea name="content" placeholder="Enter a task payload" rows="3" cols="60"></textarea></div>
1932
<div><input type="submit" name="addTask" value="Add Tasks to the Task Queue"/></div>
2033
</form>
34+
<br>
2135
<form action="/taskqueue" method="post">
2236
<div><input type="submit" name="leaseTask" value="Lease, Process, and Delete Tasks"/></div>
2337
</form>
24-
38+
<br>
2539
<div>
2640
${message}
2741
<br><br>

0 commit comments

Comments
 (0)