Author: krasserm
Date: Tue Dec 28 09:32:48 2010
New Revision: 1053286
URL: http://svn.apache.org/viewvc?rev=1053286&view=rev
Log:
Upgrade to GAE SDK 1.4.0. Closes CAMEL-3347
Modified:
camel/trunk/components/camel-gae/pom.xml
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskBinding.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskComponent.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskEndpoint.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskProducer.java
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/GTaskBindingTest.java
Modified: camel/trunk/components/camel-gae/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/pom.xml?rev=1053286&r1=1053285&r2=1053286&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/pom.xml (original)
+++ camel/trunk/components/camel-gae/pom.xml Tue Dec 28 09:32:48 2010
@@ -33,7 +33,7 @@
<properties>
<camel.osgi.export.pkg>org.apache.camel.component.gae.*</camel.osgi.export.pkg>
- <appengine-sdk-version>1.3.8</appengine-sdk-version>
+ <appengine-sdk-version>1.4.0</appengine-sdk-version>
<gdata-version>1.41.1</gdata-version>
</properties>
Modified:
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskBinding.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskBinding.java?rev=1053286&r1=1053285&r2=1053286&view=diff
==============================================================================
---
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskBinding.java
(original)
+++
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskBinding.java
Tue Dec 28 09:32:48 2010
@@ -19,7 +19,7 @@ package org.apache.camel.component.gae.t
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import com.google.appengine.api.labs.taskqueue.TaskOptions;
+import com.google.appengine.api.taskqueue.TaskOptions;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
@@ -77,7 +77,7 @@ public class GTaskBinding implements
* <code>exchange</code>.
*/
public TaskOptions writeRequest(GTaskEndpoint endpoint, Exchange exchange,
TaskOptions request) {
- TaskOptions answer = TaskOptions.Builder.url(getWorkerRoot(endpoint) +
endpoint.getPath());
+ TaskOptions answer =
TaskOptions.Builder.withUrl(getWorkerRoot(endpoint) + endpoint.getPath());
writeRequestHeaders(endpoint, exchange, answer);
writeRequestBody(endpoint, exchange, answer);
// TODO: consider TaskOptions method (POST, GET, ...)
Modified:
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskComponent.java?rev=1053286&r1=1053285&r2=1053286&view=diff
==============================================================================
---
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskComponent.java
(original)
+++
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskComponent.java
Tue Dec 28 09:32:48 2010
@@ -19,8 +19,8 @@ package org.apache.camel.component.gae.t
import java.net.URI;
import java.util.Map;
-import com.google.appengine.api.labs.taskqueue.Queue;
-import com.google.appengine.api.labs.taskqueue.QueueFactory;
+import com.google.appengine.api.taskqueue.Queue;
+import com.google.appengine.api.taskqueue.QueueFactory;
import org.apache.camel.Endpoint;
import org.apache.camel.component.gae.bind.InboundBinding;
Modified:
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskEndpoint.java?rev=1053286&r1=1053285&r2=1053286&view=diff
==============================================================================
---
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskEndpoint.java
(original)
+++
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskEndpoint.java
Tue Dec 28 09:32:48 2010
@@ -23,8 +23,8 @@ import java.net.URISyntaxException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import com.google.appengine.api.labs.taskqueue.Queue;
-import com.google.appengine.api.labs.taskqueue.TaskOptions;
+import com.google.appengine.api.taskqueue.Queue;
+import com.google.appengine.api.taskqueue.TaskOptions;
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
Modified:
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskProducer.java?rev=1053286&r1=1053285&r2=1053286&view=diff
==============================================================================
---
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskProducer.java
(original)
+++
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskProducer.java
Tue Dec 28 09:32:48 2010
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.gae.task;
-import com.google.appengine.api.labs.taskqueue.Queue;
-import com.google.appengine.api.labs.taskqueue.TaskOptions;
+import com.google.appengine.api.taskqueue.Queue;
+import com.google.appengine.api.taskqueue.TaskOptions;
import org.apache.camel.Exchange;
import org.apache.camel.component.gae.bind.OutboundBinding;
Modified:
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/GTaskBindingTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/GTaskBindingTest.java?rev=1053286&r1=1053285&r2=1053286&view=diff
==============================================================================
---
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/GTaskBindingTest.java
(original)
+++
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/GTaskBindingTest.java
Tue Dec 28 09:32:48 2010
@@ -18,12 +18,12 @@ package org.apache.camel.component.gae.t
import java.util.List;
-import com.google.appengine.api.labs.taskqueue.Queue;
-import com.google.appengine.api.labs.taskqueue.QueueFactory;
-import com.google.appengine.api.labs.taskqueue.TaskOptions;
-import com.google.appengine.api.labs.taskqueue.dev.LocalTaskQueue;
-import
com.google.appengine.api.labs.taskqueue.dev.QueueStateInfo.HeaderWrapper;
-import
com.google.appengine.api.labs.taskqueue.dev.QueueStateInfo.TaskStateInfo;
+import com.google.appengine.api.taskqueue.Queue;
+import com.google.appengine.api.taskqueue.QueueFactory;
+import com.google.appengine.api.taskqueue.TaskOptions;
+import com.google.appengine.api.taskqueue.dev.LocalTaskQueue;
+import com.google.appengine.api.taskqueue.dev.QueueStateInfo.HeaderWrapper;
+import com.google.appengine.api.taskqueue.dev.QueueStateInfo.TaskStateInfo;
import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
import com.google.appengine.tools.development.testing.LocalTaskQueueTestConfig;
import org.apache.camel.Exchange;
@@ -35,7 +35,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.springframework.mock.web.MockHttpServletRequest;
-import static
com.google.appengine.api.labs.taskqueue.TaskOptions.Builder.withDefaults;
+import static
com.google.appengine.api.taskqueue.TaskOptions.Builder.withDefaults;
import static
org.apache.camel.component.gae.http.GHttpTestUtils.getCamelContext;
import static
org.apache.camel.component.gae.task.GTaskTestUtils.createEndpoint;
import static org.junit.Assert.assertEquals;
