Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'release/0.2'

  • Loading branch information...
commit 934b8671470549b48d853068a3fbe1c40cbf30c9 2 parents a46f408 + 3ac6f97
@alessandro-aglietti authored
Showing with 349 additions and 2,014 deletions.
  1. +0 −13 games/.gitignore
  2. +0 −4 games/README.md
  3. +0 −58 games/doc.kml
  4. +0 −44 games/games-ear/pom.xml
  5. +0 −2  games/games-ear/src/main/application/META-INF/MANIFEST.MF
  6. +0 −4 games/games-ear/src/main/application/META-INF/appengine-application.xml
  7. +0 −11 games/games-ear/src/main/application/META-INF/application.xml
  8. BIN  games/games-war/src/main/webapp/static/3d/us_police_car/images/texture0.JPG
  9. BIN  games/games-war/src/main/webapp/static/3d/us_police_car/images/texture1.JPG
  10. BIN  games/games-war/src/main/webapp/static/3d/us_police_car/images/texture2.JPG
  11. BIN  games/games-war/src/main/webapp/static/3d/us_police_car/images/texture3.JPG
  12. +0 −1,828 games/games-war/src/main/webapp/static/3d/us_police_car/models/us_police_car.dae
  13. +0 −4 games/games-war/src/main/webapp/static/3d/us_police_car/textures.txt
  14. +0 −30 games/pom.xml
  15. +19 −0 google-app-engine/open-data-games/.gitignore
  16. +202 −0 google-app-engine/open-data-games/LICENSE
  17. +24 −0 google-app-engine/open-data-games/README.md
  18. +14 −0 google-app-engine/open-data-games/eclipse-launch-profiles/DevAppServer.launch
  19. +14 −0 google-app-engine/open-data-games/eclipse-launch-profiles/UpdateApplication.launch
  20. +52 −0 google-app-engine/open-data-games/nbactions.xml
  21. +22 −10 {games/games-war → google-app-engine/open-data-games}/pom.xml
  22. 0  {games/games-war → google-app-engine/open-data-games}/src/main/java/controllers/HelloWorldController.java
  23. 0  {games/games-war → google-app-engine/open-data-games}/src/main/webapp/3d.html
  24. +1 −2  {games/games-war → google-app-engine/open-data-games}/src/main/webapp/WEB-INF/appengine-web.xml
  25. 0  {games/games-war → google-app-engine/open-data-games}/src/main/webapp/WEB-INF/logging.properties
  26. +1 −4 {games/games-war → google-app-engine/open-data-games}/src/main/webapp/WEB-INF/web.xml
  27. 0  {games/games-war → google-app-engine/open-data-games}/src/main/webapp/about.html
  28. 0  {games/games-war → google-app-engine/open-data-games}/src/main/webapp/game.html
  29. 0  {games/games-war → google-app-engine/open-data-games}/src/main/webapp/index.html
  30. 0  {games/games-war → google-app-engine/open-data-games}/src/main/webapp/static/3d/U-Boat_Type_XXIII/doc.kml
  31. 0  ...rarr; google-app-engine/open-data-games}/src/main/webapp/static/3d/U-Boat_Type_XXIII/images/Color_008_1.jpg
  32. 0  ...oogle-app-engine/open-data-games}/src/main/webapp/static/3d/U-Boat_Type_XXIII/images/Color_008noCulling.jpg
  33. 0  ...r; google-app-engine/open-data-games}/src/main/webapp/static/3d/U-Boat_Type_XXIII/images/I19cascosub1_1.jpg
  34. 0  ...le-app-engine/open-data-games}/src/main/webapp/static/3d/U-Boat_Type_XXIII/images/I19cascosub1noCulling.jpg
  35. 0  ... google-app-engine/open-data-games}/src/main/webapp/static/3d/U-Boat_Type_XXIII/images/Interior_Texture.jpg
  36. 0  ...p-engine/open-data-games}/src/main/webapp/static/3d/U-Boat_Type_XXIII/images/Interior_Texture1noCulling.jpg
  37. 0  ...oogle-app-engine/open-data-games}/src/main/webapp/static/3d/U-Boat_Type_XXIII/images/Material2noCulling.jpg
  38. 0  ...oogle-app-engine/open-data-games}/src/main/webapp/static/3d/U-Boat_Type_XXIII/images/Material3noCulling.jpg
  39. 0  ...oogle-app-engine/open-data-games}/src/main/webapp/static/3d/U-Boat_Type_XXIII/images/Material6noCulling.jpg
  40. 0  ... → google-app-engine/open-data-games}/src/main/webapp/static/3d/U-Boat_Type_XXIII/images/Material7.jpg
  41. 0  ...gle-app-engine/open-data-games}/src/main/webapp/static/3d/U-Boat_Type_XXIII/images/Metal_RoughnoCulling.jpg
  42. 0  ...gle-app-engine/open-data-games}/src/main/webapp/static/3d/U-Boat_Type_XXIII/images/Wood__FloornoCulling.jpg
  43. 0  ...google-app-engine/open-data-games}/src/main/webapp/static/3d/U-Boat_Type_XXIII/models/U-Boat_Type_XXIII.dae
  44. 0  ...ames-war → google-app-engine/open-data-games}/src/main/webapp/static/3d/U-Boat_Type_XXIII/textures.txt
  45. 0  {games/games-war → google-app-engine/open-data-games}/src/main/webapp/static/3d/gorilla/doc.kml
  46. 0  ...es/games-war → google-app-engine/open-data-games}/src/main/webapp/static/3d/gorilla/models/gorilla.dae
  47. 0  {games/games-war → google-app-engine/open-data-games}/src/main/webapp/static/3d/gorilla/textures.txt
  48. 0  {games/games-war → google-app-engine/open-data-games}/src/main/webapp/static/3d/us_police_car/doc.kml
  49. 0  {games → google-app-engine/open-data-games/src/main/webapp/static/3d/us_police_car}/images/texture0.JPG
  50. 0  {games → google-app-engine/open-data-games/src/main/webapp/static/3d/us_police_car}/images/texture1.JPG
  51. 0  {games → google-app-engine/open-data-games/src/main/webapp/static/3d/us_police_car}/images/texture2.JPG
  52. 0  {games → google-app-engine/open-data-games/src/main/webapp/static/3d/us_police_car}/images/texture3.JPG
  53. 0  ... → google-app-engine/open-data-games/src/main/webapp/static/3d/us_police_car}/models/us_police_car.dae
  54. 0  {games → google-app-engine/open-data-games/src/main/webapp/static/3d/us_police_car}/textures.txt
  55. 0  ...ames-war → google-app-engine/open-data-games}/src/main/webapp/static/bootstrap/css/bootstrap-theme.css
  56. 0  ...-war → google-app-engine/open-data-games}/src/main/webapp/static/bootstrap/css/bootstrap-theme.min.css
  57. 0  {games/games-war → google-app-engine/open-data-games}/src/main/webapp/static/bootstrap/css/bootstrap.css
  58. 0  .../games-war → google-app-engine/open-data-games}/src/main/webapp/static/bootstrap/css/bootstrap.min.css
  59. 0  ... google-app-engine/open-data-games}/src/main/webapp/static/bootstrap/fonts/glyphicons-halflings-regular.eot
  60. 0  ... google-app-engine/open-data-games}/src/main/webapp/static/bootstrap/fonts/glyphicons-halflings-regular.svg
  61. 0  ... google-app-engine/open-data-games}/src/main/webapp/static/bootstrap/fonts/glyphicons-halflings-regular.ttf
  62. 0  ...google-app-engine/open-data-games}/src/main/webapp/static/bootstrap/fonts/glyphicons-halflings-regular.woff
  63. 0  {games/games-war → google-app-engine/open-data-games}/src/main/webapp/static/bootstrap/js/bootstrap.js
  64. 0  ...es/games-war → google-app-engine/open-data-games}/src/main/webapp/static/bootstrap/js/bootstrap.min.js
  65. 0  {games/games-war → google-app-engine/open-data-games}/src/main/webapp/static/css/starter-template.css
  66. 0  {games/games-war → google-app-engine/open-data-games}/src/main/webapp/static/jquery/jquery-1.10.2.min.js
  67. 0  {games/games-war → google-app-engine/open-data-games}/src/main/webapp/static/jquery/jquery-1.10.2.min.map
  68. 0  {games/games-war → google-app-engine/open-data-games}/src/main/webapp/static/js/3d.js
  69. 0  {games/games-war → google-app-engine/open-data-games}/src/main/webapp/static/js/game.js
  70. 0  {games/games-war → google-app-engine/open-data-games}/src/main/webapp/static/maps/icons/robbery.png
View
13 games/.gitignore
@@ -1,13 +0,0 @@
-target/
-build/
-.gradle
-datanucleus.log
-.DS_Store
-out
-*.iml
-*.ipr
-*.iws
-.idea
-.settings
-.classpath
-.project
View
4 games/README.md
@@ -1,4 +0,0 @@
-appengine-skeleton
-=============================
-
-This is a generated application from the appengine-skeleton archetype.
View
58 games/doc.kml
@@ -1,58 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<kml xmlns='http://earth.google.com/kml/2.1'>
-<Folder>
- <name>us_police_car</name>
- <description><![CDATA[Created with <a href="http://sketchup.google.com/">Google SketchUp 6.4.112</a>]]></description>
- <DocumentSource>SketchUp</DocumentSource>
-<visibility>1</visibility>
-<LookAt>
-<heading>312.912</heading>
-<tilt>78.3144</tilt>
-<latitude>40.01695940148679</latitude>
-<longitude>-105.2829506113175</longitude>
-<range>8.809863295748702</range>
-<altitude>1.80949002528324</altitude>
-</LookAt>
-<Folder>
-<name>Tour</name>
-<Placemark>
-<name>Camera</name>
-<visibility>1</visibility>
-<LookAt>
-<heading>312.912</heading>
-<tilt>78.3144</tilt>
-<latitude>40.01695940148679</latitude>
-<longitude>-105.2829506113175</longitude>
-<range>8.809863295748702</range>
-<altitude>1.80949002528324</altitude>
-</LookAt>
-</Placemark>
-</Folder>
- <Placemark>
- <name>Model</name>
- <description><![CDATA[]]></description>
- <Style id='default'>
- </Style>
- <Model>
- <altitudeMode>relativeToGround</altitudeMode>
- <Location>
- <longitude>-105.283000000000</longitude>
- <latitude>40.017000000000</latitude>
- <altitude>0.000000000000</altitude>
- </Location>
- <Orientation>
- <heading>0</heading>
- <tilt>0</tilt>
- <roll>0</roll>
- </Orientation>
- <Scale>
- <x>1.0</x>
- <y>1.0</y>
- <z>1.0</z>
- </Scale>
- <Link>
- <href>models/us_police_car.dae</href>
- </Link>
- </Model>
- </Placemark></Folder>
-</kml>
View
44 games/games-ear/pom.xml
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>opend.data</groupId>
- <artifactId>games-ear</artifactId>
- <version>0.0.1</version>
- <packaging>ear</packaging>
-
- <parent>
- <groupId>opend.data</groupId>
- <artifactId>games</artifactId>
- <version>0.0.1</version>
- </parent>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ear-plugin</artifactId>
- <version>2.8</version>
- <configuration>
- <version>5</version>
- <defaultLibBundleDir>lib</defaultLibBundleDir>
- <unpackTypes>war</unpackTypes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>com.google.appengine</groupId>
- <artifactId>appengine-maven-plugin</artifactId>
- <version>${appengine.target.version}</version>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>opend.data</groupId>
- <artifactId>games-war</artifactId>
- <version>0.0.1</version>
- <type>war</type>
- </dependency>
- </dependencies>
-</project>
View
2  games/games-ear/src/main/application/META-INF/MANIFEST.MF
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-
View
4 games/games-ear/src/main/application/META-INF/appengine-application.xml
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<appengine-application xmlns="http://appengine.google.com/ns/1.0">
- <application>games</application>
-</appengine-application>
View
11 games/games-ear/src/main/application/META-INF/application.xml
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_5.xsd" version="5">
- <display-name>appengine-modules-ear</display-name>
- <module>
- <web>
- <web-uri>games-war-0.0.1.war</web-uri>
- <context-root>/games-war</context-root>
- </web>
- </module>
- <library-directory>lib</library-directory>
-</application>
View
BIN  games/games-war/src/main/webapp/static/3d/us_police_car/images/texture0.JPG
Deleted file not rendered
View
BIN  games/games-war/src/main/webapp/static/3d/us_police_car/images/texture1.JPG
Deleted file not rendered
View
BIN  games/games-war/src/main/webapp/static/3d/us_police_car/images/texture2.JPG
Deleted file not rendered
View
BIN  games/games-war/src/main/webapp/static/3d/us_police_car/images/texture3.JPG
Deleted file not rendered
View
1,828 games/games-war/src/main/webapp/static/3d/us_police_car/models/us_police_car.dae
0 additions, 1,828 deletions not shown
View
4 games/games-war/src/main/webapp/static/3d/us_police_car/textures.txt
@@ -1,4 +0,0 @@
-<../images/texture0.JPG> <../images/texture0.JPG>
-<../images/texture1.JPG> <../images/texture1.JPG>
-<../images/texture2.JPG> <../images/texture2.JPG>
-<../images/texture3.JPG> <../images/texture3.JPG>
View
30 games/pom.xml
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
- <modelVersion>4.0.0</modelVersion>
- <groupId>opend.data</groupId>
- <artifactId>games</artifactId>
- <version>0.0.1</version>
- <packaging>pom</packaging>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <appengine.target.version>1.8.7</appengine.target.version>
- <java.target.version>1.7</java.target.version>
- </properties>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>com.google.appengine</groupId>
- <artifactId>appengine-maven-plugin</artifactId>
- <version>${appengine.target.version}</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <modules>
- <module>games-war</module>
- <module>games-ear</module>
- </modules>
-</project>
View
19 google-app-engine/open-data-games/.gitignore
@@ -0,0 +1,19 @@
+hotspot.log
+*.iml
+*.ipr
+*.iws
+target/
+classes/
+/var
+pom.xml.versionsBackup
+test-output/
+/atlassian-ide-plugin.xml
+.idea
+.DS_Store
+.classpath
+.settings
+.project
+temp-testng-customsuite.xml
+test-output
+.externalToolBuilders
+*~
View
202 google-app-engine/open-data-games/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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.
View
24 google-app-engine/open-data-games/README.md
@@ -0,0 +1,24 @@
+App Engine Java Application
+Copyright (C) 2010-2012 Google Inc.
+
+## Skeleton application for use with App Engine Java.
+
+Requires [Apache Maven](http://maven.apache.org) 3.0 or greater, and JDK 6+ in order to run.
+
+To build, run
+
+ mvn package
+
+Building will run the tests, but to explicitly run tests you can use the test target
+
+ mvn test
+
+To start the app, use the [App Engine Maven Plugin](http://code.google.com/p/appengine-maven-plugin/) that is already included in this demo. Just run the command.
+
+ mvn appengine:devserver
+
+For further information, consult the [Java App Engine](https://developers.google.com/appengine/docs/java/overview) documentation.
+
+To see all the available goals for the App Engine plugin, run
+
+ mvn help:describe -Dplugin=appengine
View
14 google-app-engine/open-data-games/eclipse-launch-profiles/DevAppServer.launch
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+ <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+ <stringAttribute key="M2_GOALS" value="appengine:devserver"/>
+ <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+ <booleanAttribute key="M2_OFFLINE" value="false"/>
+ <stringAttribute key="M2_PROFILES" value=""/>
+ <listAttribute key="M2_PROPERTIES"/>
+ <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+ <booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+ <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+ <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+ <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc}"/>
+</launchConfiguration>
View
14 google-app-engine/open-data-games/eclipse-launch-profiles/UpdateApplication.launch
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+ <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+ <stringAttribute key="M2_GOALS" value="appengine:update"/>
+ <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+ <booleanAttribute key="M2_OFFLINE" value="false"/>
+ <stringAttribute key="M2_PROFILES" value=""/>
+ <listAttribute key="M2_PROPERTIES"/>
+ <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+ <booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+ <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+ <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+ <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc}"/>
+</launchConfiguration>
View
52 google-app-engine/open-data-games/nbactions.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actions>
+ <action>
+ <actionName>CUSTOM-appengine:devserver</actionName>
+ <displayName>appengine:devserver</displayName>
+ <goals>
+ <goal>appengine:devserver</goal>
+ </goals>
+ </action>
+ <action>
+ <actionName>CUSTOM-appengine:update</actionName>
+ <displayName>appengine:update</displayName>
+ <goals>
+ <goal>appengine:update</goal>
+ </goals>
+ </action>
+ <action>
+ <actionName>CUSTOM-appengine:rollback</actionName>
+ <displayName>appengine:rollback</displayName>
+ <goals>
+ <goal>appengine:rollback</goal>
+ </goals>
+ </action>
+ <action>
+ <actionName>CUSTOM-appengine:update_cron</actionName>
+ <displayName>appengine:update_cron</displayName>
+ <goals>
+ <goal>appengine:update_cron</goal>
+ </goals>
+ </action>
+ <action>
+ <actionName>CUSTOM-appengine:update_dos</actionName>
+ <displayName>appengine:update_dos</displayName>
+ <goals>
+ <goal>appengine:update_dos</goal>
+ </goals>
+ </action>
+ <action>
+ <actionName>CUSTOM-appengine:update_indexes</actionName>
+ <displayName>appengine:update_indexes</displayName>
+ <goals>
+ <goal>appengine:update_indexes</goal>
+ </goals>
+ </action>
+ <action>
+ <actionName>CUSTOM-appengine:update_queues</actionName>
+ <displayName>appengine:update_queues</displayName>
+ <goals>
+ <goal>appengine:update_queues</goal>
+ </goals>
+ </action>
+</actions>
View
32 games/games-war/pom.xml → google-app-engine/open-data-games/pom.xml
@@ -5,17 +5,15 @@
<modelVersion>4.0.0</modelVersion>
<packaging>war</packaging>
<version>0.0.1</version>
- <groupId>opend.data</groupId>
- <artifactId>games-war</artifactId>
- <parent>
- <groupId>opend.data</groupId>
- <artifactId>games</artifactId>
- <version>0.0.1</version>
- </parent>
+ <groupId>open.data</groupId>
+ <artifactId>open-data-games</artifactId>
<properties>
- <appengine.app.version>1-war</appengine.app.version>
+ <appengine.app.version>1</appengine.app.version>
+ <appengine.target.version>1.8.9</appengine.target.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <java.target.version>1.7</java.target.version>
<jersey.target.version>1.18</jersey.target.version>
</properties>
@@ -121,11 +119,19 @@
</dependencies>
<build>
- <outputDirectory>target/${project.artifactId}-${project.version}/WEB-INF/classes</outputDirectory>
-
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <version>2.5.1</version>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.3</version>
<configuration>
@@ -140,6 +146,12 @@
</webResources>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>com.google.appengine</groupId>
+ <artifactId>appengine-maven-plugin</artifactId>
+ <version>${appengine.target.version}</version>
+ </plugin>
</plugins>
</build>
View
0  ...c/main/java/controllers/HelloWorldController.java → ...c/main/java/controllers/HelloWorldController.java
File renamed without changes
View
0  games/games-war/src/main/webapp/3d.html → ...pp-engine/open-data-games/src/main/webapp/3d.html
File renamed without changes
View
3  ...mes-war/src/main/webapp/WEB-INF/appengine-web.xml → ...a-games/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
- <application>games</application>
+ <application>nomadic-zoo-465</application>
<version>${appengine.app.version}</version>
-
<threadsafe>true</threadsafe>
<system-properties>
View
0  ...es-war/src/main/webapp/WEB-INF/logging.properties → ...-games/src/main/webapp/WEB-INF/logging.properties
File renamed without changes
View
5 games/games-war/src/main/webapp/WEB-INF/web.xml → ...e/open-data-games/src/main/webapp/WEB-INF/web.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-
<!-- Jersey front controller -->
<filter>
<filter-name>jersey-front-controller</filter-name>
@@ -39,6 +38,4 @@
<dispatcher>REQUEST</dispatcher>
<dispatcher>FORWARD</dispatcher>
</filter-mapping>
-
-
</web-app>
View
0  games/games-war/src/main/webapp/about.html → ...engine/open-data-games/src/main/webapp/about.html
File renamed without changes
View
0  games/games-war/src/main/webapp/game.html → ...-engine/open-data-games/src/main/webapp/game.html
File renamed without changes
View
0  games/games-war/src/main/webapp/index.html → ...engine/open-data-games/src/main/webapp/index.html
File renamed without changes
View
0  ...c/main/webapp/static/3d/U-Boat_Type_XXIII/doc.kml → ...c/main/webapp/static/3d/U-Boat_Type_XXIII/doc.kml
File renamed without changes
View
0  ...tatic/3d/U-Boat_Type_XXIII/images/Color_008_1.jpg → ...tatic/3d/U-Boat_Type_XXIII/images/Color_008_1.jpg
File renamed without changes
View
0  ...d/U-Boat_Type_XXIII/images/Color_008noCulling.jpg → ...d/U-Boat_Type_XXIII/images/Color_008noCulling.jpg
File renamed without changes
View
0  ...ic/3d/U-Boat_Type_XXIII/images/I19cascosub1_1.jpg → ...ic/3d/U-Boat_Type_XXIII/images/I19cascosub1_1.jpg
File renamed without changes
View
0  ...-Boat_Type_XXIII/images/I19cascosub1noCulling.jpg → ...-Boat_Type_XXIII/images/I19cascosub1noCulling.jpg
File renamed without changes
View
0  .../3d/U-Boat_Type_XXIII/images/Interior_Texture.jpg → .../3d/U-Boat_Type_XXIII/images/Interior_Texture.jpg
File renamed without changes
View
0  ..._Type_XXIII/images/Interior_Texture1noCulling.jpg → ..._Type_XXIII/images/Interior_Texture1noCulling.jpg
File renamed without changes
View
0  ...d/U-Boat_Type_XXIII/images/Material2noCulling.jpg → ...d/U-Boat_Type_XXIII/images/Material2noCulling.jpg
File renamed without changes
View
0  ...d/U-Boat_Type_XXIII/images/Material3noCulling.jpg → ...d/U-Boat_Type_XXIII/images/Material3noCulling.jpg
File renamed without changes
View
0  ...d/U-Boat_Type_XXIII/images/Material6noCulling.jpg → ...d/U-Boat_Type_XXIII/images/Material6noCulling.jpg
File renamed without changes
View
0  .../static/3d/U-Boat_Type_XXIII/images/Material7.jpg → .../static/3d/U-Boat_Type_XXIII/images/Material7.jpg
File renamed without changes
View
0  ...U-Boat_Type_XXIII/images/Metal_RoughnoCulling.jpg → ...U-Boat_Type_XXIII/images/Metal_RoughnoCulling.jpg
File renamed without changes
View
0  ...U-Boat_Type_XXIII/images/Wood__FloornoCulling.jpg → ...U-Boat_Type_XXIII/images/Wood__FloornoCulling.jpg
File renamed without changes
View
0  ...3d/U-Boat_Type_XXIII/models/U-Boat_Type_XXIII.dae → ...3d/U-Boat_Type_XXIII/models/U-Boat_Type_XXIII.dae
File renamed without changes
View
0  ...n/webapp/static/3d/U-Boat_Type_XXIII/textures.txt → ...n/webapp/static/3d/U-Boat_Type_XXIII/textures.txt
File renamed without changes
View
0  ...mes-war/src/main/webapp/static/3d/gorilla/doc.kml → ...a-games/src/main/webapp/static/3d/gorilla/doc.kml
File renamed without changes
View
0  .../main/webapp/static/3d/gorilla/models/gorilla.dae → .../main/webapp/static/3d/gorilla/models/gorilla.dae
File renamed without changes
View
0  ...ar/src/main/webapp/static/3d/gorilla/textures.txt → ...es/src/main/webapp/static/3d/gorilla/textures.txt
File renamed without changes
View
0  ...r/src/main/webapp/static/3d/us_police_car/doc.kml → ...s/src/main/webapp/static/3d/us_police_car/doc.kml
File renamed without changes
View
0  games/images/texture0.JPG → ...ebapp/static/3d/us_police_car/images/texture0.JPG
File renamed without changes
View
0  games/images/texture1.JPG → ...ebapp/static/3d/us_police_car/images/texture1.JPG
File renamed without changes
View
0  games/images/texture2.JPG → ...ebapp/static/3d/us_police_car/images/texture2.JPG
File renamed without changes
View
0  games/images/texture3.JPG → ...ebapp/static/3d/us_police_car/images/texture3.JPG
File renamed without changes
View
0  games/models/us_police_car.dae → .../static/3d/us_police_car/models/us_police_car.dae
File renamed without changes
View
0  games/textures.txt → .../main/webapp/static/3d/us_police_car/textures.txt
File renamed without changes
View
0  ...n/webapp/static/bootstrap/css/bootstrap-theme.css → ...n/webapp/static/bootstrap/css/bootstrap-theme.css
File renamed without changes
View
0  ...bapp/static/bootstrap/css/bootstrap-theme.min.css → ...bapp/static/bootstrap/css/bootstrap-theme.min.css
File renamed without changes
View
0  ...rc/main/webapp/static/bootstrap/css/bootstrap.css → ...rc/main/webapp/static/bootstrap/css/bootstrap.css
File renamed without changes
View
0  ...ain/webapp/static/bootstrap/css/bootstrap.min.css → ...ain/webapp/static/bootstrap/css/bootstrap.min.css
File renamed without changes
View
0  .../bootstrap/fonts/glyphicons-halflings-regular.eot → .../bootstrap/fonts/glyphicons-halflings-regular.eot
File renamed without changes
View
0  .../bootstrap/fonts/glyphicons-halflings-regular.svg → .../bootstrap/fonts/glyphicons-halflings-regular.svg
File renamed without changes
View
0  .../bootstrap/fonts/glyphicons-halflings-regular.ttf → .../bootstrap/fonts/glyphicons-halflings-regular.ttf
File renamed without changes
View
0  ...bootstrap/fonts/glyphicons-halflings-regular.woff → ...bootstrap/fonts/glyphicons-halflings-regular.woff
File renamed without changes
View
0  .../src/main/webapp/static/bootstrap/js/bootstrap.js → .../src/main/webapp/static/bootstrap/js/bootstrap.js
File renamed without changes
View
0  .../main/webapp/static/bootstrap/js/bootstrap.min.js → .../main/webapp/static/bootstrap/js/bootstrap.min.js
File renamed without changes
View
0  ...r/src/main/webapp/static/css/starter-template.css → ...s/src/main/webapp/static/css/starter-template.css
File renamed without changes
View
0  ...rc/main/webapp/static/jquery/jquery-1.10.2.min.js → ...rc/main/webapp/static/jquery/jquery-1.10.2.min.js
File renamed without changes
View
0  ...c/main/webapp/static/jquery/jquery-1.10.2.min.map → ...c/main/webapp/static/jquery/jquery-1.10.2.min.map
File renamed without changes
View
0  games/games-war/src/main/webapp/static/js/3d.js → ...e/open-data-games/src/main/webapp/static/js/3d.js
File renamed without changes
View
0  games/games-war/src/main/webapp/static/js/game.js → ...open-data-games/src/main/webapp/static/js/game.js
File renamed without changes
View
0  ...war/src/main/webapp/static/maps/icons/robbery.png → ...mes/src/main/webapp/static/maps/icons/robbery.png
File renamed without changes
Please sign in to comment.
Something went wrong with that request. Please try again.