svn commit: r887907 - in /camel/trunk: components/camel-gae/ components/camel-gae/src/test/java/com/google/appengine/api/labs/taskqueue/ components/camel-gae/src/test/java/org/apache/camel/component/gae/task/ examples/camel-example-gae/

[krasserm]

Author: krasserm
Date: Mon Dec  7 12:41:01 2009
New Revision: 887907

URL: http://svn.apache.org/viewvc?rev=887907&view=rev
Log:
Upgrade to App Engine SDK 1.2.8 and usage of Camel XML schema for Spring

Modified:
    camel/trunk/components/camel-gae/pom.xml
    
camel/trunk/components/camel-gae/src/test/java/com/google/appengine/api/labs/taskqueue/TaskOptionsAccessor.java
    
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/GTaskBindingTest.java
    
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/MockQueue.java
    camel/trunk/examples/camel-example-gae/pom.xml

Modified: camel/trunk/components/camel-gae/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/pom.xml?rev=887907&r1=887906&r2=887907&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/pom.xml (original)
+++ camel/trunk/components/camel-gae/pom.xml Mon Dec  7 12:41:01 2009
@@ -32,7 +32,7 @@
 
   <properties>
        
<camel.osgi.export.pkg>org.apache.camel.component.gae.*</camel.osgi.export.pkg>
-    <appengine-sdk-version>1.2.6</appengine-sdk-version>
+    <appengine-sdk-version>1.2.8</appengine-sdk-version>
   </properties>
 
   <dependencies>

Modified: 
camel/trunk/components/camel-gae/src/test/java/com/google/appengine/api/labs/taskqueue/TaskOptionsAccessor.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/test/java/com/google/appengine/api/labs/taskqueue/TaskOptionsAccessor.java?rev=887907&r1=887906&r2=887907&view=diff
==============================================================================
--- 
camel/trunk/components/camel-gae/src/test/java/com/google/appengine/api/labs/taskqueue/TaskOptionsAccessor.java
 (original)
+++ 
camel/trunk/components/camel-gae/src/test/java/com/google/appengine/api/labs/taskqueue/TaskOptionsAccessor.java
 Mon Dec  7 12:41:01 2009
@@ -18,6 +18,7 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
+import java.util.List;
 import java.util.Map;
 
 public class TaskOptionsAccessor {
@@ -40,7 +41,7 @@
         return taskOptions.getUrl();
     }
     
-    public Map<String, String> getHeaders() {
+    public Map<String, List<String>> getHeaders() {
         return taskOptions.getHeaders();
     }
     

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=887907&r1=887906&r2=887907&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
 Mon Dec  7 12:41:01 2009
@@ -60,7 +60,7 @@
         exchange.getIn().setHeader(Exchange.HTTP_QUERY, "x=y");
         binding.writeRequestHeaders(endpoint, exchange, 
accessor.getTaskOptions());
         assertEquals(1, accessor.getHeaders().size());
-        assertEquals("abc", accessor.getHeaders().get("test"));
+        assertEquals("abc", accessor.getHeaders().get("test").get(0));
     }
     
     @Test

Modified: 
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/MockQueue.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/MockQueue.java?rev=887907&r1=887906&r2=887907&view=diff
==============================================================================
--- 
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/MockQueue.java
 (original)
+++ 
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/MockQueue.java
 Mon Dec  7 12:41:01 2009
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.gae.task;
 
+import java.util.List;
 import java.util.Map;
 
 import com.google.appengine.api.datastore.Transaction;
@@ -63,8 +64,8 @@
             if (accessor.getTaskName() != null) {
                 request.setHeaderField(GTaskBinding.GAE_TASK_NAME, 
accessor.getTaskName());
             }
-            for (Map.Entry<String, String> entry : 
accessor.getHeaders().entrySet()) {
-                request.setHeaderField(entry.getKey(), entry.getValue());
+            for (Map.Entry<String, List<String>> entry : 
accessor.getHeaders().entrySet()) {
+                request.setHeaderField(entry.getKey(), 
entry.getValue().get(0));
             }
             servletUnitClient.getResponse(request);
         } catch (Exception e) {

Modified: camel/trunk/examples/camel-example-gae/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-gae/pom.xml?rev=887907&r1=887906&r2=887907&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-gae/pom.xml (original)
+++ camel/trunk/examples/camel-example-gae/pom.xml Mon Dec  7 12:41:01 2009
@@ -20,6 +20,17 @@
             <artifactId>camel-gae</artifactId>
         </dependency>
         <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>