Author: davsclaus
Date: Thu May 24 08:18:03 2012
New Revision: 1342168

URL: http://svn.apache.org/viewvc?rev=1342168&view=rev
Log:
Upgraded to gae 1.6.6

Modified:
    camel/trunk/components/camel-gae/pom.xml
    
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/GTaskTestUtils.java
    camel/trunk/parent/pom.xml

Modified: camel/trunk/components/camel-gae/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/pom.xml?rev=1342168&r1=1342167&r2=1342168&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/pom.xml (original)
+++ camel/trunk/components/camel-gae/pom.xml Thu May 24 08:18:03 2012
@@ -33,8 +33,6 @@
 
   <properties>
        
<camel.osgi.export.pkg>org.apache.camel.component.gae.*</camel.osgi.export.pkg>
-    <appengine-sdk-version>1.5.0.1</appengine-sdk-version>
-    <gdata-version>1.41.1</gdata-version>
   </properties>
 
   <dependencies>
@@ -43,28 +41,30 @@
       <artifactId>camel-servlet</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-servlet_2.5_spec</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-spring</artifactId>
     </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-core</artifactId>
-      </dependency>
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-api-1.0-sdk</artifactId>
-      <version>${appengine-sdk-version}</version>
+      <version>${google-app-engine-version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-api-labs</artifactId>
-      <version>${appengine-sdk-version}</version>
+      <version>${google-app-engine-version}</version>
     </dependency>
     <dependency>
-      <groupId>com.google.gdata</groupId>
-      <artifactId>gdata-core</artifactId>
-      <version>${gdata-version}</version>
+      <groupId>org.openengsb.wrapped</groupId>
+      <artifactId>com.google.gdata</artifactId>
+      <version>${google-gdata-version}</version>
     </dependency>
+
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
@@ -75,20 +75,24 @@
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-api-stubs</artifactId>
-      <version>${appengine-sdk-version}</version>
+      <version>${google-app-engine-version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-testing</artifactId>
-      <version>${appengine-sdk-version}</version>
+      <version>${google-app-engine-version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
@@ -122,20 +126,6 @@
     </dependency>
   </dependencies>
 
-  <repositories>
-    <repository>
-      <id>camel.internal.maven.repository</id>
-      <name>Camel Maven Repository</name>
-      <url>http://svn.apache.org/repos/asf/camel/m2-repo</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
     <build>
         <plugins>
             <plugin>

Modified: 
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/GTaskTestUtils.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/GTaskTestUtils.java?rev=1342168&r1=1342167&r2=1342168&view=diff
==============================================================================
--- 
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/GTaskTestUtils.java
 (original)
+++ 
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/GTaskTestUtils.java
 Thu May 24 08:18:03 2012
@@ -89,12 +89,20 @@ public final class GTaskTestUtils {
                     return TestConfig.getPort();
                 }
 
+                public String getHostName() {
+                    return "localhost";
+                }
+
                 public void waitForServerToStart() {
                 }
 
                 public boolean enforceApiDeadlines() {
                     return false;
                 }
+
+                public boolean simulateProductionLatencies() {
+                    return false;
+                }
             };
         }
     }

Modified: camel/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1342168&r1=1342167&r2=1342168&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Thu May 24 08:18:03 2012
@@ -82,6 +82,8 @@
     <geronimo-jpa2-spec-version>1.1</geronimo-jpa2-spec-version>
     <geronimo-jta-spec-version>1.1.1</geronimo-jta-spec-version>
     <geronimo-servlet-spec-version>1.1.2</geronimo-servlet-spec-version>
+    <google-app-engine-version>1.6.6</google-app-engine-version>
+    <google-gdata-version>1.41.5.w1</google-gdata-version>
     <groovy-version>1.8.6</groovy-version>
     <gson-version>2.1</gson-version>
     <guiceyfruit-version>2.0</guiceyfruit-version>


Reply via email to