svn commit: r1130595 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/component/bean/BeanInfo.java test/java/org/apache/camel/component/bean/BeanWithAnnotationInheritedTest.java
Author: krasserm
Date: Thu Jun 2 15:06:41 2011
New Revision: 1130595
URL: http://svn.apache.org/viewvc?rev=1130595view=rev
Log:
Inherit parameter binding annotations from superclasses and interfaces. Closes
CAMEL-4040
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithAnnotationInheritedTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java?rev=1130595r1=1130594r2=1130595view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
Thu Jun 2 15:06:41 2011
@@ -289,7 +289,7 @@ public class BeanInfo {
@SuppressWarnings(unchecked)
protected MethodInfo createMethodInfo(Class clazz, Method method) {
Class[] parameterTypes = method.getParameterTypes();
-Annotation[][] parametersAnnotations =
method.getParameterAnnotations();
+ListAnnotation[] parametersAnnotations =
collectParameterAnnotations(clazz, method);
ListParameterInfo parameters = new ArrayListParameterInfo();
ListParameterInfo bodyParameters = new ArrayListParameterInfo();
@@ -302,7 +302,7 @@ public class BeanInfo {
for (int i = 0; i size; i++) {
Class parameterType = parameterTypes[i];
-Annotation[] parameterAnnotations = parametersAnnotations[i];
+Annotation[] parameterAnnotations =
parametersAnnotations[i].toArray(new
Annotation[parametersAnnotations[i].size()]);
Expression expression = createParameterUnmarshalExpression(clazz,
method, parameterType, parameterAnnotations);
hasCustomAnnotation |= expression != null;
@@ -338,6 +338,33 @@ public class BeanInfo {
return new MethodInfo(camelContext, clazz, method, parameters,
bodyParameters, hasCustomAnnotation, hasHandlerAnnotation);
}
+protected ListAnnotation[] collectParameterAnnotations(Class? c,
Method m) {
+ListAnnotation[] annotations = new
List[m.getParameterTypes().length];
+for (int i = 0; i annotations.length; i++) {
+annotations[i] = new ArrayListAnnotation();
+}
+collectParameterAnnotations(c, m, annotations);
+return annotations;
+}
+
+protected void collectParameterAnnotations(Class? c, Method m,
ListAnnotation[] a) {
+try {
+Annotation[][] pa = c.getDeclaredMethod(m.getName(),
m.getParameterTypes()).getParameterAnnotations();
+for (int i = 0; i pa.length; i++) {
+a[i].addAll(Arrays.asList(pa[i]));
+}
+} catch (NoSuchMethodException e) {
+// no method with signature of m declared on c
+}
+for (Class? i : c.getInterfaces()) {
+collectParameterAnnotations(i, m, a);
+}
+if (!c.isInterface() c.getSuperclass() != Object.class) {
+collectParameterAnnotations(c.getSuperclass(), m, a);
+}
+
+}
+
/**
* Lets try choose one of the available methods to invoke if we can match
* the message body to the body parameter
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithAnnotationInheritedTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithAnnotationInheritedTest.java?rev=1130595view=auto
==
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithAnnotationInheritedTest.java
(added)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithAnnotationInheritedTest.java
Thu Jun 2 15:06:41 2011
@@ -0,0 +1,148 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+package org.apache.camel.component.bean;
+
+import
svn commit: r1127603 - in /camel/m2-repo/com/google/appengine: appengine-api-1.0-sdk/ appengine-api-1.0-sdk/1.5.0.1/ appengine-api-labs/ appengine-api-labs/1.5.0.1/ appengine-api-stubs/ appengine-api-
Author: krasserm Date: Wed May 25 18:03:19 2011 New Revision: 1127603 URL: http://svn.apache.org/viewvc?rev=1127603view=rev Log: Upload of GAE SDK 1.5.0.1 Added: camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.5.0.1/ camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.5.0.1/appengine-api-1.0-sdk-1.5.0.1.jar (with props) camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.5.0.1/appengine-api-1.0-sdk-1.5.0.1.jar.md5 camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.5.0.1/appengine-api-1.0-sdk-1.5.0.1.jar.sha1 camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.5.0.1/appengine-api-1.0-sdk-1.5.0.1.pom camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.5.0.1/appengine-api-1.0-sdk-1.5.0.1.pom.md5 camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.5.0.1/appengine-api-1.0-sdk-1.5.0.1.pom.sha1 camel/m2-repo/com/google/appengine/appengine-api-labs/1.5.0.1/ camel/m2-repo/com/google/appengine/appengine-api-labs/1.5.0.1/appengine-api-labs-1.5.0.1.jar (with props) camel/m2-repo/com/google/appengine/appengine-api-labs/1.5.0.1/appengine-api-labs-1.5.0.1.jar.md5 camel/m2-repo/com/google/appengine/appengine-api-labs/1.5.0.1/appengine-api-labs-1.5.0.1.jar.sha1 camel/m2-repo/com/google/appengine/appengine-api-labs/1.5.0.1/appengine-api-labs-1.5.0.1.pom camel/m2-repo/com/google/appengine/appengine-api-labs/1.5.0.1/appengine-api-labs-1.5.0.1.pom.md5 camel/m2-repo/com/google/appengine/appengine-api-labs/1.5.0.1/appengine-api-labs-1.5.0.1.pom.sha1 camel/m2-repo/com/google/appengine/appengine-api-stubs/1.5.0.1/ camel/m2-repo/com/google/appengine/appengine-api-stubs/1.5.0.1/appengine-api-stubs-1.5.0.1.jar (with props) camel/m2-repo/com/google/appengine/appengine-api-stubs/1.5.0.1/appengine-api-stubs-1.5.0.1.jar.md5 camel/m2-repo/com/google/appengine/appengine-api-stubs/1.5.0.1/appengine-api-stubs-1.5.0.1.jar.sha1 camel/m2-repo/com/google/appengine/appengine-api-stubs/1.5.0.1/appengine-api-stubs-1.5.0.1.pom camel/m2-repo/com/google/appengine/appengine-api-stubs/1.5.0.1/appengine-api-stubs-1.5.0.1.pom.md5 camel/m2-repo/com/google/appengine/appengine-api-stubs/1.5.0.1/appengine-api-stubs-1.5.0.1.pom.sha1 camel/m2-repo/com/google/appengine/appengine-testing/1.5.0.1/ camel/m2-repo/com/google/appengine/appengine-testing/1.5.0.1/appengine-testing-1.5.0.1.jar (with props) camel/m2-repo/com/google/appengine/appengine-testing/1.5.0.1/appengine-testing-1.5.0.1.jar.md5 camel/m2-repo/com/google/appengine/appengine-testing/1.5.0.1/appengine-testing-1.5.0.1.jar.sha1 camel/m2-repo/com/google/appengine/appengine-testing/1.5.0.1/appengine-testing-1.5.0.1.pom camel/m2-repo/com/google/appengine/appengine-testing/1.5.0.1/appengine-testing-1.5.0.1.pom.md5 camel/m2-repo/com/google/appengine/appengine-testing/1.5.0.1/appengine-testing-1.5.0.1.pom.sha1 Modified: camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/maven-metadata.xml camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/maven-metadata.xml.md5 camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/maven-metadata.xml.sha1 camel/m2-repo/com/google/appengine/appengine-api-labs/maven-metadata.xml camel/m2-repo/com/google/appengine/appengine-api-labs/maven-metadata.xml.md5 camel/m2-repo/com/google/appengine/appengine-api-labs/maven-metadata.xml.sha1 camel/m2-repo/com/google/appengine/appengine-api-stubs/maven-metadata.xml camel/m2-repo/com/google/appengine/appengine-api-stubs/maven-metadata.xml.md5 camel/m2-repo/com/google/appengine/appengine-api-stubs/maven-metadata.xml.sha1 camel/m2-repo/com/google/appengine/appengine-testing/maven-metadata.xml camel/m2-repo/com/google/appengine/appengine-testing/maven-metadata.xml.md5 camel/m2-repo/com/google/appengine/appengine-testing/maven-metadata.xml.sha1 Added: camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.5.0.1/appengine-api-1.0-sdk-1.5.0.1.jar URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.5.0.1/appengine-api-1.0-sdk-1.5.0.1.jar?rev=1127603view=auto == Binary file - no diff available. Propchange: camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.5.0.1/appengine-api-1.0-sdk-1.5.0.1.jar -- svn:mime-type = application/octet-stream Added: camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.5.0.1/appengine-api-1.0-sdk-1.5.0.1.jar.md5 URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.5.0.1/appengine-api-1.0-sdk-1.5.0.1.jar.md5?rev=1127603view=auto == --- camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.5.0.1/appengine-api-1.0-sdk
svn commit: r1127623 - in /camel/trunk/components/camel-gae: pom.xml src/test/java/org/apache/camel/component/gae/task/GTaskTestUtils.java
Author: krasserm
Date: Wed May 25 18:26:34 2011
New Revision: 1127623
URL: http://svn.apache.org/viewvc?rev=1127623view=rev
Log:
Upgrade to GAE SDK 1.5.0.1
Modified:
camel/trunk/components/camel-gae/pom.xml
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/GTaskTestUtils.java
Modified: camel/trunk/components/camel-gae/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/pom.xml?rev=1127623r1=1127622r2=1127623view=diff
==
--- camel/trunk/components/camel-gae/pom.xml (original)
+++ camel/trunk/components/camel-gae/pom.xml Wed May 25 18:26:34 2011
@@ -33,7 +33,7 @@
properties
camel.osgi.export.pkgorg.apache.camel.component.gae.*/camel.osgi.export.pkg
-appengine-sdk-version1.4.0/appengine-sdk-version
+appengine-sdk-version1.5.0.1/appengine-sdk-version
gdata-version1.41.1/gdata-version
/properties
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=1127623r1=1127622r2=1127623view=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
Wed May 25 18:26:34 2011
@@ -91,6 +91,10 @@ public final class GTaskTestUtils {
public void waitForServerToStart() {
}
+
+public boolean enforceApiDeadlines() {
+return false;
+}
};
}
}
svn commit: r1026243 - /camel/trunk/components/camel-gae/pom.xml
Author: krasserm Date: Fri Oct 22 08:38:49 2010 New Revision: 1026243 URL: http://svn.apache.org/viewvc?rev=1026243view=rev Log: Upgrade to GAE SDK 1.3.8. Closes CAMEL-3244 Modified: camel/trunk/components/camel-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=1026243r1=1026242r2=1026243view=diff == --- camel/trunk/components/camel-gae/pom.xml (original) +++ camel/trunk/components/camel-gae/pom.xml Fri Oct 22 08:38:49 2010 @@ -32,7 +32,7 @@ properties camel.osgi.export.pkgorg.apache.camel.component.gae.*/camel.osgi.export.pkg -appengine-sdk-version1.3.6/appengine-sdk-version +appengine-sdk-version1.3.8/appengine-sdk-version gdata-version1.41.1/gdata-version /properties
svn commit: r1023505 - in /camel/m2-repo/com/google/appengine: appengine-api-1.0-sdk/ appengine-api-1.0-sdk/1.3.8/ appengine-api-labs/ appengine-api-labs/1.3.8/ appengine-api-stubs/ appengine-api-stub
Author: krasserm Date: Sun Oct 17 14:24:09 2010 New Revision: 1023505 URL: http://svn.apache.org/viewvc?rev=1023505view=rev Log: GAE SDK 1.3.8 jars Added: camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.8/ camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.8/appengine-api-1.0-sdk-1.3.8.jar (with props) camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.8/appengine-api-1.0-sdk-1.3.8.jar.md5 camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.8/appengine-api-1.0-sdk-1.3.8.jar.sha1 camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.8/appengine-api-1.0-sdk-1.3.8.pom (with props) camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.8/appengine-api-1.0-sdk-1.3.8.pom.md5 camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.8/appengine-api-1.0-sdk-1.3.8.pom.sha1 camel/m2-repo/com/google/appengine/appengine-api-labs/1.3.8/ camel/m2-repo/com/google/appengine/appengine-api-labs/1.3.8/appengine-api-labs-1.3.8.jar (with props) camel/m2-repo/com/google/appengine/appengine-api-labs/1.3.8/appengine-api-labs-1.3.8.jar.md5 camel/m2-repo/com/google/appengine/appengine-api-labs/1.3.8/appengine-api-labs-1.3.8.jar.sha1 camel/m2-repo/com/google/appengine/appengine-api-labs/1.3.8/appengine-api-labs-1.3.8.pom (with props) camel/m2-repo/com/google/appengine/appengine-api-labs/1.3.8/appengine-api-labs-1.3.8.pom.md5 camel/m2-repo/com/google/appengine/appengine-api-labs/1.3.8/appengine-api-labs-1.3.8.pom.sha1 camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.8/ camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.8/appengine-api-stubs-1.3.8.jar (with props) camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.8/appengine-api-stubs-1.3.8.jar.md5 camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.8/appengine-api-stubs-1.3.8.jar.sha1 camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.8/appengine-api-stubs-1.3.8.pom (with props) camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.8/appengine-api-stubs-1.3.8.pom.md5 camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.8/appengine-api-stubs-1.3.8.pom.sha1 camel/m2-repo/com/google/appengine/appengine-testing/1.3.8/ camel/m2-repo/com/google/appengine/appengine-testing/1.3.8/appengine-testing-1.3.8.jar (with props) camel/m2-repo/com/google/appengine/appengine-testing/1.3.8/appengine-testing-1.3.8.jar.md5 camel/m2-repo/com/google/appengine/appengine-testing/1.3.8/appengine-testing-1.3.8.jar.sha1 camel/m2-repo/com/google/appengine/appengine-testing/1.3.8/appengine-testing-1.3.8.pom (with props) camel/m2-repo/com/google/appengine/appengine-testing/1.3.8/appengine-testing-1.3.8.pom.md5 camel/m2-repo/com/google/appengine/appengine-testing/1.3.8/appengine-testing-1.3.8.pom.sha1 Modified: camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/maven-metadata.xml camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/maven-metadata.xml.md5 camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/maven-metadata.xml.sha1 camel/m2-repo/com/google/appengine/appengine-api-labs/maven-metadata.xml camel/m2-repo/com/google/appengine/appengine-api-labs/maven-metadata.xml.md5 camel/m2-repo/com/google/appengine/appengine-api-labs/maven-metadata.xml.sha1 camel/m2-repo/com/google/appengine/appengine-api-stubs/maven-metadata.xml camel/m2-repo/com/google/appengine/appengine-api-stubs/maven-metadata.xml.md5 camel/m2-repo/com/google/appengine/appengine-api-stubs/maven-metadata.xml.sha1 camel/m2-repo/com/google/appengine/appengine-testing/maven-metadata.xml camel/m2-repo/com/google/appengine/appengine-testing/maven-metadata.xml.md5 camel/m2-repo/com/google/appengine/appengine-testing/maven-metadata.xml.sha1 Added: camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.8/appengine-api-1.0-sdk-1.3.8.jar URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.8/appengine-api-1.0-sdk-1.3.8.jar?rev=1023505view=auto == Binary file - no diff available. Propchange: camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.8/appengine-api-1.0-sdk-1.3.8.jar -- svn:mime-type = application/octet-stream Added: camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.8/appengine-api-1.0-sdk-1.3.8.jar.md5 URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.8/appengine-api-1.0-sdk-1.3.8.jar.md5?rev=1023505view=auto == --- camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.8/appengine-api-1.0-sdk-1.3.8.jar.md5 (added) +++ camel/m2-repo/com/google/appengine
svn commit: r1000565 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/impl/ components/camel-gae/src/main/java/org/apache/camel/component/gae/context/ examples/camel-example-gae/
Author: krasserm
Date: Thu Sep 23 18:19:57 2010
New Revision: 1000565
URL: http://svn.apache.org/viewvc?rev=1000565view=rev
Log:
Context-sensitive setting of default UuidGenerator. Closes CAMEL-3140.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeDefaultCamelContext.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeSpringCamelContext.java
camel/trunk/examples/camel-example-gae/pom.xml
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=1000565r1=1000564r2=1000565view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
Thu Sep 23 18:19:57 2010
@@ -180,7 +180,7 @@ public class DefaultCamelContext extends
private ShutdownRunningTask shutdownRunningTask =
ShutdownRunningTask.CompleteCurrentTaskOnly;
private ExecutorServiceStrategy executorServiceStrategy = new
DefaultExecutorServiceStrategy(this);
private Debugger debugger;
-private UuidGenerator uuidGenerator = new ActiveMQUuidGenerator();
+private UuidGenerator uuidGenerator = createDefaultUuidGenerator();
private final StopWatch stopWatch = new StopWatch(false);
private Date startDate;
@@ -2161,4 +2161,13 @@ public class DefaultCamelContext extends
public static void setContextCounter(int value) {
DefaultCamelContextNameStrategy.setCounter(value);
}
+
+private static UuidGenerator createDefaultUuidGenerator() {
+if (System.getProperty(com.google.appengine.runtime.environment) !=
null) {
+// either Production or Development
+return new JavaUuidGenerator();
+} else {
+return new ActiveMQUuidGenerator();
+}
+}
}
Modified:
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeDefaultCamelContext.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeDefaultCamelContext.java?rev=1000565r1=1000564r2=1000565view=diff
==
---
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeDefaultCamelContext.java
(original)
+++
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeDefaultCamelContext.java
Thu Sep 23 18:19:57 2010
@@ -16,9 +16,7 @@
*/
package org.apache.camel.component.gae.context;
-import org.apache.camel.impl.ActiveMQUuidGenerator;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.JavaUuidGenerator;
public class GaeDefaultCamelContext extends DefaultCamelContext {
@@ -26,12 +24,6 @@ public class GaeDefaultCamelContext exte
protected void doStart() throws Exception {
// JMX not allowed on GAE
disableJMX();
-
-if (getUuidGenerator() instanceof ActiveMQUuidGenerator) {
-// use java uuid generator as ActiveMQ uses JDK API which is not
allowed on GAE
-setUuidGenerator(new JavaUuidGenerator());
-}
-
super.doStart();
}
Modified:
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeSpringCamelContext.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeSpringCamelContext.java?rev=1000565r1=1000564r2=1000565view=diff
==
---
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeSpringCamelContext.java
(original)
+++
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeSpringCamelContext.java
Thu Sep 23 18:19:57 2010
@@ -19,8 +19,6 @@ package org.apache.camel.component.gae.c
import java.util.List;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.ActiveMQUuidGenerator;
-import org.apache.camel.impl.JavaUuidGenerator;
import org.apache.camel.spring.SpringCamelContext;
public class GaeSpringCamelContext extends SpringCamelContext {
@@ -29,12 +27,6 @@ public class GaeSpringCamelContext exten
protected void doStart() throws Exception {
// JMX not allowed on GAE
disableJMX();
-
-if (getUuidGenerator() instanceof ActiveMQUuidGenerator) {
-// use java uuid generator as ActiveMQ uses JDK API which is not
allowed on GAE
-setUuidGenerator(new
svn commit: r966815 - in /camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty: CamelContinuationServlet.java CamelMultipartFilter.java JettyHttpComponent.java
Author: krasserm
Date: Thu Jul 22 19:24:24 2010
New Revision: 966815
URL: http://svn.apache.org/viewvc?rev=966815view=rev
Log:
Closes CAMEL-2986: IllegalStateException in CamelContinuationServlet under
heavy load
Added:
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelMultipartFilter.java
Modified:
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
Modified:
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java?rev=966815r1=966814r2=966815view=diff
==
---
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
(original)
+++
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
Thu Jul 22 19:24:24 2010
@@ -38,6 +38,8 @@ import org.eclipse.jetty.continuation.Co
*/
public class CamelContinuationServlet extends CamelServlet {
+static final String EXCHANGE_ATRRIBUTE_NAME = CamelExchange;
+
private static final long serialVersionUID = 1L;
@Override
@@ -50,15 +52,15 @@ public class CamelContinuationServlet ex
return;
}
-// are we suspended?
-if (consumer.isSuspended()) {
+final Continuation continuation =
ContinuationSupport.getContinuation(request);
+
+// are we suspended and a request is dispatched initially?
+if (consumer.isSuspended() continuation.isInitial()) {
response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
return;
}
-final Continuation continuation =
ContinuationSupport.getContinuation(request);
if (continuation.isInitial()) {
-
// a new request so create an exchange
final Exchange exchange = new
DefaultExchange(consumer.getEndpoint(), ExchangePattern.InOut);
if (consumer.getEndpoint().isBridgeEndpoint()) {
@@ -69,44 +71,28 @@ public class CamelContinuationServlet ex
}
exchange.setIn(new HttpMessage(exchange, request, response));
+if (log.isTraceEnabled()) {
+log.trace(Suspending continuation of exchangeId: +
exchange.getExchangeId());
+}
+continuation.suspend();
+
// use the asynchronous API to process the exchange
-boolean sync = consumer.getAsyncProcessor().process(exchange,
new AsyncCallback() {
+consumer.getAsyncProcessor().process(exchange, new
AsyncCallback() {
public void done(boolean doneSync) {
-// we only have to handle async completion
-if (doneSync) {
-return;
-}
-
-// we should resume the continuation now that we are
done asynchronously
if (log.isTraceEnabled()) {
log.trace(Resuming continuation of exchangeId:
+ exchange.getExchangeId());
}
-continuation.setAttribute(CamelExchange, exchange);
+// resume processing after both, sync and async
callbacks
+continuation.setAttribute(EXCHANGE_ATRRIBUTE_NAME,
exchange);
continuation.resume();
}
});
-
-if (!sync) {
-// wait for the exchange to get processed.
-// this might block until it completes or it might return
via an exception and
-// then this method is re-invoked once the the exchange
has finished processing
-if (log.isTraceEnabled()) {
-log.trace(Suspending continuation of exchangeId: +
exchange.getExchangeId());
-}
-continuation.suspend(response);
-return;
-}
-
-// now lets output to the response
-if (log.isTraceEnabled()) {
-log.trace(Writing response of exchangeId: +
exchange.getExchangeId());
-}
-consumer.getBinding().writeResponse(exchange, response);
return;
}
if (continuation.isResumed()) {
-Exchange exchange = (Exchange)
continuation.getAttribute(CamelExchange);
+// a re-dispatched request containing
svn commit: r966961 - in /camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty: CamelContinuationServlet.java CamelMultipartFilter.java
Author: krasserm
Date: Fri Jul 23 04:30:21 2010
New Revision: 966961
URL: http://svn.apache.org/viewvc?rev=966961view=rev
Log:
Fixed typo
Modified:
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelMultipartFilter.java
Modified:
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java?rev=966961r1=966960r2=966961view=diff
==
---
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
(original)
+++
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
Fri Jul 23 04:30:21 2010
@@ -38,7 +38,7 @@ import org.eclipse.jetty.continuation.Co
*/
public class CamelContinuationServlet extends CamelServlet {
-static final String EXCHANGE_ATRRIBUTE_NAME = CamelExchange;
+static final String EXCHANGE_ATTRIBUTE_NAME = CamelExchange;
private static final long serialVersionUID = 1L;
@@ -83,7 +83,7 @@ public class CamelContinuationServlet ex
log.trace(Resuming continuation of exchangeId:
+ exchange.getExchangeId());
}
// resume processing after both, sync and async
callbacks
-continuation.setAttribute(EXCHANGE_ATRRIBUTE_NAME,
exchange);
+continuation.setAttribute(EXCHANGE_ATTRIBUTE_NAME,
exchange);
continuation.resume();
}
});
@@ -92,7 +92,7 @@ public class CamelContinuationServlet ex
if (continuation.isResumed()) {
// a re-dispatched request containing the processing result
-Exchange exchange = (Exchange)
continuation.getAttribute(EXCHANGE_ATRRIBUTE_NAME);
+Exchange exchange = (Exchange)
continuation.getAttribute(EXCHANGE_ATTRIBUTE_NAME);
if (log.isTraceEnabled()) {
log.trace(Resuming continuation of exchangeId: +
exchange.getExchangeId());
}
Modified:
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelMultipartFilter.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelMultipartFilter.java?rev=966961r1=966960r2=966961view=diff
==
---
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelMultipartFilter.java
(original)
+++
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelMultipartFilter.java
Fri Jul 23 04:30:21 2010
@@ -33,7 +33,7 @@ class CamelMultipartFilter extends Multi
@Override
public void doFilter(ServletRequest request, ServletResponse response,
FilterChain chain) throws IOException, ServletException {
-if
(request.getAttribute(CamelContinuationServlet.EXCHANGE_ATRRIBUTE_NAME) ==
null) {
+if
(request.getAttribute(CamelContinuationServlet.EXCHANGE_ATTRIBUTE_NAME) ==
null) {
super.doFilter(request, response, chain);
} else {
chain.doFilter(request, response);
svn commit: r963184 - /camel/trunk/components/camel-hl7/pom.xml
Author: krasserm Date: Mon Jul 12 04:33:02 2010 New Revision: 963184 URL: http://svn.apache.org/viewvc?rev=963184view=rev Log: Upgrade to hapi-1.0.1 Modified: camel/trunk/components/camel-hl7/pom.xml Modified: camel/trunk/components/camel-hl7/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hl7/pom.xml?rev=963184r1=963183r2=963184view=diff == --- camel/trunk/components/camel-hl7/pom.xml (original) +++ camel/trunk/components/camel-hl7/pom.xml Mon Jul 12 04:33:02 2010 @@ -32,7 +32,7 @@ properties camel.osgi.export.pkgorg.apache.camel.component.hl7.*/camel.osgi.export.pkg -hapi-version1.0/hapi-version +hapi-version1.0.1/hapi-version /properties repositories
svn commit: r932672 - in /camel/trunk/examples/camel-example-gauth/src/main: java/org/apache/camel/example/gauth/ webapp/WEB-INF/
Author: krasserm
Date: Sat Apr 10 06:50:11 2010
New Revision: 932672
URL: http://svn.apache.org/viewvc?rev=932672view=rev
Log:
added javadocs and removed unnecessary servlet mapping.
Modified:
camel/trunk/examples/camel-example-gauth/src/main/java/org/apache/camel/example/gauth/TutorialController.java
camel/trunk/examples/camel-example-gauth/src/main/java/org/apache/camel/example/gauth/TutorialRouteBuilder.java
camel/trunk/examples/camel-example-gauth/src/main/java/org/apache/camel/example/gauth/TutorialService.java
camel/trunk/examples/camel-example-gauth/src/main/java/org/apache/camel/example/gauth/TutorialTokenProcessor.java
camel/trunk/examples/camel-example-gauth/src/main/webapp/WEB-INF/web.xml
Modified:
camel/trunk/examples/camel-example-gauth/src/main/java/org/apache/camel/example/gauth/TutorialController.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-gauth/src/main/java/org/apache/camel/example/gauth/TutorialController.java?rev=932672r1=932671r2=932672view=diff
==
---
camel/trunk/examples/camel-example-gauth/src/main/java/org/apache/camel/example/gauth/TutorialController.java
(original)
+++
camel/trunk/examples/camel-example-gauth/src/main/java/org/apache/camel/example/gauth/TutorialController.java
Sat Apr 10 06:50:11 2010
@@ -29,6 +29,19 @@ import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+/**
+ * Single controller for the demo application that handles GET requests.
Obtains OAuth access
+ * token and access token secret from cookies and uses them to obtain calendar
names from the
+ * Google Calendar API. If the interaction with the calendar API fails due to
invalid or non-
+ * existing OAuth tokens an error message is displayed in authorize.jsp. If it
succeeds the
+ * calendar names are displayed in calendar.jsp.
+ * p
+ * In production systems it is emnot/em recommended to store access tokens
in cookies. The
+ * recommended approach is to store them in a database. The demo application
is only doing that
+ * to keep the example as simple as possible. However, an attacker could not
use an access token
+ * alone to get access to a user's calendar data because the application's
consumer secret is
+ * necessary for that as well. The consumer secret never leaves the demo
application.
+ */
@Controller
@RequestMapping(/calendar)
public class TutorialController {
@@ -44,7 +57,8 @@ public class TutorialController {
ModelMap model) throws Exception {
ListString calendarNames = null;
-
+
+// Get OAuth tokens from cookies
String accessToken = getAccessToken(request);
String accessTokenSecret = getAccessTokenSecret(request);
@@ -54,6 +68,7 @@ public class TutorialController {
}
try {
+// Get calendar names from Google Calendar API
calendarNames = service.getCalendarNames(accessToken,
accessTokenSecret);
} catch (AuthenticationException e) {
model.put(message, OAuth access token invalid);
Modified:
camel/trunk/examples/camel-example-gauth/src/main/java/org/apache/camel/example/gauth/TutorialRouteBuilder.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-gauth/src/main/java/org/apache/camel/example/gauth/TutorialRouteBuilder.java?rev=932672r1=932671r2=932672view=diff
==
---
camel/trunk/examples/camel-example-gauth/src/main/java/org/apache/camel/example/gauth/TutorialRouteBuilder.java
(original)
+++
camel/trunk/examples/camel-example-gauth/src/main/java/org/apache/camel/example/gauth/TutorialRouteBuilder.java
Sat Apr 10 06:50:11 2010
@@ -20,10 +20,18 @@ import java.net.URLEncoder;
import org.apache.camel.builder.RouteBuilder;
+/**
+ * Builds the OAuth-specific routes (implements the OAuth integration layer)
of the demo application.
+ */
public class TutorialRouteBuilder extends RouteBuilder {
private String application;
+/**
+ * Sets the name of the GAE application.
+ *
+ * @param application a GAE application name.
+ */
public void setApplication(String application) {
this.application = application;
}
@@ -31,12 +39,22 @@ public class TutorialRouteBuilder extend
@Override
public void configure() throws Exception {
+// Callback URL for sending back an authorized access token.
String encodedCallback =
URLEncoder.encode(String.format(https://%s.appspot.com/camel/handler;,
application), UTF-8);
+// Google should issue an access token that is scoped to calendar
feeds.
String encodedScope =
URLEncoder.encode(http://www.google.com/calendar/feeds/;, UTF-8);
+// Route for obtaining an unauthorized
svn commit: r932272 - /camel/trunk/examples/camel-example-gauth/pom.xml
Author: krasserm Date: Fri Apr 9 07:15:08 2010 New Revision: 932272 URL: http://svn.apache.org/viewvc?rev=932272view=rev Log: added missing camel m2 repo to pom.xml Modified: camel/trunk/examples/camel-example-gauth/pom.xml Modified: camel/trunk/examples/camel-example-gauth/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-gauth/pom.xml?rev=932272r1=932271r2=932272view=diff == --- camel/trunk/examples/camel-example-gauth/pom.xml (original) +++ camel/trunk/examples/camel-example-gauth/pom.xml Fri Apr 9 07:15:08 2010 @@ -67,4 +67,18 @@ /dependency /dependencies +repositories +repository +idcamel.internal.maven.repository/id +nameCamel Maven Repository/name +urlhttp://svn.apache.org/repos/asf/camel/m2-repo/url +releases +enabledtrue/enabled +/releases +snapshots +enabledfalse/enabled +/snapshots +/repository +/repositories + /project
svn commit: r932298 - in /camel/trunk/examples: camel-example-gae/ camel-example-gauth/ camel-example-gauth/src/main/java/org/apache/camel/example/gauth/ camel-example-gauth/src/main/resources/ camel-
Author: krasserm
Date: Fri Apr 9 08:32:10 2010
New Revision: 932298
URL: http://svn.apache.org/viewvc?rev=932298view=rev
Log:
improvements to application configuration and minor edits
Added:
camel/trunk/examples/camel-example-gauth/src/main/resources/appengine-web.xml
(with props)
Removed:
camel/trunk/examples/camel-example-gauth/src/main/webapp/WEB-INF/appengine-web.xml
Modified:
camel/trunk/examples/camel-example-gae/pom.xml
camel/trunk/examples/camel-example-gauth/pom.xml
camel/trunk/examples/camel-example-gauth/src/main/java/org/apache/camel/example/gauth/TutorialRouteBuilder.java
camel/trunk/examples/camel-example-gauth/src/main/resources/context-camel.xml
camel/trunk/examples/camel-example-gauth/src/main/resources/context.properties
camel/trunk/examples/camel-example-gauth/src/main/webapp/WEB-INF/jsp/top.jsp
camel/trunk/examples/camel-example-gauth/src/main/webapp/index.html
Modified: camel/trunk/examples/camel-example-gae/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-gae/pom.xml?rev=932298r1=932297r2=932298view=diff
==
--- camel/trunk/examples/camel-example-gae/pom.xml (original)
+++ camel/trunk/examples/camel-example-gae/pom.xml Fri Apr 9 08:32:10 2010
@@ -42,4 +42,18 @@
/dependency
/dependencies
+repositories
+repository
+idcamel.internal.maven.repository/id
+nameCamel Maven Repository/name
+urlhttp://svn.apache.org/repos/asf/camel/m2-repo/url
+releases
+enabledtrue/enabled
+/releases
+snapshots
+enabledfalse/enabled
+/snapshots
+/repository
+/repositories
+
/project
Modified: camel/trunk/examples/camel-example-gauth/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-gauth/pom.xml?rev=932298r1=932297r2=932298view=diff
==
--- camel/trunk/examples/camel-example-gauth/pom.xml (original)
+++ camel/trunk/examples/camel-example-gauth/pom.xml Fri Apr 9 08:32:10 2010
@@ -15,6 +15,12 @@
packagingwar/packaging
properties
+!-- application properties --
+gae.application.namereplaceme/gae.application.name
+gae.consumer.keyreplaceme/gae.consumer.key
+gae.consumer.secretreplaceme/gae.consumer.secret
+
+!-- dependency versions --
gdata-version1.41.1/gdata-version
/properties
@@ -66,7 +72,50 @@
scopetest/scope
/dependency
/dependencies
-
+
+build
+plugins
+plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-war-plugin/artifactId
+configuration
+webResources
+!--
+ Copied from root pom.xml because it is not combined
+ with custom resource configuration below.
+--
+resource
+
directory${project.build.outputDirectory}/directory
+includes
+includeMETA-INF/LICENSE*/include
+includeMETA-INF/NOTICE*/include
+includeMETA-INF/DEPENDENCIES*/include
+/includes
+/resource
+resource
+directorysrc/main/resources/directory
+targetPathWEB-INF/targetPath
+filteringtrue/filtering
+includes
+includeappengine-web.xml/include
+/includes
+/resource
+/webResources
+/configuration
+/plugin
+/plugins
+
+resources
+resource
+directorysrc/main/resources/directory
+filteringtrue/filtering
+excludes
+excludeappengine-web.xml/exclude
+/excludes
+/resource
+/resources
+/build
+
repositories
repository
idcamel.internal.maven.repository/id
Modified:
camel/trunk/examples/camel-example-gauth/src/main/java/org/apache/camel/example/gauth/TutorialRouteBuilder.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-gauth/src/main/java/org/apache/camel/example/gauth/TutorialRouteBuilder.java?rev=932298r1=932297r2=932298view=diff
==
---
camel/trunk/examples/camel-example-gauth/src/main/java/org/apache/camel/example/gauth/TutorialRouteBuilder.java
(original)
+++
camel/trunk/examples/camel-example
svn commit: r932436 - /camel/trunk/examples/camel-example-gauth/src/main/webapp/WEB-INF/jsp/bottom.jsp
Author: krasserm Date: Fri Apr 9 14:42:18 2010 New Revision: 932436 URL: http://svn.apache.org/viewvc?rev=932436view=rev Log: update link to Camel OAuth tutorial. Modified: camel/trunk/examples/camel-example-gauth/src/main/webapp/WEB-INF/jsp/bottom.jsp Modified: camel/trunk/examples/camel-example-gauth/src/main/webapp/WEB-INF/jsp/bottom.jsp URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-gauth/src/main/webapp/WEB-INF/jsp/bottom.jsp?rev=932436r1=932435r2=932436view=diff == --- camel/trunk/examples/camel-example-gauth/src/main/webapp/WEB-INF/jsp/bottom.jsp (original) +++ camel/trunk/examples/camel-example-gauth/src/main/webapp/WEB-INF/jsp/bottom.jsp Fri Apr 9 14:42:18 2010 @@ -4,7 +4,7 @@ bAbout this application:/bbr This application retrieves the names of your public and private Google calendars from the a href=http://code.google.com/intl/de-DE/apis/calendar/data/2.0/developers_guide.html;Google Calendar API/a.br -Follow a href=this link/a for a detailed description about deployment, +Follow a href=http://camel.apache.org/tutorial-oauth.html;this link/a for a detailed description about deployment, usage and implementation of this application. /body /html
svn commit: r932453 - /camel/trunk/examples/camel-example-gauth/README.txt
Author: krasserm Date: Fri Apr 9 15:13:16 2010 New Revision: 932453 URL: http://svn.apache.org/viewvc?rev=932453view=rev Log: added link to tutorial page Modified: camel/trunk/examples/camel-example-gauth/README.txt Modified: camel/trunk/examples/camel-example-gauth/README.txt URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-gauth/README.txt?rev=932453r1=932452r2=932453view=diff == --- camel/trunk/examples/camel-example-gauth/README.txt (original) +++ camel/trunk/examples/camel-example-gauth/README.txt Fri Apr 9 15:13:16 2010 @@ -1,7 +1,8 @@ GAuth Example = -TODO: fill in description and link to tutorial +Building, deplyoing and running this example is described in detail at +http://camel.apache.org/tutorial-oauth.html Please help us make Apache Camel better - we appreciate any feedback you may have.
svn commit: r932250 - in /camel/trunk/examples/camel-example-gae: pom.xml src/main/webapp/WEB-INF/lib/
Author: krasserm Date: Fri Apr 9 05:07:17 2010 New Revision: 932250 URL: http://svn.apache.org/viewvc?rev=932250view=rev Log: get rid of checked-in jars (required GAE SDK dependencies now in central Maven repository). Removed: camel/trunk/examples/camel-example-gae/src/main/webapp/WEB-INF/lib/ Modified: camel/trunk/examples/camel-example-gae/pom.xml Modified: camel/trunk/examples/camel-example-gae/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-gae/pom.xml?rev=932250r1=932249r2=932250view=diff == --- camel/trunk/examples/camel-example-gae/pom.xml (original) +++ camel/trunk/examples/camel-example-gae/pom.xml Fri Apr 9 05:07:17 2010 @@ -20,6 +20,11 @@ artifactIdcamel-gae/artifactId /dependency dependency +groupIdcom.google.appengine.orm/groupId +artifactIddatanucleus-appengine/artifactId +version1.0.5/version +/dependency +dependency groupIdcom.sun.xml.bind/groupId artifactIdjaxb-impl/artifactId scoperuntime/scope
svn commit: r932255 - in /camel/trunk/examples: ./ camel-example-gauth/ camel-example-gauth/src/ camel-example-gauth/src/main/ camel-example-gauth/src/main/java/ camel-example-gauth/src/main/java/org/
Author: krasserm Date: Fri Apr 9 05:33:15 2010 New Revision: 932255 URL: http://svn.apache.org/viewvc?rev=932255view=rev Log: CAMEL-2626: OAuth demo webapp. Added: camel/trunk/examples/camel-example-gauth/ (with props) camel/trunk/examples/camel-example-gauth/README.txt (with props) camel/trunk/examples/camel-example-gauth/pom.xml (with props) camel/trunk/examples/camel-example-gauth/src/ camel/trunk/examples/camel-example-gauth/src/main/ camel/trunk/examples/camel-example-gauth/src/main/java/ camel/trunk/examples/camel-example-gauth/src/main/java/org/ camel/trunk/examples/camel-example-gauth/src/main/java/org/apache/ camel/trunk/examples/camel-example-gauth/src/main/java/org/apache/camel/ camel/trunk/examples/camel-example-gauth/src/main/java/org/apache/camel/example/ camel/trunk/examples/camel-example-gauth/src/main/java/org/apache/camel/example/gauth/ camel/trunk/examples/camel-example-gauth/src/main/java/org/apache/camel/example/gauth/TutorialController.java (with props) camel/trunk/examples/camel-example-gauth/src/main/java/org/apache/camel/example/gauth/TutorialRouteBuilder.java (with props) camel/trunk/examples/camel-example-gauth/src/main/java/org/apache/camel/example/gauth/TutorialService.java (with props) camel/trunk/examples/camel-example-gauth/src/main/java/org/apache/camel/example/gauth/TutorialTokenProcessor.java (with props) camel/trunk/examples/camel-example-gauth/src/main/resources/ camel/trunk/examples/camel-example-gauth/src/main/resources/META-INF/ camel/trunk/examples/camel-example-gauth/src/main/resources/META-INF/LICENSE.txt (with props) camel/trunk/examples/camel-example-gauth/src/main/resources/META-INF/NOTICE.txt (with props) camel/trunk/examples/camel-example-gauth/src/main/resources/context-camel.xml (with props) camel/trunk/examples/camel-example-gauth/src/main/resources/context-web.xml (with props) camel/trunk/examples/camel-example-gauth/src/main/resources/context.properties (with props) camel/trunk/examples/camel-example-gauth/src/main/resources/log4j.properties (with props) camel/trunk/examples/camel-example-gauth/src/main/webapp/ camel/trunk/examples/camel-example-gauth/src/main/webapp/WEB-INF/ camel/trunk/examples/camel-example-gauth/src/main/webapp/WEB-INF/appengine-web.xml (with props) camel/trunk/examples/camel-example-gauth/src/main/webapp/WEB-INF/jsp/ camel/trunk/examples/camel-example-gauth/src/main/webapp/WEB-INF/jsp/authorize.jsp (with props) camel/trunk/examples/camel-example-gauth/src/main/webapp/WEB-INF/jsp/bottom.jsp (with props) camel/trunk/examples/camel-example-gauth/src/main/webapp/WEB-INF/jsp/calendar.jsp (with props) camel/trunk/examples/camel-example-gauth/src/main/webapp/WEB-INF/jsp/top.jsp (with props) camel/trunk/examples/camel-example-gauth/src/main/webapp/WEB-INF/logging.properties (with props) camel/trunk/examples/camel-example-gauth/src/main/webapp/WEB-INF/web.xml (with props) camel/trunk/examples/camel-example-gauth/src/main/webapp/images/ camel/trunk/examples/camel-example-gauth/src/main/webapp/images/camel.png (with props) camel/trunk/examples/camel-example-gauth/src/main/webapp/index.html (with props) Modified: camel/trunk/examples/pom.xml Propchange: camel/trunk/examples/camel-example-gauth/ -- --- svn:ignore (added) +++ svn:ignore Fri Apr 9 05:33:15 2010 @@ -0,0 +1,8 @@ +.checkstyle +.pmd +eclipse-classes +target +.classpath +.project +.settings +*.i?? Added: camel/trunk/examples/camel-example-gauth/README.txt URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-gauth/README.txt?rev=932255view=auto == --- camel/trunk/examples/camel-example-gauth/README.txt (added) +++ camel/trunk/examples/camel-example-gauth/README.txt Fri Apr 9 05:33:15 2010 @@ -0,0 +1,14 @@ +GAuth Example += + +TODO: fill in description and link to tutorial + +Please help us make Apache Camel better - we appreciate any feedback you +may have. + +Enjoy! + + +The Camel riders! + + Propchange: camel/trunk/examples/camel-example-gauth/README.txt -- svn:eol-style = native Added: camel/trunk/examples/camel-example-gauth/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-gauth/pom.xml?rev=932255view=auto == --- camel/trunk/examples/camel-example-gauth/pom.xml (added) +++ camel/trunk/examples/camel-example-gauth/pom.xml Fri Apr 9 05:33:15 2010 @@ -0,0 +1,70 @@ +?xml version=1.0 encoding=UTF-8? +project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http
svn commit: r931046 - in /camel/m2-repo/com/google/gdata/gdata-client: ./ 1.41.1/
Author: krasserm Date: Tue Apr 6 08:11:45 2010 New Revision: 931046 URL: http://svn.apache.org/viewvc?rev=931046view=rev Log: upload of gdata-client lib (needed by GAE examples) Added: camel/m2-repo/com/google/gdata/gdata-client/ camel/m2-repo/com/google/gdata/gdata-client/1.41.1/ camel/m2-repo/com/google/gdata/gdata-client/1.41.1/gdata-client-1.41.1.jar (with props) camel/m2-repo/com/google/gdata/gdata-client/1.41.1/gdata-client-1.41.1.jar.md5 camel/m2-repo/com/google/gdata/gdata-client/1.41.1/gdata-client-1.41.1.jar.sha1 camel/m2-repo/com/google/gdata/gdata-client/1.41.1/gdata-client-1.41.1.pom (with props) camel/m2-repo/com/google/gdata/gdata-client/1.41.1/gdata-client-1.41.1.pom.md5 camel/m2-repo/com/google/gdata/gdata-client/1.41.1/gdata-client-1.41.1.pom.sha1 camel/m2-repo/com/google/gdata/gdata-client/maven-metadata.xml (with props) camel/m2-repo/com/google/gdata/gdata-client/maven-metadata.xml.md5 camel/m2-repo/com/google/gdata/gdata-client/maven-metadata.xml.sha1 Added: camel/m2-repo/com/google/gdata/gdata-client/1.41.1/gdata-client-1.41.1.jar URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/gdata/gdata-client/1.41.1/gdata-client-1.41.1.jar?rev=931046view=auto == Binary file - no diff available. Propchange: camel/m2-repo/com/google/gdata/gdata-client/1.41.1/gdata-client-1.41.1.jar -- svn:mime-type = application/octet-stream Added: camel/m2-repo/com/google/gdata/gdata-client/1.41.1/gdata-client-1.41.1.jar.md5 URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/gdata/gdata-client/1.41.1/gdata-client-1.41.1.jar.md5?rev=931046view=auto == --- camel/m2-repo/com/google/gdata/gdata-client/1.41.1/gdata-client-1.41.1.jar.md5 (added) +++ camel/m2-repo/com/google/gdata/gdata-client/1.41.1/gdata-client-1.41.1.jar.md5 Tue Apr 6 08:11:45 2010 @@ -0,0 +1 @@ +9b3c2d174f31d9fa6f497ee4b73c9422 \ No newline at end of file Added: camel/m2-repo/com/google/gdata/gdata-client/1.41.1/gdata-client-1.41.1.jar.sha1 URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/gdata/gdata-client/1.41.1/gdata-client-1.41.1.jar.sha1?rev=931046view=auto == --- camel/m2-repo/com/google/gdata/gdata-client/1.41.1/gdata-client-1.41.1.jar.sha1 (added) +++ camel/m2-repo/com/google/gdata/gdata-client/1.41.1/gdata-client-1.41.1.jar.sha1 Tue Apr 6 08:11:45 2010 @@ -0,0 +1 @@ +120f1423ea776073ef2655088626da436d6ca4e9 \ No newline at end of file Added: camel/m2-repo/com/google/gdata/gdata-client/1.41.1/gdata-client-1.41.1.pom URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/gdata/gdata-client/1.41.1/gdata-client-1.41.1.pom?rev=931046view=auto == --- camel/m2-repo/com/google/gdata/gdata-client/1.41.1/gdata-client-1.41.1.pom (added) +++ camel/m2-repo/com/google/gdata/gdata-client/1.41.1/gdata-client-1.41.1.pom Tue Apr 6 08:11:45 2010 @@ -0,0 +1,8 @@ +?xml version=1.0 encoding=UTF-8? +project xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; xmlns=http://maven.apache.org/POM/4.0.0; +xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; + modelVersion4.0.0/modelVersion + groupIdcom.google.gdata/groupId + artifactIdgdata-client/artifactId + version1.41.1/version +/project Propchange: camel/m2-repo/com/google/gdata/gdata-client/1.41.1/gdata-client-1.41.1.pom -- svn:eol-style = native Added: camel/m2-repo/com/google/gdata/gdata-client/1.41.1/gdata-client-1.41.1.pom.md5 URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/gdata/gdata-client/1.41.1/gdata-client-1.41.1.pom.md5?rev=931046view=auto == --- camel/m2-repo/com/google/gdata/gdata-client/1.41.1/gdata-client-1.41.1.pom.md5 (added) +++ camel/m2-repo/com/google/gdata/gdata-client/1.41.1/gdata-client-1.41.1.pom.md5 Tue Apr 6 08:11:45 2010 @@ -0,0 +1 @@ +f0e526c736429f3e1604477a9feb9f1e \ No newline at end of file Added: camel/m2-repo/com/google/gdata/gdata-client/1.41.1/gdata-client-1.41.1.pom.sha1 URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/gdata/gdata-client/1.41.1/gdata-client-1.41.1.pom.sha1?rev=931046view=auto == --- camel/m2-repo/com/google/gdata/gdata-client/1.41.1/gdata-client-1.41.1.pom.sha1 (added) +++ camel/m2-repo/com/google/gdata/gdata-client/1.41.1/gdata-client-1.41.1.pom.sha1 Tue Apr 6 08:11:45 2010 @@ -0,0 +1 @@ +a28770eb9708fe73f7a14db43182ef2d7145265c \ No newline
svn commit: r930897 - in /camel/trunk/components/camel-gae: pom.xml src/main/java/org/apache/camel/component/gae/auth/GAuthAuthorizeBinding.java src/main/java/org/apache/camel/component/gae/auth/GAuth
Author: krasserm
Date: Mon Apr 5 16:25:08 2010
New Revision: 930897
URL: http://svn.apache.org/viewvc?rev=930897view=rev
Log:
propagate message headers in gauth endpoints, use latest gdata version.
Modified:
camel/trunk/components/camel-gae/pom.xml
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthAuthorizeBinding.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthUpgradeBinding.java
Modified: camel/trunk/components/camel-gae/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/pom.xml?rev=930897r1=930896r2=930897view=diff
==
--- camel/trunk/components/camel-gae/pom.xml (original)
+++ camel/trunk/components/camel-gae/pom.xml Mon Apr 5 16:25:08 2010
@@ -33,7 +33,7 @@
properties
camel.osgi.export.pkgorg.apache.camel.component.gae.*/camel.osgi.export.pkg
appengine-sdk-version1.3.2/appengine-sdk-version
-gdata-version1.40.2/gdata-version
+gdata-version1.41.1/gdata-version
/properties
dependencies
Modified:
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthAuthorizeBinding.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthAuthorizeBinding.java?rev=930897r1=930896r2=930897view=diff
==
---
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthAuthorizeBinding.java
(original)
+++
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthAuthorizeBinding.java
Mon Apr 5 16:25:08 2010
@@ -82,6 +82,7 @@ public class GAuthAuthorizeBinding imple
*/
public Exchange readResponse(GAuthEndpoint endpoint, Exchange exchange,
GoogleOAuthParameters response) throws Exception {
String authrUrl =
endpoint.newOAuthHelper().createUserAuthorizationUrl(response);
+exchange.getOut().setHeaders(exchange.getIn().getHeaders());
exchange.getOut().setHeader(Exchange.HTTP_RESPONSE_CODE, 302);
exchange.getOut().setHeader(Location, authrUrl);
Modified:
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthUpgradeBinding.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthUpgradeBinding.java?rev=930897r1=930896r2=930897view=diff
==
---
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthUpgradeBinding.java
(original)
+++
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthUpgradeBinding.java
Mon Apr 5 16:25:08 2010
@@ -89,6 +89,7 @@ public class GAuthUpgradeBinding impleme
* @see #GAUTH_ACCESS_TOKEN_SECRET
*/
public Exchange readResponse(GAuthEndpoint endpoint, Exchange exchange,
GoogleOAuthParameters response) throws IOException {
+exchange.getOut().setHeaders(exchange.getIn().getHeaders());
exchange.getOut().setHeader(GAUTH_ACCESS_TOKEN,
response.getOAuthToken());
exchange.getOut().setHeader(GAUTH_ACCESS_TOKEN_SECRET,
response.getOAuthTokenSecret());
return exchange;
svn commit: r930900 - in /camel/m2-repo/com/google/common: ./ google-collect/ google-collect/1.0/
Author: krasserm Date: Mon Apr 5 16:53:06 2010 New Revision: 930900 URL: http://svn.apache.org/viewvc?rev=930900view=rev Log: upload of google collection lib (needed by GAE examples) Added: camel/m2-repo/com/google/common/ camel/m2-repo/com/google/common/google-collect/ camel/m2-repo/com/google/common/google-collect/1.0/ camel/m2-repo/com/google/common/google-collect/1.0/google-collect-1.0.jar (with props) camel/m2-repo/com/google/common/google-collect/1.0/google-collect-1.0.jar.md5 camel/m2-repo/com/google/common/google-collect/1.0/google-collect-1.0.jar.sha1 camel/m2-repo/com/google/common/google-collect/1.0/google-collect-1.0.pom (with props) camel/m2-repo/com/google/common/google-collect/1.0/google-collect-1.0.pom.md5 camel/m2-repo/com/google/common/google-collect/1.0/google-collect-1.0.pom.sha1 camel/m2-repo/com/google/common/google-collect/maven-metadata.xml (with props) camel/m2-repo/com/google/common/google-collect/maven-metadata.xml.md5 camel/m2-repo/com/google/common/google-collect/maven-metadata.xml.sha1 Added: camel/m2-repo/com/google/common/google-collect/1.0/google-collect-1.0.jar URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/common/google-collect/1.0/google-collect-1.0.jar?rev=930900view=auto == Binary file - no diff available. Propchange: camel/m2-repo/com/google/common/google-collect/1.0/google-collect-1.0.jar -- svn:mime-type = application/octet-stream Added: camel/m2-repo/com/google/common/google-collect/1.0/google-collect-1.0.jar.md5 URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/common/google-collect/1.0/google-collect-1.0.jar.md5?rev=930900view=auto == --- camel/m2-repo/com/google/common/google-collect/1.0/google-collect-1.0.jar.md5 (added) +++ camel/m2-repo/com/google/common/google-collect/1.0/google-collect-1.0.jar.md5 Mon Apr 5 16:53:06 2010 @@ -0,0 +1 @@ +b5483f116137f86201dc96c1dcfc7083 \ No newline at end of file Added: camel/m2-repo/com/google/common/google-collect/1.0/google-collect-1.0.jar.sha1 URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/common/google-collect/1.0/google-collect-1.0.jar.sha1?rev=930900view=auto == --- camel/m2-repo/com/google/common/google-collect/1.0/google-collect-1.0.jar.sha1 (added) +++ camel/m2-repo/com/google/common/google-collect/1.0/google-collect-1.0.jar.sha1 Mon Apr 5 16:53:06 2010 @@ -0,0 +1 @@ +a2437cd90ef0e7f0840645489f4226e73400d0dc \ No newline at end of file Added: camel/m2-repo/com/google/common/google-collect/1.0/google-collect-1.0.pom URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/common/google-collect/1.0/google-collect-1.0.pom?rev=930900view=auto == --- camel/m2-repo/com/google/common/google-collect/1.0/google-collect-1.0.pom (added) +++ camel/m2-repo/com/google/common/google-collect/1.0/google-collect-1.0.pom Mon Apr 5 16:53:06 2010 @@ -0,0 +1,8 @@ +?xml version=1.0 encoding=UTF-8? +project xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; xmlns=http://maven.apache.org/POM/4.0.0; +xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; + modelVersion4.0.0/modelVersion + groupIdcom.google.common/groupId + artifactIdgoogle-collect/artifactId + version1.0/version +/project Propchange: camel/m2-repo/com/google/common/google-collect/1.0/google-collect-1.0.pom -- svn:eol-style = native Added: camel/m2-repo/com/google/common/google-collect/1.0/google-collect-1.0.pom.md5 URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/common/google-collect/1.0/google-collect-1.0.pom.md5?rev=930900view=auto == --- camel/m2-repo/com/google/common/google-collect/1.0/google-collect-1.0.pom.md5 (added) +++ camel/m2-repo/com/google/common/google-collect/1.0/google-collect-1.0.pom.md5 Mon Apr 5 16:53:06 2010 @@ -0,0 +1 @@ +baf6fc024e67900df3d6a86d44236256 \ No newline at end of file Added: camel/m2-repo/com/google/common/google-collect/1.0/google-collect-1.0.pom.sha1 URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/common/google-collect/1.0/google-collect-1.0.pom.sha1?rev=930900view=auto == --- camel/m2-repo/com/google/common/google-collect/1.0/google-collect-1.0.pom.sha1 (added) +++ camel/m2-repo/com/google/common/google-collect/1.0/google-collect-1.0.pom.sha1 Mon Apr 5 16:53:06 2010 @@ -0,0 +1
svn commit: r930633 - in /camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae: http/GHttpTestServlet.java mail/MockMailService.java
Author: krasserm
Date: Sun Apr 4 07:29:56 2010
New Revision: 930633
URL: http://svn.apache.org/viewvc?rev=930633view=rev
Log:
fix broken camel-gae build. I owe Claus a beer.
Added:
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpTestServlet.java
(with props)
Removed:
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/mail/MockMailService.java
Added:
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpTestServlet.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpTestServlet.java?rev=930633view=auto
==
---
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpTestServlet.java
(added)
+++
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpTestServlet.java
Sun Apr 4 07:29:56 2010
@@ -0,0 +1,65 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+package org.apache.camel.component.gae.http;
+
+import java.io.IOException;
+import java.util.Enumeration;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.io.IOUtils;
+
+public class GHttpTestServlet extends HttpServlet {
+@Override
+protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
+doPost(req, resp);
+}
+
+@Override
+protected void doPost(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
+// Set default response code
+resp.setStatus(200);
+// Copy headers from request to response
+EnumerationString headerNames = req.getHeaderNames();
+while (headerNames.hasMoreElements()) {
+String headerName = headerNames.nextElement();
+EnumerationString headers = req.getHeaders(headerName);
+while (headers.hasMoreElements()) {
+String headerValue = headers.nextElement();
+resp.addHeader(headerName, headerValue);
+// Set custom response code
+// if requested by client
+if (headerName.equals(code)) {
+resp.setStatus(Integer.parseInt(headerValue));
+}
+}
+}
+
+// add some special response headers
+resp.addHeader(testUrl, req.getRequestURL().toString());
+resp.addHeader(testMethod, req.getMethod().toString());
+if (req.getQueryString() != null) {
+resp.addHeader(testQuery, req.getQueryString());
+}
+
+// Copy body from request to response
+resp.getWriter().println(IOUtils.toString(req.getInputStream()));
+resp.getWriter().flush();
+}
+}
Propchange:
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpTestServlet.java
--
svn:eol-style = native
svn commit: r930675 - in /camel/trunk/components/camel-gae/src: main/java/org/apache/camel/component/gae/task/ test/java/com/google/appengine/api/labs/taskqueue/ test/java/org/apache/camel/component/g
Author: krasserm Date: Sun Apr 4 12:43:38 2010 New Revision: 930675 URL: http://svn.apache.org/viewvc?rev=930675view=rev Log: CAMEL-2606: all camel-gae tests now based on GAE SDK mocks Added: camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/TestConfig.java (with props) Removed: camel/trunk/components/camel-gae/src/test/java/com/google/appengine/api/labs/taskqueue/ camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/MockQueue.java Modified: camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskComponent.java camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/auth/GAuthAuthorizeBindingTest.java camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/auth/GAuthTestUtils.java camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/auth/GAuthUpgradeBindingTest.java camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpBindingTest.java camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpCombinedRouteBuilder.java camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpCombinedRouteBuilderTest.java camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpOutboundRouteBuilder.java camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpOutboundRouteBuilderTest.java camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpTestUtils.java camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/login/GLoginEndpointTest.java camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/login/GLoginTestUtils.java camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/mail/GMailBindingTest.java camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/mail/GMailEndpointTest.java camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/support/ServletTestSupport.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/GTaskCombinedRouteBuilder.java camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/GTaskCombinedRouteBuilderTest.java camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/GTaskEndpointTest.java camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/GTaskTestUtils.java camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/task/context-combined.xml 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=930675r1=930674r2=930675view=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 Sun Apr 4 12:43:38 2010 @@ -50,8 +50,6 @@ public class GTaskComponent extends Serv parameters, outboundBindingRef, OutboundBinding.class, new GTaskBinding()); InboundBinding inboundBinding = resolveAndRemoveReferenceParameter( parameters, inboundBindingRef, InboundBinding.class, new GTaskBinding()); -Queue queue = resolveAndRemoveReferenceParameter( -parameters, queueRef, Queue.class, QueueFactory.getQueue(remaining)); GTaskEndpointInfo info = new GTaskEndpointInfo(uri, remaining); GTaskEndpoint endpoint = (GTaskEndpoint)super.createEndpoint( info.getCanonicalUri(), @@ -60,7 +58,7 @@ public class GTaskComponent extends Serv endpoint.setWorkerRoot(workerRoot); endpoint.setOutboundBinding(outboundBinding); endpoint.setInboundBinding(inboundBinding); -endpoint.setQueue(queue); +endpoint.setQueue(QueueFactory.getQueue(remaining)); return endpoint; } Added: camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/TestConfig.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/TestConfig.java?rev=930675view=auto == --- camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/TestConfig.java (added) +++ camel
svn commit: r930677 - /camel/trunk/components/camel-gae/src/test/java/com/
Author: krasserm Date: Sun Apr 4 12:49:59 2010 New Revision: 930677 URL: http://svn.apache.org/viewvc?rev=930677view=rev Log: remove obsolete com.google directories Removed: camel/trunk/components/camel-gae/src/test/java/com/
svn commit: r930535 - in /camel/trunk/components/camel-gae: ./ src/main/java/org/apache/camel/component/gae/http/ src/main/java/org/apache/camel/component/gae/mail/ src/test/java/com/google/appengine/
Author: krasserm
Date: Sat Apr 3 15:57:29 2010
New Revision: 930535
URL: http://svn.apache.org/viewvc?rev=930535view=rev
Log:
use GAE SDK mocks for gmail component tests, minor edits in gmail component
Removed:
camel/trunk/components/camel-gae/src/test/java/com/google/appengine/api/urlfetch/
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/MockUrlFetchService.java
Modified:
camel/trunk/components/camel-gae/pom.xml
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpComponent.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpEndpoint.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailComponent.java
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpBindingTest.java
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpCombinedRouteBuilder.java
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpCombinedRouteBuilderTest.java
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpEndpointTest.java
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpInboundRouteBuilderTest.java
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpOutboundRouteBuilder.java
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpOutboundRouteBuilderTest.java
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpTestUtils.java
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/mail/GMailBindingTest.java
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/mail/GMailEndpointTest.java
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/mail/GMailOutboundRouteBuilderTest.java
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/mail/GMailTestUtils.java
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/support/ServletTestSupport.java
camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/context-combined.xml
camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/context-inbound.xml
camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/context-outbound.xml
Modified: camel/trunk/components/camel-gae/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/pom.xml?rev=930535r1=930534r2=930535view=diff
==
--- camel/trunk/components/camel-gae/pom.xml (original)
+++ camel/trunk/components/camel-gae/pom.xml Sat Apr 3 15:57:29 2010
@@ -78,6 +78,14 @@
version${appengine-sdk-version}/version
/dependency
dependency
+ groupIdorg.eclipse.jetty/groupId
+ artifactIdjetty-server/artifactId
+/dependency
+dependency
+ groupIdorg.eclipse.jetty/groupId
+ artifactIdjetty-servlet/artifactId
+/dependency
+dependency
groupIdorg.apache.camel/groupId
artifactIdcamel-test/artifactId
scopetest/scope
Modified:
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpComponent.java?rev=930535r1=930534r2=930535view=diff
==
---
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpComponent.java
(original)
+++
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpComponent.java
Sat Apr 3 15:57:29 2010
@@ -19,9 +19,6 @@ package org.apache.camel.component.gae.h
import java.net.URI;
import java.util.Map;
-import com.google.appengine.api.urlfetch.URLFetchService;
-import com.google.appengine.api.urlfetch.URLFetchServiceFactory;
-
import org.apache.camel.Endpoint;
import org.apache.camel.component.gae.bind.InboundBinding;
import org.apache.camel.component.gae.bind.OutboundBinding;
@@ -50,14 +47,11 @@ public class GHttpComponent extends Serv
parameters, outboundBindingRef, OutboundBinding.class, new
GHttpBinding());
InboundBinding inboundBinding = resolveAndRemoveReferenceParameter(
parameters, inboundBindingRef, InboundBinding.class, new
GHttpBinding());
-URLFetchService service = resolveAndRemoveReferenceParameter(
-parameters, urlFetchServiceRef, URLFetchService.class,
URLFetchServiceFactory.getURLFetchService());
GHttpEndpoint endpoint
svn commit: r930208 - in /camel/trunk/components/camel-gae: ./ src/main/java/org/apache/camel/component/gae/mail/ src/test/java/org/apache/camel/component/gae/mail/ src/test/resources/org/apache/camel
Author: krasserm
Date: Fri Apr 2 09:42:23 2010
New Revision: 930208
URL: http://svn.apache.org/viewvc?rev=930208view=rev
Log:
use GAE SDK mocks for gmail component tests
Modified:
camel/trunk/components/camel-gae/pom.xml
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailComponent.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailEndpoint.java
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/mail/GMailEndpointTest.java
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/mail/GMailOutboundRouteBuilder.java
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/mail/GMailOutboundRouteBuilderTest.java
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/mail/GMailTestUtils.java
camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/mail/context-outbound.xml
Modified: camel/trunk/components/camel-gae/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/pom.xml?rev=930208r1=930207r2=930208view=diff
==
--- camel/trunk/components/camel-gae/pom.xml (original)
+++ camel/trunk/components/camel-gae/pom.xml Fri Apr 2 09:42:23 2010
@@ -68,6 +68,16 @@
!-- testing --
dependency
+ groupIdcom.google.appengine/groupId
+ artifactIdappengine-api-stubs/artifactId
+ version${appengine-sdk-version}/version
+/dependency
+dependency
+ groupIdcom.google.appengine/groupId
+ artifactIdappengine-testing/artifactId
+ version${appengine-sdk-version}/version
+/dependency
+dependency
groupIdorg.apache.camel/groupId
artifactIdcamel-test/artifactId
scopetest/scope
Modified:
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailComponent.java?rev=930208r1=930207r2=930208view=diff
==
---
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailComponent.java
(original)
+++
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailComponent.java
Fri Apr 2 09:42:23 2010
@@ -37,11 +37,8 @@ public class GMailComponent extends Defa
protected Endpoint createEndpoint(String uri, String remaining,
MapString, Object parameters) throws Exception {
OutboundBinding binding = resolveAndRemoveReferenceParameter(
parameters, outboundBindingRef, OutboundBinding.class, new
GMailBinding());
-MailService service = resolveAndRemoveReferenceParameter(
-parameters, mailServiceRef, MailService.class,
MailServiceFactory.getMailService());
GMailEndpoint endpoint = new GMailEndpoint(uri, remaining);
endpoint.setOutboundBinding(binding);
-endpoint.setMailService(service);
return endpoint;
}
Modified:
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailEndpoint.java?rev=930208r1=930207r2=930208view=diff
==
---
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailEndpoint.java
(original)
+++
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailEndpoint.java
Fri Apr 2 09:42:23 2010
@@ -19,6 +19,7 @@ package org.apache.camel.component.gae.m
import com.google.appengine.api.mail.MailService;
import com.google.appengine.api.mail.MailService.Message;
+import com.google.appengine.api.mail.MailServiceFactory;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
@@ -48,6 +49,7 @@ public class GMailEndpoint extends Defau
public GMailEndpoint(String endpointUri, String sender) {
super(endpointUri);
this.sender = sender;
+this.mailService = MailServiceFactory.getMailService();
}
public OutboundBindingGMailEndpoint, Message, Void getOutboundBinding() {
@@ -58,18 +60,14 @@ public class GMailEndpoint extends Defau
this.outboundBinding = outboundBinding;
}
-public String getSender() {
-return sender;
-}
-
public MailService getMailService() {
return mailService;
}
-public void setMailService(MailService mailService) {
-this.mailService = mailService;
+public String getSender() {
+return sender;
}
-
+
public String getSubject
svn commit: r929921 - /camel/trunk/components/pom.xml
Author: krasserm Date: Thu Apr 1 11:04:54 2010 New Revision: 929921 URL: http://svn.apache.org/viewvc?rev=929921view=rev Log: Upgrade to App Engine SDK 1.3.2 Modified: camel/trunk/components/pom.xml Modified: camel/trunk/components/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/pom.xml?rev=929921r1=929920r2=929921view=diff == --- camel/trunk/components/pom.xml (original) +++ camel/trunk/components/pom.xml Thu Apr 1 11:04:54 2010 @@ -44,6 +44,7 @@ modulecamel-csv/module modulecamel-cxf/module modulecamel-dozer/module +modulecamel-exec/module modulecamel-flatpack/module modulecamel-freemarker/module modulecamel-ftp/module
svn commit: r929929 [2/2] - in /camel/trunk/components/camel-exec: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/camel/ src/main/java/org/apach
Added:
camel/trunk/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java?rev=929929view=auto
==
---
camel/trunk/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java
(added)
+++
camel/trunk/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java
Thu Apr 1 11:20:51 2010
@@ -0,0 +1,236 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+package org.apache.camel.component.exec;
+
+import java.io.InputStream;
+
+import org.apache.camel.EndpointInject;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.Produce;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.commons.io.IOUtils;
+
+import org.junit.Test;
+
+import static org.apache.camel.component.exec.ExecBinding.EXEC_COMMAND_ARGS;
+import static
org.apache.camel.component.exec.ExecBinding.EXEC_COMMAND_EXECUTABLE;
+import static org.apache.camel.component.exec.ExecBinding.EXEC_COMMAND_TIMEOUT;
+import static org.apache.camel.component.exec.ExecBinding.EXEC_EXIT_VALUE;
+import static org.apache.camel.component.exec.ExecBinding.EXEC_STDERR;
+import static org.apache.camel.component.exec.ExecEndpoint.NO_TIMEOUT;
+import static
org.apache.camel.component.exec.ExecTestUtils.buildJavaExecutablePath;
+import static
org.apache.camel.component.exec.ExecutableJavaProgram.EXIT_WITH_VALUE_0;
+import static
org.apache.camel.component.exec.ExecutableJavaProgram.EXIT_WITH_VALUE_1;
+import static
org.apache.camel.component.exec.ExecutableJavaProgram.PRINT_IN_STDERR;
+import static
org.apache.camel.component.exec.ExecutableJavaProgram.PRINT_IN_STDOUT;
+import static
org.apache.camel.component.exec.ExecutableJavaProgram.READ_INPUT_LINES_AND_PRINT_THEM;
+import static
org.apache.camel.component.exec.ExecutableJavaProgram.SLEEP_WITH_TIMEOUT;
+import static org.apache.camel.component.exec.ExecutableJavaProgram.THREADS;
+import static org.apache.commons.io.IOUtils.LINE_SEPARATOR;
+
+/**
+ * Tests the functionality of the {...@link ExecComponent}, executingbr
+ * ijava org.apache.camel.component.exec.ExecutableJavaProgram/i br
+ * command. bNote, that the tests assume, that the JAVA_HOME system variable
+ * is set./b This is a more credible assumption, than assuming that java is
in
+ * the path, because the Maven scripts build the path to java with the
JAVA_HOME
+ * environment variable.
+ *
+ * @see {...@link ExecutableJavaProgram}
+ */
+public class ExecJavaProcessTest extends CamelTestSupport {
+
+private static final String EXECUTABLE_PROGRAM_ARG =
ExecutableJavaProgram.class.getName();
+
+@Produce(uri = direct:input)
+private ProducerTemplate producerTemplate;
+
+@EndpointInject(uri = mock:output)
+private MockEndpoint output;
+
+@Test
+public void testExecJavaProcessExitCode0() throws Exception {
+output.setExpectedMessageCount(1);
+output.expectedHeaderReceived(EXEC_EXIT_VALUE, 0);
+
+sendExchange(EXIT_WITH_VALUE_0, NO_TIMEOUT);
+output.assertIsSatisfied();
+}
+
+@Test
+public void testExecJavaProcessExitCode1() throws Exception {
+output.setExpectedMessageCount(1);
+output.expectedHeaderReceived(EXEC_EXIT_VALUE, 1);
+
+sendExchange(EXIT_WITH_VALUE_1, NO_TIMEOUT);
+output.assertIsSatisfied();
+}
+
+@Test
+public void testExecJavaProcessStdout() throws Exception {
+String commandArgument = PRINT_IN_STDOUT;
+output.setExpectedMessageCount(1);
+output.expectedHeaderReceived(EXEC_EXIT_VALUE, 0);
+
+Exchange e = sendExchange(commandArgument, NO_TIMEOUT);
+ExecResult inBody = e.getIn().getBody(ExecResult.class);
+
+output.assertIsSatisfied();
+assertEquals(PRINT_IN_STDOUT,
svn commit: r929955 - in /camel/m2-repo/com/google/appengine/appengine-api-stubs: ./ 1.3.2/
Author: krasserm Date: Thu Apr 1 12:59:30 2010 New Revision: 929955 URL: http://svn.apache.org/viewvc?rev=929955view=rev Log: gae-api-stubs upload Added: camel/m2-repo/com/google/appengine/appengine-api-stubs/ camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.2/ camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.2/appengine-api-stubs-1.3.2.jar (with props) camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.2/appengine-api-stubs-1.3.2.jar.md5 camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.2/appengine-api-stubs-1.3.2.jar.sha1 camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.2/appengine-api-stubs-1.3.2.pom (with props) camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.2/appengine-api-stubs-1.3.2.pom.md5 camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.2/appengine-api-stubs-1.3.2.pom.sha1 camel/m2-repo/com/google/appengine/appengine-api-stubs/maven-metadata.xml (with props) camel/m2-repo/com/google/appengine/appengine-api-stubs/maven-metadata.xml.md5 camel/m2-repo/com/google/appengine/appengine-api-stubs/maven-metadata.xml.sha1 Added: camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.2/appengine-api-stubs-1.3.2.jar URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.2/appengine-api-stubs-1.3.2.jar?rev=929955view=auto == Binary file - no diff available. Propchange: camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.2/appengine-api-stubs-1.3.2.jar -- svn:mime-type = application/octet-stream Added: camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.2/appengine-api-stubs-1.3.2.jar.md5 URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.2/appengine-api-stubs-1.3.2.jar.md5?rev=929955view=auto == --- camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.2/appengine-api-stubs-1.3.2.jar.md5 (added) +++ camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.2/appengine-api-stubs-1.3.2.jar.md5 Thu Apr 1 12:59:30 2010 @@ -0,0 +1 @@ +a15faecb864b72f1b2db2cce3598548d \ No newline at end of file Added: camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.2/appengine-api-stubs-1.3.2.jar.sha1 URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.2/appengine-api-stubs-1.3.2.jar.sha1?rev=929955view=auto == --- camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.2/appengine-api-stubs-1.3.2.jar.sha1 (added) +++ camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.2/appengine-api-stubs-1.3.2.jar.sha1 Thu Apr 1 12:59:30 2010 @@ -0,0 +1 @@ +1a9857d134181ce7a87bd71a4bd4cb278197a8b1 \ No newline at end of file Added: camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.2/appengine-api-stubs-1.3.2.pom URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.2/appengine-api-stubs-1.3.2.pom?rev=929955view=auto == --- camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.2/appengine-api-stubs-1.3.2.pom (added) +++ camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.2/appengine-api-stubs-1.3.2.pom Thu Apr 1 12:59:30 2010 @@ -0,0 +1,6 @@ +?xml version=1.0 encoding=UTF-8?project + modelVersion4.0.0/modelVersion + groupIdcom.google.appengine/groupId + artifactIdappengine-api-stubs/artifactId + version1.3.2/version +/project \ No newline at end of file Propchange: camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.2/appengine-api-stubs-1.3.2.pom -- svn:eol-style = native Added: camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.2/appengine-api-stubs-1.3.2.pom.md5 URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.2/appengine-api-stubs-1.3.2.pom.md5?rev=929955view=auto == --- camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.2/appengine-api-stubs-1.3.2.pom.md5 (added) +++ camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.2/appengine-api-stubs-1.3.2.pom.md5 Thu Apr 1 12:59:30 2010 @@ -0,0 +1 @@ +0f7793996b52fdc4e01dd08fe77a48cf \ No newline at end of file Added: camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.2/appengine-api-stubs-1.3.2.pom.sha1 URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/appengine/appengine-api-stubs/1.3.2/appengine-api-stubs-1.3.2.pom.sha1?rev=929955view=auto
svn commit: r929957 - in /camel/m2-repo/com/google/appengine/appengine-testing: ./ 1.3.2/
Author: krasserm Date: Thu Apr 1 13:07:02 2010 New Revision: 929957 URL: http://svn.apache.org/viewvc?rev=929957view=rev Log: gae-testing upload Added: camel/m2-repo/com/google/appengine/appengine-testing/ camel/m2-repo/com/google/appengine/appengine-testing/1.3.2/ camel/m2-repo/com/google/appengine/appengine-testing/1.3.2/appengine-testing-1.3.2.jar (with props) camel/m2-repo/com/google/appengine/appengine-testing/1.3.2/appengine-testing-1.3.2.jar.md5 camel/m2-repo/com/google/appengine/appengine-testing/1.3.2/appengine-testing-1.3.2.jar.sha1 camel/m2-repo/com/google/appengine/appengine-testing/1.3.2/appengine-testing-1.3.2.pom (with props) camel/m2-repo/com/google/appengine/appengine-testing/1.3.2/appengine-testing-1.3.2.pom.md5 camel/m2-repo/com/google/appengine/appengine-testing/1.3.2/appengine-testing-1.3.2.pom.sha1 camel/m2-repo/com/google/appengine/appengine-testing/maven-metadata.xml (with props) camel/m2-repo/com/google/appengine/appengine-testing/maven-metadata.xml.md5 camel/m2-repo/com/google/appengine/appengine-testing/maven-metadata.xml.sha1 Added: camel/m2-repo/com/google/appengine/appengine-testing/1.3.2/appengine-testing-1.3.2.jar URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/appengine/appengine-testing/1.3.2/appengine-testing-1.3.2.jar?rev=929957view=auto == Binary file - no diff available. Propchange: camel/m2-repo/com/google/appengine/appengine-testing/1.3.2/appengine-testing-1.3.2.jar -- svn:mime-type = application/octet-stream Added: camel/m2-repo/com/google/appengine/appengine-testing/1.3.2/appengine-testing-1.3.2.jar.md5 URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/appengine/appengine-testing/1.3.2/appengine-testing-1.3.2.jar.md5?rev=929957view=auto == --- camel/m2-repo/com/google/appengine/appengine-testing/1.3.2/appengine-testing-1.3.2.jar.md5 (added) +++ camel/m2-repo/com/google/appengine/appengine-testing/1.3.2/appengine-testing-1.3.2.jar.md5 Thu Apr 1 13:07:02 2010 @@ -0,0 +1 @@ +ec88454a0297bf461d8ee49fede2fb9b \ No newline at end of file Added: camel/m2-repo/com/google/appengine/appengine-testing/1.3.2/appengine-testing-1.3.2.jar.sha1 URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/appengine/appengine-testing/1.3.2/appengine-testing-1.3.2.jar.sha1?rev=929957view=auto == --- camel/m2-repo/com/google/appengine/appengine-testing/1.3.2/appengine-testing-1.3.2.jar.sha1 (added) +++ camel/m2-repo/com/google/appengine/appengine-testing/1.3.2/appengine-testing-1.3.2.jar.sha1 Thu Apr 1 13:07:02 2010 @@ -0,0 +1 @@ +9c9be907d184b9a763e45072bb599b0f0df8cd48 \ No newline at end of file Added: camel/m2-repo/com/google/appengine/appengine-testing/1.3.2/appengine-testing-1.3.2.pom URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/appengine/appengine-testing/1.3.2/appengine-testing-1.3.2.pom?rev=929957view=auto == --- camel/m2-repo/com/google/appengine/appengine-testing/1.3.2/appengine-testing-1.3.2.pom (added) +++ camel/m2-repo/com/google/appengine/appengine-testing/1.3.2/appengine-testing-1.3.2.pom Thu Apr 1 13:07:02 2010 @@ -0,0 +1,6 @@ +?xml version=1.0 encoding=UTF-8?project + modelVersion4.0.0/modelVersion + groupIdcom.google.appengine/groupId + artifactIdappengine-testing/artifactId + version1.3.2/version +/project \ No newline at end of file Propchange: camel/m2-repo/com/google/appengine/appengine-testing/1.3.2/appengine-testing-1.3.2.pom -- svn:eol-style = native Added: camel/m2-repo/com/google/appengine/appengine-testing/1.3.2/appengine-testing-1.3.2.pom.md5 URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/appengine/appengine-testing/1.3.2/appengine-testing-1.3.2.pom.md5?rev=929957view=auto == --- camel/m2-repo/com/google/appengine/appengine-testing/1.3.2/appengine-testing-1.3.2.pom.md5 (added) +++ camel/m2-repo/com/google/appengine/appengine-testing/1.3.2/appengine-testing-1.3.2.pom.md5 Thu Apr 1 13:07:02 2010 @@ -0,0 +1 @@ +3a72e6bca3cc297c885e20da0ddcf569 \ No newline at end of file Added: camel/m2-repo/com/google/appengine/appengine-testing/1.3.2/appengine-testing-1.3.2.pom.sha1 URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/appengine/appengine-testing/1.3.2/appengine-testing-1.3.2.pom.sha1?rev=929957view=auto == --- camel/m2-repo/com/google/appengine/appengine-testing/1.3.2/appengine-testing-1.3.2
svn commit: r929501 - in /camel/m2-repo/com/google/appengine: appengine-api-1.0-sdk/ appengine-api-1.0-sdk/1.3.2/ appengine-api-labs/ appengine-api-labs/1.3.2/
Author: krasserm Date: Wed Mar 31 12:25:56 2010 New Revision: 929501 URL: http://svn.apache.org/viewvc?rev=929501view=rev Log: gae-sdk-1.3.2 upload Added: camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.2/ camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.2/appengine-api-1.0-sdk-1.3.2.jar (with props) camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.2/appengine-api-1.0-sdk-1.3.2.jar.md5 camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.2/appengine-api-1.0-sdk-1.3.2.jar.sha1 camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.2/appengine-api-1.0-sdk-1.3.2.pom (with props) camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.2/appengine-api-1.0-sdk-1.3.2.pom.md5 camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.2/appengine-api-1.0-sdk-1.3.2.pom.sha1 camel/m2-repo/com/google/appengine/appengine-api-labs/1.3.2/ camel/m2-repo/com/google/appengine/appengine-api-labs/1.3.2/appengine-api-labs-1.3.2.jar (with props) camel/m2-repo/com/google/appengine/appengine-api-labs/1.3.2/appengine-api-labs-1.3.2.jar.md5 camel/m2-repo/com/google/appengine/appengine-api-labs/1.3.2/appengine-api-labs-1.3.2.jar.sha1 camel/m2-repo/com/google/appengine/appengine-api-labs/1.3.2/appengine-api-labs-1.3.2.pom (with props) camel/m2-repo/com/google/appengine/appengine-api-labs/1.3.2/appengine-api-labs-1.3.2.pom.md5 camel/m2-repo/com/google/appengine/appengine-api-labs/1.3.2/appengine-api-labs-1.3.2.pom.sha1 Modified: camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/maven-metadata.xml camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/maven-metadata.xml.md5 camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/maven-metadata.xml.sha1 camel/m2-repo/com/google/appengine/appengine-api-labs/maven-metadata.xml camel/m2-repo/com/google/appengine/appengine-api-labs/maven-metadata.xml.md5 camel/m2-repo/com/google/appengine/appengine-api-labs/maven-metadata.xml.sha1 Added: camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.2/appengine-api-1.0-sdk-1.3.2.jar URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.2/appengine-api-1.0-sdk-1.3.2.jar?rev=929501view=auto == Binary file - no diff available. Propchange: camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.2/appengine-api-1.0-sdk-1.3.2.jar -- svn:mime-type = application/octet-stream Added: camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.2/appengine-api-1.0-sdk-1.3.2.jar.md5 URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.2/appengine-api-1.0-sdk-1.3.2.jar.md5?rev=929501view=auto == --- camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.2/appengine-api-1.0-sdk-1.3.2.jar.md5 (added) +++ camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.2/appengine-api-1.0-sdk-1.3.2.jar.md5 Wed Mar 31 12:25:56 2010 @@ -0,0 +1 @@ +69e10999382ed434aa544554b95786b8 \ No newline at end of file Added: camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.2/appengine-api-1.0-sdk-1.3.2.jar.sha1 URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.2/appengine-api-1.0-sdk-1.3.2.jar.sha1?rev=929501view=auto == --- camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.2/appengine-api-1.0-sdk-1.3.2.jar.sha1 (added) +++ camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.2/appengine-api-1.0-sdk-1.3.2.jar.sha1 Wed Mar 31 12:25:56 2010 @@ -0,0 +1 @@ +486b1182126f82e25e3538d709a952909fb4d029 \ No newline at end of file Added: camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.2/appengine-api-1.0-sdk-1.3.2.pom URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.2/appengine-api-1.0-sdk-1.3.2.pom?rev=929501view=auto == --- camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.2/appengine-api-1.0-sdk-1.3.2.pom (added) +++ camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.2/appengine-api-1.0-sdk-1.3.2.pom Wed Mar 31 12:25:56 2010 @@ -0,0 +1,6 @@ +?xml version=1.0 encoding=UTF-8?project + modelVersion4.0.0/modelVersion + groupIdcom.google.appengine/groupId + artifactIdappengine-api-1.0-sdk/artifactId + version1.3.2/version +/project \ No newline at end of file Propchange: camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.2/appengine-api-1.0-sdk-1.3.2.pom -- svn:eol-style
svn commit: r929597 - in /camel/trunk/components/camel-gae: pom.xml src/test/java/org/apache/camel/component/gae/http/MockUrlFetchService.java src/test/java/org/apache/camel/component/gae/task/MockQue
Author: krasserm
Date: Wed Mar 31 15:52:17 2010
New Revision: 929597
URL: http://svn.apache.org/viewvc?rev=929597view=rev
Log:
Upgrade to App Engine SDK 1.3.2
Modified:
camel/trunk/components/camel-gae/pom.xml
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/MockUrlFetchService.java
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/MockQueue.java
Modified: camel/trunk/components/camel-gae/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/pom.xml?rev=929597r1=929596r2=929597view=diff
==
--- camel/trunk/components/camel-gae/pom.xml (original)
+++ camel/trunk/components/camel-gae/pom.xml Wed Mar 31 15:52:17 2010
@@ -32,7 +32,7 @@
properties
camel.osgi.export.pkgorg.apache.camel.component.gae.*/camel.osgi.export.pkg
-appengine-sdk-version1.3.0/appengine-sdk-version
+appengine-sdk-version1.3.2/appengine-sdk-version
gdata-version1.40.2/gdata-version
/properties
Modified:
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/MockUrlFetchService.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/MockUrlFetchService.java?rev=929597r1=929596r2=929597view=diff
==
---
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/MockUrlFetchService.java
(original)
+++
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/MockUrlFetchService.java
Wed Mar 31 15:52:17 2010
@@ -18,6 +18,7 @@ package org.apache.camel.component.gae.h
import java.io.IOException;
import java.net.URL;
+import java.util.concurrent.Future;
import com.google.appengine.api.urlfetch.HTTPHeader;
import com.google.appengine.api.urlfetch.HTTPRequest;
@@ -43,4 +44,12 @@ public class MockUrlFetchService impleme
return response;
}
+public FutureHTTPResponse fetchAsync(URL url) {
+throw new UnsupportedOperationException(not implemented);
+}
+
+public FutureHTTPResponse fetchAsync(HTTPRequest httpRequest) {
+throw new UnsupportedOperationException(not implemented);
+}
+
}
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=929597r1=929596r2=929597view=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
Wed Mar 31 15:52:17 2010
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.gae.task;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -55,6 +56,10 @@ public class MockQueue implements Queue
return add(null, taskOptions);
}
+public ListTaskHandle add(IterableTaskOptions taskOptionsIterable) {
+return add(null, taskOptionsIterable);
+}
+
public TaskHandle add(Transaction transaction, TaskOptions taskOptions) {
TaskOptionsAccessor accessor = new TaskOptionsAccessor(taskOptions);
try {
@@ -74,6 +79,14 @@ public class MockQueue implements Queue
return null;
}
+public ListTaskHandle add(Transaction transaction, IterableTaskOptions
taskOptionsIterable) {
+ArrayListTaskHandle handles = new ArrayListTaskHandle();
+for (TaskOptions taskOptions : taskOptionsIterable) {
+handles.add(add(transaction, taskOptions));
+}
+return handles;
+}
+
public String getQueueName() {
return name;
}
svn commit: r916140 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/model/ camel-core/src/test/java/org/apache/camel/processor/ tests/camel-itest/src/test/java/org/apache/camel/itest/jms/
Author: krasserm
Date: Thu Feb 25 06:05:26 2010
New Revision: 916140
URL: http://svn.apache.org/viewvc?rev=916140view=rev
Log:
CAMEL 2498 (Inconsitent definition of resequencer DSL) fixed
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ResequencerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java?rev=916140r1=916139r2=916140view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
Thu Feb 25 06:05:26 2010
@@ -1341,7 +1341,7 @@
* @param expressions the list of expressions on which to compare messages
in order
* @return the builder
*/
-public ResequenceDefinition resequencer(Expression... expressions) {
+public ResequenceDefinition resequence(Expression... expressions) {
ListExpression list = new ArrayListExpression();
list.addAll(Arrays.asList(expressions));
return resequence(list);
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ResequencerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ResequencerTest.java?rev=916140r1=916139r2=916140view=diff
==
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ResequencerTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ResequencerTest.java
Thu Feb 25 06:05:26 2010
@@ -56,7 +56,7 @@
return new RouteBuilder() {
public void configure() {
// START SNIPPET: example
-from(direct:start).resequencer(body()).to(mock:result);
+from(direct:start).resequence(body()).to(mock:result);
// END SNIPPET: example
}
};
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java?rev=916140r1=916139r2=916140view=diff
==
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java
Thu Feb 25 06:05:26 2010
@@ -92,7 +92,7 @@
return new RouteBuilder() {
public void configure() {
// START SNIPPET: example
-
from(direct:start).resequencer(header(seqnum)).stream().to(mock:result);
+
from(direct:start).resequence(header(seqnum)).stream().to(mock:result);
// END SNIPPET: example
}
};
Modified:
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java?rev=916140r1=916139r2=916140view=diff
==
---
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java
(original)
+++
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java
Thu Feb 25 06:05:26 2010
@@ -107,14 +107,14 @@
from(activemq:queue:batch)
.to(callExecuteOnBean(myBean1))
-.resequencer(header(seqnum))
+.resequence(header(seqnum))
.batch(new BatchResequencerConfig(100, 2000L))
.to(callExecuteOnBean(myBean2))
.to(activemq:queue:stop);
from(activemq:queue:stream)
.to(callExecuteOnBean(myBean1))
-.resequencer(header(seqnum))
+.resequence(header(seqnum))
.stream()
.to(callExecuteOnBean(myBean2))
.to(activemq:queue:stop);
svn commit: r912368 - /camel/trunk/components/camel-hl7/pom.xml
Author: krasserm Date: Sun Feb 21 16:35:50 2010 New Revision: 912368 URL: http://svn.apache.org/viewvc?rev=912368view=rev Log: CAMEL-1959 (upgrade to hapi-0.6) Modified: camel/trunk/components/camel-hl7/pom.xml Modified: camel/trunk/components/camel-hl7/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hl7/pom.xml?rev=912368r1=912367r2=912368view=diff == --- camel/trunk/components/camel-hl7/pom.xml (original) +++ camel/trunk/components/camel-hl7/pom.xml Sun Feb 21 16:35:50 2010 @@ -36,9 +36,9 @@ repositories repository -idservicemix/id -nameApache ServiceMix Repository/name -urlhttp://svn.apache.org/repos/asf/servicemix/m2-repo/url +idhapi/id +nameHAPI Maven Repository/name +urlhttp://hl7api.sourceforge.net/m2//url /repository /repositories @@ -49,9 +49,9 @@ artifactIdcamel-core/artifactId /dependency dependency -groupIdorg.hl7/groupId -artifactIdhapi/artifactId -version0.5.1/version +groupIdca.uhn.hapi/groupId +artifactIdhapi-base/artifactId +version0.6/version /dependency dependency groupIdorg.apache.mina/groupId @@ -70,6 +70,18 @@ !-- testing -- dependency +groupIdca.uhn.hapi/groupId +artifactIdhapi-structures-v24/artifactId +version0.6/version +scopetest/scope +/dependency +dependency +groupIdca.uhn.hapi/groupId +artifactIdhapi-structures-v25/artifactId +version0.6/version +scopetest/scope +/dependency +dependency groupIdorg.apache.camel/groupId artifactIdcamel-test/artifactId scopetest/scope
svn commit: r912373 - in /camel/m2-repo/ca: ./ uhn/ uhn/hapi/ uhn/hapi/hapi/ uhn/hapi/hapi/0.6/
Author: krasserm Date: Sun Feb 21 17:16:42 2010 New Revision: 912373 URL: http://svn.apache.org/viewvc?rev=912373view=rev Log: uploaded hapi-0.6 OSGi bundle to camel maven repository Added: camel/m2-repo/ca/ camel/m2-repo/ca/uhn/ camel/m2-repo/ca/uhn/hapi/ camel/m2-repo/ca/uhn/hapi/hapi/ camel/m2-repo/ca/uhn/hapi/hapi/0.6/ camel/m2-repo/ca/uhn/hapi/hapi/0.6/hapi-0.6.jar (with props) camel/m2-repo/ca/uhn/hapi/hapi/0.6/hapi-0.6.jar.md5 camel/m2-repo/ca/uhn/hapi/hapi/0.6/hapi-0.6.jar.sha1 camel/m2-repo/ca/uhn/hapi/hapi/0.6/hapi-0.6.pom (with props) camel/m2-repo/ca/uhn/hapi/hapi/0.6/hapi-0.6.pom.md5 camel/m2-repo/ca/uhn/hapi/hapi/0.6/hapi-0.6.pom.sha1 camel/m2-repo/ca/uhn/hapi/hapi/maven-metadata.xml (with props) camel/m2-repo/ca/uhn/hapi/hapi/maven-metadata.xml.md5 camel/m2-repo/ca/uhn/hapi/hapi/maven-metadata.xml.sha1 Added: camel/m2-repo/ca/uhn/hapi/hapi/0.6/hapi-0.6.jar URL: http://svn.apache.org/viewvc/camel/m2-repo/ca/uhn/hapi/hapi/0.6/hapi-0.6.jar?rev=912373view=auto == Binary file - no diff available. Propchange: camel/m2-repo/ca/uhn/hapi/hapi/0.6/hapi-0.6.jar -- svn:mime-type = application/octet-stream Added: camel/m2-repo/ca/uhn/hapi/hapi/0.6/hapi-0.6.jar.md5 URL: http://svn.apache.org/viewvc/camel/m2-repo/ca/uhn/hapi/hapi/0.6/hapi-0.6.jar.md5?rev=912373view=auto == --- camel/m2-repo/ca/uhn/hapi/hapi/0.6/hapi-0.6.jar.md5 (added) +++ camel/m2-repo/ca/uhn/hapi/hapi/0.6/hapi-0.6.jar.md5 Sun Feb 21 17:16:42 2010 @@ -0,0 +1 @@ +3339429b9af55277d9232db92013399f \ No newline at end of file Added: camel/m2-repo/ca/uhn/hapi/hapi/0.6/hapi-0.6.jar.sha1 URL: http://svn.apache.org/viewvc/camel/m2-repo/ca/uhn/hapi/hapi/0.6/hapi-0.6.jar.sha1?rev=912373view=auto == --- camel/m2-repo/ca/uhn/hapi/hapi/0.6/hapi-0.6.jar.sha1 (added) +++ camel/m2-repo/ca/uhn/hapi/hapi/0.6/hapi-0.6.jar.sha1 Sun Feb 21 17:16:42 2010 @@ -0,0 +1 @@ +62ffc0adcc482f9838f97d5ca7d057b2f340dac3 \ No newline at end of file Added: camel/m2-repo/ca/uhn/hapi/hapi/0.6/hapi-0.6.pom URL: http://svn.apache.org/viewvc/camel/m2-repo/ca/uhn/hapi/hapi/0.6/hapi-0.6.pom?rev=912373view=auto == --- camel/m2-repo/ca/uhn/hapi/hapi/0.6/hapi-0.6.pom (added) +++ camel/m2-repo/ca/uhn/hapi/hapi/0.6/hapi-0.6.pom Sun Feb 21 17:16:42 2010 @@ -0,0 +1,8 @@ +?xml version=1.0 encoding=UTF-8? +project xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; xmlns=http://maven.apache.org/POM/4.0.0; +xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; + modelVersion4.0.0/modelVersion + groupIdca.uhn.hapi/groupId + artifactIdhapi/artifactId + version0.6/version +/project Propchange: camel/m2-repo/ca/uhn/hapi/hapi/0.6/hapi-0.6.pom -- svn:eol-style = native Added: camel/m2-repo/ca/uhn/hapi/hapi/0.6/hapi-0.6.pom.md5 URL: http://svn.apache.org/viewvc/camel/m2-repo/ca/uhn/hapi/hapi/0.6/hapi-0.6.pom.md5?rev=912373view=auto == --- camel/m2-repo/ca/uhn/hapi/hapi/0.6/hapi-0.6.pom.md5 (added) +++ camel/m2-repo/ca/uhn/hapi/hapi/0.6/hapi-0.6.pom.md5 Sun Feb 21 17:16:42 2010 @@ -0,0 +1 @@ +046e0d4b9a60e86a39a81c4aa9a1a92e \ No newline at end of file Added: camel/m2-repo/ca/uhn/hapi/hapi/0.6/hapi-0.6.pom.sha1 URL: http://svn.apache.org/viewvc/camel/m2-repo/ca/uhn/hapi/hapi/0.6/hapi-0.6.pom.sha1?rev=912373view=auto == --- camel/m2-repo/ca/uhn/hapi/hapi/0.6/hapi-0.6.pom.sha1 (added) +++ camel/m2-repo/ca/uhn/hapi/hapi/0.6/hapi-0.6.pom.sha1 Sun Feb 21 17:16:42 2010 @@ -0,0 +1 @@ +a7fbaafc67d63f600f6d98bf4835b218e984c988 \ No newline at end of file Added: camel/m2-repo/ca/uhn/hapi/hapi/maven-metadata.xml URL: http://svn.apache.org/viewvc/camel/m2-repo/ca/uhn/hapi/hapi/maven-metadata.xml?rev=912373view=auto == --- camel/m2-repo/ca/uhn/hapi/hapi/maven-metadata.xml (added) +++ camel/m2-repo/ca/uhn/hapi/hapi/maven-metadata.xml Sun Feb 21 17:16:42 2010 @@ -0,0 +1,12 @@ +?xml version=1.0 encoding=UTF-8? +metadata + groupIdca.uhn.hapi/groupId + artifactIdhapi/artifactId + version0.6/version + versioning +versions + version0.6/version +/versions +lastUpdated20100221171139/lastUpdated + /versioning +/metadata Propchange: camel/m2-repo/ca/uhn/hapi/hapi/maven-metadata.xml -- svn:eol-style
svn commit: r912377 - /camel/trunk/examples/camel-example-gae/README.txt
Author: krasserm Date: Sun Feb 21 17:29:45 2010 New Revision: 912377 URL: http://svn.apache.org/viewvc?rev=912377view=rev Log: CAMEL-2461 (added README.txt) Added: camel/trunk/examples/camel-example-gae/README.txt (with props) Added: camel/trunk/examples/camel-example-gae/README.txt URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-gae/README.txt?rev=912377view=auto == --- camel/trunk/examples/camel-example-gae/README.txt (added) +++ camel/trunk/examples/camel-example-gae/README.txt Sun Feb 21 17:29:45 2010 @@ -0,0 +1,15 @@ +GAE Example +=== + +Building, deplyoing and running this example is described in detail at +http://camel.apache.org/tutorial-for-camel-on-google-app-engine.html + +Please help us make Apache Camel better - we appreciate any feedback you +may have. + +Enjoy! + + +The Camel riders! + + Propchange: camel/trunk/examples/camel-example-gae/README.txt -- svn:eol-style = native
svn commit: r907986 - in /camel/trunk/examples/camel-example-gae/src/main/resources/META-INF: ./ LICENSE.txt NOTICE.txt
Author: krasserm Date: Tue Feb 9 09:40:38 2010 New Revision: 907986 URL: http://svn.apache.org/viewvc?rev=907986view=rev Log: added missing LICENSE.txt and NOTICE.txt Added: camel/trunk/examples/camel-example-gae/src/main/resources/META-INF/ camel/trunk/examples/camel-example-gae/src/main/resources/META-INF/LICENSE.txt (with props) camel/trunk/examples/camel-example-gae/src/main/resources/META-INF/NOTICE.txt (with props) Added: camel/trunk/examples/camel-example-gae/src/main/resources/META-INF/LICENSE.txt URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-gae/src/main/resources/META-INF/LICENSE.txt?rev=907986view=auto == --- camel/trunk/examples/camel-example-gae/src/main/resources/META-INF/LICENSE.txt (added) +++ camel/trunk/examples/camel-example-gae/src/main/resources/META-INF/LICENSE.txt Tue Feb 9 09:40:38 2010 @@ -0,0 +1,203 @@ + + 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
svn commit: r900705 - in /camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae: mail/GMailBinding.java task/GTaskBinding.java
Author: krasserm Date: Tue Jan 19 09:05:40 2010 New Revision: 900705 URL: http://svn.apache.org/viewvc?rev=900705view=rev Log: Change header names from dot-notation to camel-case-notation to follow Camel header name conventions. Modified: camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailBinding.java camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskBinding.java Modified: camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailBinding.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailBinding.java?rev=900705r1=900704r2=900705view=diff == --- camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailBinding.java (original) +++ camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailBinding.java Tue Jan 19 09:05:40 2010 @@ -29,30 +29,30 @@ /** * Camel header for setting the mail message sender. */ -public static final String GMAIL_SENDER = org.apache.camel.component.gae.mail.Sender; +public static final String GMAIL_SENDER = CamelGmailSender; /** * Camel header for setting the mail message subject. */ -public static final String GMAIL_SUBJECT = org.apache.camel.component.gae.mail.Subject; +public static final String GMAIL_SUBJECT = CamelGmailSubject; /** * Camel header for setting the mail message to-recipient (single recipient * or comma-separated list). */ -public static final String GMAIL_TO = org.apache.camel.component.gae.mail.To; +public static final String GMAIL_TO = CamelGmailTo; /** * Camel header for setting the mail message cc-recipient (single recipient * or comma-separated list). */ -public static final String GMAIL_CC = org.apache.camel.component.gae.mail.Cc; +public static final String GMAIL_CC = CamelGmailCc; /** * Camel header for setting the mail message bcc-recipient (single recipient * or comma-separated list). */ -public static final String GMAIL_BCC = org.apache.camel.component.gae.mail.Bcc; +public static final String GMAIL_BCC = CamelGmailBcc; /** * Reads data from codeexchange/code and writes it to a newly created 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=900705r1=900704r2=900705view=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 Jan 19 09:05:40 2010 @@ -42,19 +42,19 @@ * Camel header name corresponding to codeX-AppEngine-QueueName/code * header created by task queueing service. */ -public static final String GTASK_QUEUE_NAME = org.apache.camel.component.gae.task.QueueName; +public static final String GTASK_QUEUE_NAME = CamelGtaskQueueName; /** * Camel header name corresponding to codeX-AppEngine-TaskName/code * header created by task queueing service. */ -public static final String GTASK_TASK_NAME = org.apache.camel.component.gae.task.TaskName; +public static final String GTASK_TASK_NAME = CamelGtaskTaskName; /** * Camel header name corresponding to codeX-AppEngine-TaskRetryCount/code * header created by task queueing service. */ -public static final String GTASK_RETRY_COUNT = org.apache.camel.component.gae.task.RetryCount; +public static final String GTASK_RETRY_COUNT = CamelGtaskRetryCount; static final String GAE_QUEUE_NAME = X-AppEngine-QueueName; static final String GAE_TASK_NAME = X-AppEngine-TaskName;
svn commit: r900800 - in /camel/trunk/examples/camel-example-gae/src/main: java/org/apache/camel/example/gae/ resources/ webapp/ webapp/WEB-INF/
Author: krasserm
Date: Tue Jan 19 14:37:11 2010
New Revision: 900800
URL: http://svn.apache.org/viewvc?rev=900800view=rev
Log:
addition of login feature to Camel GAE example and major revision of
application logic implementation
Added:
camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/ReportData.java
camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/ReportGenerator.java
camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/RequestProcessor.java
camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/ResponseProcessor.java
Removed:
camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/WeatherProcessor.java
Modified:
camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/TutorialRouteBuilder.java
camel/trunk/examples/camel-example-gae/src/main/resources/context.xml
camel/trunk/examples/camel-example-gae/src/main/webapp/WEB-INF/appengine-web.xml
camel/trunk/examples/camel-example-gae/src/main/webapp/WEB-INF/web.xml
camel/trunk/examples/camel-example-gae/src/main/webapp/index.html
Added:
camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/ReportData.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/ReportData.java?rev=900800view=auto
==
---
camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/ReportData.java
(added)
+++
camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/ReportData.java
Tue Jan 19 14:37:11 2010
@@ -0,0 +1,85 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+package org.apache.camel.example.gae;
+
+import java.io.Serializable;
+
+import org.w3c.dom.Document;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Expression;
+
+public class ReportData implements Serializable {
+
+private static final long serialVersionUID = -468314239950430108L;
+
+private String city;
+private String recipient;
+private String requestor;
+private Document weather;
+
+public ReportData(String city, String recipient, String requestor) {
+this.city = city;
+this.recipient = recipient;
+this.requestor = requestor;
+}
+
+public String getCity() {
+return city;
+}
+
+public String getRecipient() {
+return recipient;
+}
+
+public String getRequestor() {
+return requestor;
+}
+
+public Document getWeather() {
+return weather;
+}
+
+public void setWeather(Document weather) {
+this.weather = weather;
+}
+
+public static Expression city() {
+return new Expression() {
+public T T evaluate(Exchange exchange, ClassT type) {
+return
type.cast(exchange.getIn().getBody(ReportData.class).getCity());
+}
+};
+}
+
+public static Expression recipient() {
+return new Expression() {
+public T T evaluate(Exchange exchange, ClassT type) {
+return
type.cast(exchange.getIn().getBody(ReportData.class).getRecipient());
+}
+};
+}
+
+public static Expression requestor() {
+return new Expression() {
+public T T evaluate(Exchange exchange, ClassT type) {
+return
type.cast(exchange.getIn().getBody(ReportData.class).getRequestor());
+}
+};
+}
+
+}
Added:
camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/ReportGenerator.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/ReportGenerator.java?rev=900800view=auto
==
---
camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/ReportGenerator.java
(added)
+++
camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel
svn commit: r900668 - in /camel/m2-repo/com/google/appengine: appengine-api-1.0-sdk/ appengine-api-1.0-sdk/1.3.0/ appengine-api-labs/ appengine-api-labs/1.3.0/
Author: krasserm Date: Tue Jan 19 06:31:14 2010 New Revision: 900668 URL: http://svn.apache.org/viewvc?rev=900668view=rev Log: upload appengine sdk version 1.3.0 to camel maven repo Added: camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.0/ camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.0/appengine-api-1.0-sdk-1.3.0.jar (with props) camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.0/appengine-api-1.0-sdk-1.3.0.jar.md5 camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.0/appengine-api-1.0-sdk-1.3.0.jar.sha1 camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.0/appengine-api-1.0-sdk-1.3.0.pom camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.0/appengine-api-1.0-sdk-1.3.0.pom.md5 camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.0/appengine-api-1.0-sdk-1.3.0.pom.sha1 camel/m2-repo/com/google/appengine/appengine-api-labs/1.3.0/ camel/m2-repo/com/google/appengine/appengine-api-labs/1.3.0/appengine-api-labs-1.3.0.jar (with props) camel/m2-repo/com/google/appengine/appengine-api-labs/1.3.0/appengine-api-labs-1.3.0.jar.md5 camel/m2-repo/com/google/appengine/appengine-api-labs/1.3.0/appengine-api-labs-1.3.0.jar.sha1 camel/m2-repo/com/google/appengine/appengine-api-labs/1.3.0/appengine-api-labs-1.3.0.pom camel/m2-repo/com/google/appengine/appengine-api-labs/1.3.0/appengine-api-labs-1.3.0.pom.md5 camel/m2-repo/com/google/appengine/appengine-api-labs/1.3.0/appengine-api-labs-1.3.0.pom.sha1 Modified: camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/maven-metadata.xml camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/maven-metadata.xml.md5 camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/maven-metadata.xml.sha1 camel/m2-repo/com/google/appengine/appengine-api-labs/maven-metadata.xml camel/m2-repo/com/google/appengine/appengine-api-labs/maven-metadata.xml.md5 camel/m2-repo/com/google/appengine/appengine-api-labs/maven-metadata.xml.sha1 Added: camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.0/appengine-api-1.0-sdk-1.3.0.jar URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.0/appengine-api-1.0-sdk-1.3.0.jar?rev=900668view=auto == Binary file - no diff available. Propchange: camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.0/appengine-api-1.0-sdk-1.3.0.jar -- svn:mime-type = application/octet-stream Added: camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.0/appengine-api-1.0-sdk-1.3.0.jar.md5 URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.0/appengine-api-1.0-sdk-1.3.0.jar.md5?rev=900668view=auto == --- camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.0/appengine-api-1.0-sdk-1.3.0.jar.md5 (added) +++ camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.0/appengine-api-1.0-sdk-1.3.0.jar.md5 Tue Jan 19 06:31:14 2010 @@ -0,0 +1 @@ +7d97ec8cd71259e0fd5d1248b19b9df7 \ No newline at end of file Added: camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.0/appengine-api-1.0-sdk-1.3.0.jar.sha1 URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.0/appengine-api-1.0-sdk-1.3.0.jar.sha1?rev=900668view=auto == --- camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.0/appengine-api-1.0-sdk-1.3.0.jar.sha1 (added) +++ camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.0/appengine-api-1.0-sdk-1.3.0.jar.sha1 Tue Jan 19 06:31:14 2010 @@ -0,0 +1 @@ +16e3b7e3993ac47d8e4f02a7723b1e5188be0053 \ No newline at end of file Added: camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.0/appengine-api-1.0-sdk-1.3.0.pom URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.0/appengine-api-1.0-sdk-1.3.0.pom?rev=900668view=auto == --- camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.0/appengine-api-1.0-sdk-1.3.0.pom (added) +++ camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.0/appengine-api-1.0-sdk-1.3.0.pom Tue Jan 19 06:31:14 2010 @@ -0,0 +1,6 @@ +?xml version=1.0 encoding=UTF-8?project + modelVersion4.0.0/modelVersion + groupIdcom.google.appengine/groupId + artifactIdappengine-api-1.0-sdk/artifactId + version1.3.0/version +/project \ No newline at end of file Added: camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.3.0/appengine-api-1.0-sdk-1.3.0.pom.md5 URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk
svn commit: r900688 - /camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/mail/GMailBindingTest.java
Author: krasserm
Date: Tue Jan 19 07:35:28 2010
New Revision: 900688
URL: http://svn.apache.org/viewvc?rev=900688view=rev
Log:
fixes for checkstyle errors
Modified:
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/mail/GMailBindingTest.java
Modified:
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/mail/GMailBindingTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/mail/GMailBindingTest.java?rev=900688r1=900687r2=900688view=diff
==
---
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/mail/GMailBindingTest.java
(original)
+++
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/mail/GMailBindingTest.java
Tue Jan 19 07:35:28 2010
@@ -43,11 +43,11 @@
@BeforeClass
public static void setUpClass() throws Exception {
binding = new GMailBinding();
-endpoint = createEndpoint(gmail:us...@gmail.com +
- ?to=us...@gmail.com +
-cc=us...@gmail.com +
-bcc=us...@gmail.com +
- subject=test);
+endpoint = createEndpoint(gmail:us...@gmail.com
++ ?to=us...@gmail.com
++ cc=us...@gmail.com
++ bcc=us...@gmail.com
++ subject=test);
}
@Before
svn commit: r890042 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/impl/ camel-core/src/main/java/org/apache/camel/util/ camel-core/src/test/java/org/apache/camel/impl/ components/camel-
Author: krasserm
Date: Sun Dec 13 10:18:22 2009
New Revision: 890042
URL: http://svn.apache.org/viewvc?rev=890042view=rev
Log:
Fix for CAMEL-2248
Added:
camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpReferenceParameterTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/XsltReferenceParameterTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentTest.java
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/xslt/XsltComponent.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java?rev=890042r1=890041r2=890042view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
Sun Dec 13 10:18:22 2009
@@ -352,11 +352,14 @@
/**
* Resolves a reference parameter in the registry and removes it from the
map.
*
- * @param T type of object to lookup in th registry.
+ * @param T type of object to lookup in the registry.
* @param parametersparameter map.
* @param key parameter map key.
- * @param type type of object to lookup in th registry.
- * @return the referenced object or codenull/code.
+ * @param type type of object to lookup in the registry.
+ * @return the referenced object or codenull/code if the parameter map
+ * doesn't contain the key.
+ * @throws IllegalArgumentException if a non-null reference was not found
in
+ * registry.
*/
public T T resolveAndRemoveReferenceParameter(MapString, Object
parameters, String key, ClassT type) {
return resolveAndRemoveReferenceParameter(parameters, key, type,
null);
@@ -369,20 +372,18 @@
* @param parametersparameter map.
* @param key parameter map key.
* @param type type of object to lookup in the registry.
- * @param defaultValue default value to use if either the parameter map
doesn't
- * contain the key or the registry doesn't contain an
object
- * of requested type.
- * @return the referenced object, the default value or codenull/code.
+ * @param defaultValue default value to use if the parameter map doesn't
+ * contain the key.
+ * @return the referenced object or the default value.
+ * @throws IllegalArgumentException if referenced object was not found in
+ * registry.
*/
public T T resolveAndRemoveReferenceParameter(MapString, Object
parameters, String key, ClassT type, T defaultValue) {
String value = getAndRemoveParameter(parameters, key, String.class);
-if (EndpointHelper.isReferenceParameter(value)) {
-T result =
EndpointHelper.resolveReferenceParameter(getCamelContext(), value.toString(),
type);
-return result == null ? defaultValue : result;
-} else if (value == null) {
+if (value == null) {
return defaultValue;
} else {
-throw new IllegalArgumentException(Parameter value + value +
is not a valid reference);
+return EndpointHelper.resolveReferenceParameter(getCamelContext(),
value.toString(), type);
}
}
@@ -396,8 +397,10 @@
*parameter map key.
* @param elementType
*result list element type.
- * @return the list of referenced objects or an empty list, never
- * codenull/code.
+ * @return the list of referenced objects or an empty list if the parameter
+ * map doesn't contain the key.
+ * @throws IllegalArgumentException if any of the referenced objects was
+ * not found in registry.
* @see EndpointHelper#resolveReferenceListParameter(CamelContext, String,
Class)
*/
public T ListT resolveAndRemoveReferenceListParameter(MapString,
Object parameters, String key, ClassT elementType) {
@@ -415,22 +418,20 @@
* @param elementType
*result list element type.
* @param defaultValue
svn commit: r887866 - in /camel/m2-repo/com/google/appengine: appengine-api-1.0-sdk/ appengine-api-1.0-sdk/1.2.8/ appengine-api-labs/ appengine-api-labs/1.2.8/
Author: krasserm Date: Mon Dec 7 09:36:54 2009 New Revision: 887866 URL: http://svn.apache.org/viewvc?rev=887866view=rev Log: App Engine SDK 1.2.8 API artifacts added to Camel Maven repo. Added: camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.2.8/ camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.2.8/appengine-api-1.0-sdk-1.2.8.jar (with props) camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.2.8/appengine-api-1.0-sdk-1.2.8.jar.md5 camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.2.8/appengine-api-1.0-sdk-1.2.8.jar.sha1 camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.2.8/appengine-api-1.0-sdk-1.2.8.pom (with props) camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.2.8/appengine-api-1.0-sdk-1.2.8.pom.md5 camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.2.8/appengine-api-1.0-sdk-1.2.8.pom.sha1 camel/m2-repo/com/google/appengine/appengine-api-labs/1.2.8/ camel/m2-repo/com/google/appengine/appengine-api-labs/1.2.8/appengine-api-labs-1.2.8.jar (with props) camel/m2-repo/com/google/appengine/appengine-api-labs/1.2.8/appengine-api-labs-1.2.8.jar.md5 camel/m2-repo/com/google/appengine/appengine-api-labs/1.2.8/appengine-api-labs-1.2.8.jar.sha1 camel/m2-repo/com/google/appengine/appengine-api-labs/1.2.8/appengine-api-labs-1.2.8.pom (with props) camel/m2-repo/com/google/appengine/appengine-api-labs/1.2.8/appengine-api-labs-1.2.8.pom.md5 camel/m2-repo/com/google/appengine/appengine-api-labs/1.2.8/appengine-api-labs-1.2.8.pom.sha1 Modified: camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/maven-metadata.xml camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/maven-metadata.xml.md5 camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/maven-metadata.xml.sha1 camel/m2-repo/com/google/appengine/appengine-api-labs/maven-metadata.xml camel/m2-repo/com/google/appengine/appengine-api-labs/maven-metadata.xml.md5 camel/m2-repo/com/google/appengine/appengine-api-labs/maven-metadata.xml.sha1 Added: camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.2.8/appengine-api-1.0-sdk-1.2.8.jar URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.2.8/appengine-api-1.0-sdk-1.2.8.jar?rev=887866view=auto == Binary file - no diff available. Propchange: camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.2.8/appengine-api-1.0-sdk-1.2.8.jar -- svn:mime-type = application/octet-stream Added: camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.2.8/appengine-api-1.0-sdk-1.2.8.jar.md5 URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.2.8/appengine-api-1.0-sdk-1.2.8.jar.md5?rev=887866view=auto == --- camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.2.8/appengine-api-1.0-sdk-1.2.8.jar.md5 (added) +++ camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.2.8/appengine-api-1.0-sdk-1.2.8.jar.md5 Mon Dec 7 09:36:54 2009 @@ -0,0 +1 @@ +167b73b051e971194cb3b82f3b273f5b \ No newline at end of file Added: camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.2.8/appengine-api-1.0-sdk-1.2.8.jar.sha1 URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.2.8/appengine-api-1.0-sdk-1.2.8.jar.sha1?rev=887866view=auto == --- camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.2.8/appengine-api-1.0-sdk-1.2.8.jar.sha1 (added) +++ camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.2.8/appengine-api-1.0-sdk-1.2.8.jar.sha1 Mon Dec 7 09:36:54 2009 @@ -0,0 +1 @@ +a0f1e3983eea87aab9ec780f16934310fa911ac2 \ No newline at end of file Added: camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.2.8/appengine-api-1.0-sdk-1.2.8.pom URL: http://svn.apache.org/viewvc/camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.2.8/appengine-api-1.0-sdk-1.2.8.pom?rev=887866view=auto == --- camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.2.8/appengine-api-1.0-sdk-1.2.8.pom (added) +++ camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.2.8/appengine-api-1.0-sdk-1.2.8.pom Mon Dec 7 09:36:54 2009 @@ -0,0 +1,6 @@ +?xml version=1.0 encoding=UTF-8?project + modelVersion4.0.0/modelVersion + groupIdcom.google.appengine/groupId + artifactIdappengine-api-1.0-sdk/artifactId + version1.2.8/version +/project \ No newline at end of file Propchange: camel/m2-repo/com/google/appengine/appengine-api-1.0-sdk/1.2.8/appengine-api-1.0-sdk-1.2.8.pom
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/g
Author: krasserm
Date: Mon Dec 7 12:41:01 2009
New Revision: 887907
URL: http://svn.apache.org/viewvc?rev=887907view=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=887907r1=887906r2=887907view=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.pkgorg.apache.camel.component.gae.*/camel.osgi.export.pkg
-appengine-sdk-version1.2.6/appengine-sdk-version
+appengine-sdk-version1.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=887907r1=887906r2=887907view=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 MapString, String getHeaders() {
+public MapString, ListString 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=887907r1=887906r2=887907view=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=887907r1=887906r2=887907view=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.EntryString, String entry :
accessor.getHeaders().entrySet()) {
-request.setHeaderField(entry.getKey(), entry.getValue());
+for (Map.EntryString, ListString 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=887907r1=887906r2=887907view=diff
==
--- camel/trunk
svn commit: r887924 - /camel/trunk/examples/camel-example-gae/src/main/resources/context.xml
Author: krasserm Date: Mon Dec 7 13:52:28 2009 New Revision: 887924 URL: http://svn.apache.org/viewvc?rev=887924view=rev Log: Usage of Camel XML schema for Spring in GAE example Modified: camel/trunk/examples/camel-example-gae/src/main/resources/context.xml Modified: camel/trunk/examples/camel-example-gae/src/main/resources/context.xml URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-gae/src/main/resources/context.xml?rev=887924r1=887923r2=887924view=diff == --- camel/trunk/examples/camel-example-gae/src/main/resources/context.xml (original) +++ camel/trunk/examples/camel-example-gae/src/main/resources/context.xml Mon Dec 7 13:52:28 2009 @@ -1,13 +1,16 @@ beans xmlns=http://www.springframework.org/schema/beans; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; + xmlns:camel=http://camel.apache.org/schema/spring; xsi:schemaLocation= -http://www.springframework.org/schema/beans -http://www.springframework.org/schema/beans/spring-beans-2.5.xsd; +http://www.springframework.org/schema/beans +http://www.springframework.org/schema/beans/spring-beans-2.5.xsd +http://camel.apache.org/schema/spring +http://camel.apache.org/schema/spring/camel-spring.xsd; -bean id=camelContext -class=org.apache.camel.component.gae.context.GaeSpringCamelContext -property name=routeBuilder ref=tutorialRouteBuilder / -/bean +camel:camelContext id=camelContext +camel:jmxAgent id=agent disabled=true / +camel:routeBuilder ref=tutorialRouteBuilder/ +/camel:camelContext bean id=tutorialRouteBuilder class=org.apache.camel.example.gae.TutorialRouteBuilder
svn commit: r885767 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/impl/DefaultComponent.java main/java/org/apache/camel/util/EndpointHelper.java test/java/org/apache/camel/impl/DefaultC
Author: krasserm
Date: Tue Dec 1 14:28:18 2009
New Revision: 885767
URL: http://svn.apache.org/viewvc?rev=885767view=rev
Log:
CAMEL-2244
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java?rev=885767r1=885766r2=885767view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
Tue Dec 1 14:28:18 2009
@@ -17,6 +17,8 @@
package org.apache.camel.impl;
import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.ScheduledExecutorService;
@@ -363,13 +365,13 @@
/**
* Resolves a reference parameter in the registry and removes it from the
map.
*
- * @param T type of object to lookup in th registry.
+ * @param T type of object to lookup in the registry.
* @param parametersparameter map.
* @param key parameter map key.
- * @param type type of object to lookup in th registry.
- * @param defaultValue default value to use if neither the parameter map
contains
- * the key nor the registry contains an object of
requested
- * type.
+ * @param type type of object to lookup in the registry.
+ * @param defaultValue default value to use if either the parameter map
doesn't
+ * contain the key or the registry doesn't contain an
object
+ * of requested type.
* @return the referenced object, the default value or codenull/code.
*/
public T T resolveAndRemoveReferenceParameter(MapString, Object
parameters, String key, ClassT type, T defaultValue) {
@@ -385,6 +387,54 @@
}
/**
+ * Resolves a reference list parameter in the registry and removes it from
+ * the map.
+ *
+ * @param parameters
+ *parameter map.
+ * @param key
+ *parameter map key.
+ * @param elementType
+ *result list element type.
+ * @return the list of referenced objects or an empty list, never
+ * codenull/code.
+ * @see EndpointHelper#resolveReferenceListParameter(CamelContext, String,
Class)
+ */
+public T ListT resolveAndRemoveReferenceListParameter(MapString,
Object parameters, String key, ClassT elementType) {
+return resolveAndRemoveReferenceListParameter(parameters, key,
elementType, new ArrayListT(0));
+}
+
+/**
+ * Resolves a reference list parameter in the registry and removes it from
+ * the map.
+ *
+ * @param parameters
+ *parameter map.
+ * @param key
+ *parameter map key.
+ * @param elementType
+ *result list element type.
+ * @param defaultValue
+ *default value to use if either the parameter map doesn't
+ *contain the key or the lookup for none of the references
+ *was successful.
+ * @return the list of referenced objects, the default value or an empty
list, never
+ * codenull/code.
+ * @see EndpointHelper#resolveReferenceListParameter(CamelContext, String,
Class)
+ */
+public T ListT resolveAndRemoveReferenceListParameter(MapString,
Object parameters, String key, ClassT elementType, ListT defaultValue) {
+String value = getAndRemoveParameter(parameters, key, String.class);
+if (EndpointHelper.isReferenceParameter(value)) {
+ListT result =
EndpointHelper.resolveReferenceListParameter(getCamelContext(),
value.toString(), elementType);
+return result.isEmpty() ? defaultValue : result;
+} else if (value == null) {
+return defaultValue;
+} else {
+throw new IllegalArgumentException(Parameter value + value +
is not a valid reference (list));
+}
+}
+
+/**
* Returns the reminder of the text if it starts with the prefix.
* p/
* Is useable for string parameters that contains commands.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java?rev=885767r1=885766r2=885767view=diff
svn commit: r885768 - in /camel/trunk/components/camel-mina/src: main/java/org/apache/camel/component/mina/ test/java/org/apache/camel/component/mina/
Author: krasserm
Date: Tue Dec 1 14:31:00 2009
New Revision: 885768
URL: http://svn.apache.org/viewvc?rev=885768view=rev
Log:
CAMEL-2237
Added:
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaNoDefaultCodecTest.java
(with props)
Modified:
camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java
camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConfiguration.java
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFiltersTest.java
Modified:
camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java?rev=885768r1=885767r2=885768view=diff
==
---
camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java
(original)
+++
camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java
Tue Dec 1 14:31:00 2009
@@ -87,6 +87,7 @@
config.setHost(u.getHost());
config.setPort(u.getPort());
config.setProtocol(u.getScheme());
+config.setFilters(resolveAndRemoveReferenceListParameter(parameters,
filters, IoFilter.class));
setProperties(config, parameters);
return createEndpoint(uri, config);
@@ -214,38 +215,42 @@
}
protected void configureCodecFactory(String type, IoServiceConfig config,
MinaConfiguration configuration) {
-ProtocolCodecFactory codecFactory = configuration.getCodec();
+if (configuration.getCodec() != null) {
+addCodecFactory(config, configuration.getCodec());
+} else if (configuration.isAllowDefaultCodec()) {
+configureDefaultCodecFactory(type, config, configuration);
+}
+}
-if (codecFactory == null) {
-if (configuration.isTextline()) {
-Charset charset = getEncodingParameter(type, configuration);
-LineDelimiter delimiter =
getLineDelimiterParameter(configuration.getTextlineDelimiter());
-TextLineCodecFactory tmpCodecFactory = new
TextLineCodecFactory(charset, delimiter);
-if (configuration.getEncoderMaxLineLength() 0) {
-
tmpCodecFactory.setEncoderMaxLineLength(configuration.getEncoderMaxLineLength());
-}
-if (configuration.getDecoderMaxLineLength() 0) {
-
tmpCodecFactory.setDecoderMaxLineLength(configuration.getDecoderMaxLineLength());
-}
-if (LOG.isDebugEnabled()) {
-LOG.debug(type + : Using TextLineCodecFactory: +
codecFactory + using encoding:
-+ charset + line delimiter: +
configuration.getTextlineDelimiter()
-+ ( + delimiter + ));
-LOG.debug(Encoder maximum line length: +
tmpCodecFactory.getEncoderMaxLineLength()
-+ Decoder maximum line length: +
tmpCodecFactory.getDecoderMaxLineLength());
-}
-codecFactory = tmpCodecFactory;
-} else {
-codecFactory = new ObjectSerializationCodecFactory();
-if (LOG.isDebugEnabled()) {
-LOG.debug(type + : Using ObjectSerializationCodecFactory:
+ codecFactory);
-}
+protected void configureDefaultCodecFactory(String type, IoServiceConfig
config, MinaConfiguration configuration) {
+if (configuration.isTextline()) {
+Charset charset = getEncodingParameter(type, configuration);
+LineDelimiter delimiter =
getLineDelimiterParameter(configuration.getTextlineDelimiter());
+TextLineCodecFactory codecFactory = new
TextLineCodecFactory(charset, delimiter);
+if (configuration.getEncoderMaxLineLength() 0) {
+
codecFactory.setEncoderMaxLineLength(configuration.getEncoderMaxLineLength());
+}
+if (configuration.getDecoderMaxLineLength() 0) {
+
codecFactory.setDecoderMaxLineLength(configuration.getDecoderMaxLineLength());
+}
+addCodecFactory(config, codecFactory);
+if (LOG.isDebugEnabled()) {
+LOG.debug(type + : Using TextLineCodecFactory: +
codecFactory + using encoding:
++ charset + line delimiter: +
configuration.getTextlineDelimiter()
++ ( + delimiter + ));
+LOG.debug(Encoder maximum line length: +
codecFactory.getEncoderMaxLineLength()
++ Decoder maximum line length: +
codecFactory.getDecoderMaxLineLength());
+}
+} else
svn commit: r882629 - /camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/TutorialRouteBuilder.java
Author: krasserm Date: Fri Nov 20 16:15:30 2009 New Revision: 882629 URL: http://svn.apache.org/viewvc?rev=882629view=rev Log: removed hard-coded email address. Modified: camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/TutorialRouteBuilder.java Modified: camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/TutorialRouteBuilder.java URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/TutorialRouteBuilder.java?rev=882629r1=882628r2=882629view=diff == --- camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/TutorialRouteBuilder.java (original) +++ camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/TutorialRouteBuilder.java Fri Nov 20 16:15:30 2009 @@ -35,7 +35,7 @@ .process(new WeatherProcessor()) .setHeader(GMailBinding.GMAIL_SUBJECT, constant(Weather report)) .setHeader(GMailBinding.GMAIL_TO, header(mailto)) -.to(gmail://krass...@googlemail.com); +.to(gmail://replac...@gmail.com); } }
svn commit: r882635 - in /camel/trunk/examples/camel-example-gae/src/main: java/org/apache/camel/example/gae/TutorialRouteBuilder.java resources/context.xml
Author: krasserm
Date: Fri Nov 20 16:28:09 2009
New Revision: 882635
URL: http://svn.apache.org/viewvc?rev=882635view=rev
Log:
make sender email address configurable
Modified:
camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/TutorialRouteBuilder.java
camel/trunk/examples/camel-example-gae/src/main/resources/context.xml
Modified:
camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/TutorialRouteBuilder.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/TutorialRouteBuilder.java?rev=882635r1=882634r2=882635view=diff
==
---
camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/TutorialRouteBuilder.java
(original)
+++
camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/TutorialRouteBuilder.java
Fri Nov 20 16:28:09 2009
@@ -22,6 +22,12 @@
public class TutorialRouteBuilder extends RouteBuilder {
+private String sender;
+
+public void setSender(String sender) {
+this.sender = sender;
+}
+
@Override
public void configure() throws Exception {
from(ghttp:///weather;)
@@ -35,7 +41,7 @@
.process(new WeatherProcessor())
.setHeader(GMailBinding.GMAIL_SUBJECT, constant(Weather report))
.setHeader(GMailBinding.GMAIL_TO, header(mailto))
-.to(gmail://replac...@gmail.com);
+.to(gmail:// + sender);
}
}
Modified: camel/trunk/examples/camel-example-gae/src/main/resources/context.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-gae/src/main/resources/context.xml?rev=882635r1=882634r2=882635view=diff
==
--- camel/trunk/examples/camel-example-gae/src/main/resources/context.xml
(original)
+++ camel/trunk/examples/camel-example-gae/src/main/resources/context.xml Fri
Nov 20 16:28:09 2009
@@ -11,6 +11,7 @@
bean id=tutorialRouteBuilder
class=org.apache.camel.example.gae.TutorialRouteBuilder
+property name=sender value=replac...@gmail.com /
/bean
/beans
svn commit: r882143 - in /camel/trunk: examples/ examples/camel-example-gae/ examples/camel-example-gae/src/ examples/camel-example-gae/src/main/ examples/camel-example-gae/src/main/java/ examples/cam
Author: krasserm Date: Thu Nov 19 13:48:14 2009 New Revision: 882143 URL: http://svn.apache.org/viewvc?rev=882143view=rev Log: initial commit of camel-example-gae Added: camel/trunk/examples/camel-example-gae/ (with props) camel/trunk/examples/camel-example-gae/pom.xml (with props) camel/trunk/examples/camel-example-gae/src/ camel/trunk/examples/camel-example-gae/src/main/ camel/trunk/examples/camel-example-gae/src/main/java/ camel/trunk/examples/camel-example-gae/src/main/java/org/ camel/trunk/examples/camel-example-gae/src/main/java/org/apache/ camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/ camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/ camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/ camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/TutorialRouteBuilder.java (with props) camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/WeatherProcessor.java (with props) camel/trunk/examples/camel-example-gae/src/main/resources/ camel/trunk/examples/camel-example-gae/src/main/resources/context.xml (with props) camel/trunk/examples/camel-example-gae/src/main/webapp/ camel/trunk/examples/camel-example-gae/src/main/webapp/META-INF/ camel/trunk/examples/camel-example-gae/src/main/webapp/WEB-INF/ camel/trunk/examples/camel-example-gae/src/main/webapp/WEB-INF/appengine-web.xml (with props) camel/trunk/examples/camel-example-gae/src/main/webapp/WEB-INF/lib/ camel/trunk/examples/camel-example-gae/src/main/webapp/WEB-INF/lib/datanucleus-appengine-1.0.3.jar (with props) camel/trunk/examples/camel-example-gae/src/main/webapp/WEB-INF/lib/datanucleus-core-1.1.5.jar (with props) camel/trunk/examples/camel-example-gae/src/main/webapp/WEB-INF/lib/datanucleus-jpa-1.1.5.jar (with props) camel/trunk/examples/camel-example-gae/src/main/webapp/WEB-INF/lib/geronimo-jpa_3.0_spec-1.1.1.jar (with props) camel/trunk/examples/camel-example-gae/src/main/webapp/WEB-INF/lib/geronimo-jta_1.1_spec-1.1.1.jar (with props) camel/trunk/examples/camel-example-gae/src/main/webapp/WEB-INF/lib/jdo2-api-2.3-eb.jar (with props) camel/trunk/examples/camel-example-gae/src/main/webapp/WEB-INF/logging.properties (with props) camel/trunk/examples/camel-example-gae/src/main/webapp/WEB-INF/web.xml (with props) camel/trunk/examples/camel-example-gae/src/main/webapp/index.html (with props) camel/trunk/examples/camel-example-gae/src/test/ camel/trunk/examples/camel-example-gae/src/test/java/ camel/trunk/examples/camel-example-gae/src/test/resources/ Modified: camel/trunk/examples/pom.xml camel/trunk/parent/pom.xml Propchange: camel/trunk/examples/camel-example-gae/ -- --- svn:ignore (added) +++ svn:ignore Thu Nov 19 13:48:14 2009 @@ -0,0 +1,8 @@ +.checkstyle +.pmd +eclipse-classes +target +.classpath +.project +.settings +*.i?? Added: camel/trunk/examples/camel-example-gae/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-gae/pom.xml?rev=882143view=auto == --- camel/trunk/examples/camel-example-gae/pom.xml (added) +++ camel/trunk/examples/camel-example-gae/pom.xml Thu Nov 19 13:48:14 2009 @@ -0,0 +1,30 @@ +?xml version=1.0 encoding=UTF-8? +project xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; + xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xmlns=http://maven.apache.org/POM/4.0.0; + +modelVersion4.0.0/modelVersion + +parent +groupIdorg.apache.camel/groupId +artifactIdexamples/artifactId +version2.1-SNAPSHOT/version +/parent + +artifactIdcamel-example-gae/artifactId +nameCamel :: Example :: GAE/name +descriptionDemonstrates how to get Camel running on Google App Engine/description +packagingwar/packaging + +dependencies +dependency +groupIdorg.apache.camel/groupId +artifactIdcamel-gae/artifactId +/dependency +dependency +groupIdjunit/groupId +artifactIdjunit/artifactId +scopetest/scope +/dependency +/dependencies + +/project Propchange: camel/trunk/examples/camel-example-gae/pom.xml -- svn:eol-style = native Added: camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/TutorialRouteBuilder.java URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/TutorialRouteBuilder.java?rev=882143view=auto
svn commit: r880672 [3/3] - in /camel/trunk: components/ components/camel-gae/ components/camel-gae/src/ components/camel-gae/src/main/ components/camel-gae/src/main/java/ components/camel-gae/src/mai
Added:
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/GTaskCombinedRouteBuilderTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/GTaskCombinedRouteBuilderTest.java?rev=880672view=auto
==
---
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/GTaskCombinedRouteBuilderTest.java
(added)
+++
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/GTaskCombinedRouteBuilderTest.java
Mon Nov 16 08:45:58 2009
@@ -0,0 +1,91 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+package org.apache.camel.component.gae.task;
+
+import java.io.InputStream;
+
+import com.meterware.httpunit.HttpUnitOptions;
+import com.meterware.servletunit.ServletRunner;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Message;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.component.gae.support.ServletTestSupport;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import static org.junit.Assert.assertEquals;
+
+...@runwith(SpringJUnit4ClassRunner.class)
+...@contextconfiguration(locations = {
/org/apache/camel/component/gae/task/context-combined.xml })
+public class GTaskCombinedRouteBuilderTest extends ServletTestSupport {
+
+@Autowired
+private CamelContext camelContext;
+
+@Autowired
+private ProducerTemplate producerTemplate;
+
+@Autowired
+private MockQueue mockQueue;
+
+@BeforeClass
+public static void setUpClass() throws Exception {
+String webxml = org/apache/camel/component/gae/task/web-combined.xml;
+InputStream is = new ClassPathResource(webxml).getInputStream();
+servletRunner = new ServletRunner(is, CTX_PATH);
+HttpUnitOptions.setExceptionsThrownOnErrorStatus(true);
+// Servlet needs to be initialized explicitly because
+// route creation is not bound to servlet lifecycle.
+initServlet();
+is.close();
+}
+
+@Before
+public void setUp() {
+mockQueue.setServletUnitClient(newClient());
+}
+
+@After
+public void tearDown() {
+getMockEndpoint().reset();
+}
+
+@Test
+public void testDefault() throws Exception {
+getMockEndpoint().expectedBodiesReceived(test1);
+getMockEndpoint().expectedHeaderReceived(test, test2);
+producerTemplate.sendBodyAndHeader(direct:input, test1, test,
test2);
+getMockEndpoint().assertIsSatisfied();
+Message received = getMockEndpoint().getExchanges().get(0).getIn();
+assertEquals(default,
received.getHeader(GTaskBinding.GTASK_QUEUE_NAME));
+assertEquals(0, received.getHeader(GTaskBinding.GTASK_RETRY_COUNT));
+}
+
+private MockEndpoint getMockEndpoint() {
+return (MockEndpoint)camelContext.getEndpoint(mock:mock);
+}
+
+}
Propchange:
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/GTaskCombinedRouteBuilderTest.java
--
svn:eol-style = native
Added:
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/GTaskEndpointTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/GTaskEndpointTest.java?rev=880672view=auto
==
---
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/GTaskEndpointTest.java
(added)
+++
