Permalink
Browse files

Bring up to date App Engine API 1.9.63

  • Loading branch information...
codeconsole committed May 11, 2018
1 parent 2c74016 commit fe87bbf200f1c8b7cf99f60acf25f080e9c6fab4
Showing with 19 additions and 737 deletions.
  1. +1 −0 .gitignore
  2. +1 −1 build.gradle
  3. +5 −5 common.gradle
  4. +1 −0 core/.gitignore
  5. +0 −7 core/src/main/groovyx/gaelyk/GaelykBindingEnhancer.groovy
  6. +0 −7 core/src/main/groovyx/gaelyk/GaelykBindingsTransformation.groovy
  7. +1 −1 core/src/main/groovyx/gaelyk/datastore/DatastoreEntityCoercion.java
  8. +0 −37 core/src/main/groovyx/gaelyk/extensions/ChannelExtensions.java
  9. +0 −331 core/src/main/groovyx/gaelyk/extensions/XmppExtensions.java
  10. +1 −1 core/src/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
  11. +0 −39 core/src/resources/gaelyk.dsld
  12. +1 −7 core/src/test/groovyx/gaelyk/BindingEnhancerTest.groovy
  13. +0 −6 core/src/test/groovyx/gaelyk/BindingsInjectionInClassesTest.groovy
  14. +0 −34 core/src/test/groovyx/gaelyk/ChannelServiceTest.groovy
  15. +0 −2 core/src/test/groovyx/gaelyk/GaelykServletContextListenerTest.groovy
  16. +0 −2 core/src/test/groovyx/gaelyk/GaelykServletTest.groovy
  17. +0 −2 core/src/test/groovyx/gaelyk/GaelykTemplateServletTest.groovy
  18. +0 −209 core/src/test/groovyx/gaelyk/XmppTest.groovy
  19. +0 −2 core/src/test/groovyx/gaelyk/plugins/PluginBaseScriptTest.groovy
  20. +0 −2 core/src/test/groovyx/gaelyk/plugins/PluginsHandlerTest.groovy
  21. +0 −2 core/src/test/groovyx/gaelyk/routes/RoutesFilterTest.groovy
  22. +7 −5 template-project/build.gradle
  23. BIN template-project/gaelyk-info-0.1.jar
  24. +0 −35 template-project/src/gaelyk.dsld
  25. +1 −0 template-project/src/main/webapp/WEB-INF/appengine-web.xml
@@ -9,6 +9,7 @@ out
.classpath
.project
.settings
.DS_Store
website/war/api
website/war/WEB-INF/classes
website/war/WEB-INF/lib
@@ -9,7 +9,7 @@ allprojects {
}
version = '2.2.1-SNAPSHOT'
version = '2.3.0-SNAPSHOT'
group = 'org.gaelyk'
}
@@ -1,7 +1,7 @@
project.ext.gaelykGroovyVersion = '2.4.7'
project.ext.gaelykGroovyVersion = '2.4.15'
project.ext.gaelykSpockVersion = '1.0-groovy-2.4'
project.ext.gaelykAppEngineVersion = '1.9.40'
project.ext.gaelykLatestVersion = '2.2.0'
project.ext.gaelykAppEngineVersion = '1.9.63'
project.ext.gaelykLatestVersion = '2.3.0-SNAPSHOT'
project.ext.gaelykSpockLatestVersion = '0.4'
project.ext.gaelykGradleVersion = '2.14.1'
@@ -17,8 +17,8 @@ apply plugin: 'groovy'
apply plugin: 'eclipse'
apply plugin: 'idea'
sourceCompatibility = 1.7
targetCompatibility = 1.7
sourceCompatibility = 1.8
targetCompatibility = 1.8
task wrapper(type: Wrapper) {
gradleVersion = gaelykGradleVersion
@@ -9,3 +9,4 @@ WEB-INF
*.ipr
*.iws
target
.DS_Store
@@ -26,10 +26,8 @@ import com.google.appengine.api.oauth.OAuthServiceFactory
import com.google.appengine.api.urlfetch.URLFetchServiceFactory
import com.google.appengine.api.users.UserServiceFactory
import com.google.appengine.api.utils.SystemProperty
import com.google.appengine.api.xmpp.XMPPServiceFactory
import groovyx.gaelyk.logging.LoggerAccessor
import com.google.appengine.api.channel.ChannelServiceFactory
import com.google.appengine.api.LifecycleManager
import com.google.appengine.api.users.User
import com.google.appengine.api.prospectivesearch.ProspectiveSearchServiceFactory
@@ -69,9 +67,6 @@ class GaelykBindingEnhancer {
binding.setVariable("defaultQueue", QueueFactory.defaultQueue)
binding.setVariable("queues", getQueues())
// New in GAE SDK 1.2.5: XMPP support
binding.setVariable("xmpp", XMPPServiceFactory.XMPPService)
// Tells whether the application is running in local development mode
// or is deployed on Google's cloud
binding.setVariable("localMode", getLocalMode())
@@ -93,8 +88,6 @@ class GaelykBindingEnhancer {
// Capabilities service to know the status of the various GAE services
binding.setVariable("capabilities", CapabilitiesServiceFactory.capabilitiesService)
// Channel service in SDK 1.4.0 for Comet-style applications
binding.setVariable("channel", ChannelServiceFactory.channelService)
// Backend service and Lifecycle manager in SDK 1.5.0
binding.setVariable("lifecycle", LifecycleManager.instance)
@@ -20,8 +20,6 @@ import com.google.appengine.api.blobstore.BlobstoreService
import com.google.appengine.api.blobstore.BlobstoreServiceFactory
import com.google.appengine.api.capabilities.CapabilitiesService
import com.google.appengine.api.capabilities.CapabilitiesServiceFactory
import com.google.appengine.api.channel.ChannelService
import com.google.appengine.api.channel.ChannelServiceFactory
import com.google.appengine.api.datastore.DatastoreService
import com.google.appengine.api.datastore.DatastoreServiceFactory
import com.google.appengine.api.mail.MailService
@@ -37,8 +35,6 @@ import com.google.appengine.api.urlfetch.URLFetchServiceFactory
import com.google.appengine.api.users.User
import com.google.appengine.api.users.UserService
import com.google.appengine.api.users.UserServiceFactory
import com.google.appengine.api.xmpp.XMPPService
import com.google.appengine.api.xmpp.XMPPServiceFactory
import groovy.transform.CompileStatic
import groovyx.gaelyk.logging.LoggerAccessor
import org.codehaus.groovy.ast.ASTNode
@@ -89,11 +85,8 @@ class GaelykBindingsTransformation implements ASTTransformation {
addGetterIfNotExists(parent, ImagesServiceWrapper, "getImages", ImagesServiceWrapper, "getInstance")
addGetterIfNotExists(parent, UserService, "getUsers", UserServiceFactory, "getUserService")
addGetterIfNotExists(parent, Queue, "getDefaultQueue", QueueFactory, "getDefaultQueue")
addGetterIfNotExists(parent, XMPPService, "getXmpp", XMPPServiceFactory, "getXMPPService")
addGetterIfNotExists(parent, BlobstoreService, "getBlobstore", BlobstoreServiceFactory, "getBlobstoreService")
addGetterIfNotExists(parent, OAuthService, "getOauth", OAuthServiceFactory, "getOAuthService")
addGetterIfNotExists(parent, CapabilitiesService, "getCapabilities", CapabilitiesServiceFactory, "getCapabilitiesService")
addGetterIfNotExists(parent, ChannelService, "getChannel", ChannelServiceFactory, "getChannelService")
addGetterIfNotExists(parent, LifecycleManager, "getLifecycle", LifecycleManager, "getInstance")
addGetterIfNotExists(parent, ProspectiveSearchService, "getProspectiveSearch", ProspectiveSearchService, "getProspectiveSearchService")
addGetterIfNotExists(parent, User, "getUser", GaelykBindingEnhancer, "getCurrentUser")
@@ -58,7 +58,7 @@ public static Entity convert(DatastoreEntity<?> dsEntity){
for (String propertyName : dsEntity.getDatastoreIndexedProperties()) {
Object value = dsEntity.getProperty(propertyName);
try {
entity.setProperty(propertyName, transformValueForStorage(dsEntity.getProperty(propertyName)));
entity.setProperty(propertyName, transformValueForStorage(value));
} catch (Exception e) {
throw new IllegalArgumentException("Problem setting value '" + value + "' to indexed property '" + propertyName + "' of entity "
+ dsEntity.getClass().getSimpleName(), e);

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit fe87bbf

Please sign in to comment.