You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/09/02 08:38:45 UTC
[1/2] git commit: CAMEL-7773 Clean up the pom.xml of camel-olingo2
Repository: camel
Updated Branches:
refs/heads/master e81903462 -> 0cd7cbc34
CAMEL-7773 Clean up the pom.xml of camel-olingo2
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0cd7cbc3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0cd7cbc3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0cd7cbc3
Branch: refs/heads/master
Commit: 0cd7cbc34b43213f7b42c93638c6ca8dbb420753
Parents: 1660251
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Sep 2 14:25:13 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Sep 2 14:38:35 2014 +0800
----------------------------------------------------------------------
components/camel-olingo2/camel-olingo2-api/pom.xml | 3 ---
components/camel-olingo2/camel-olingo2-component/pom.xml | 3 ---
2 files changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0cd7cbc3/components/camel-olingo2/camel-olingo2-api/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-olingo2/camel-olingo2-api/pom.xml b/components/camel-olingo2/camel-olingo2-api/pom.xml
index 971e402..23b2ae6 100644
--- a/components/camel-olingo2/camel-olingo2-api/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-api/pom.xml
@@ -63,18 +63,15 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.7</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.17</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/0cd7cbc3/components/camel-olingo2/camel-olingo2-component/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-olingo2/camel-olingo2-component/pom.xml b/components/camel-olingo2/camel-olingo2-component/pom.xml
index fc9942c..3b8af88 100644
--- a/components/camel-olingo2/camel-olingo2-component/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-component/pom.xml
@@ -78,18 +78,15 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.7</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.17</version>
<scope>test</scope>
</dependency>
[2/2] git commit: Fixed the CS errors of camel-olingo2
Posted by ni...@apache.org.
Fixed the CS errors of camel-olingo2
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1660251d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1660251d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1660251d
Branch: refs/heads/master
Commit: 1660251d413d9f0206034862b3e441285dedb579
Parents: e819034
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Sep 2 12:17:18 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Sep 2 14:38:35 2014 +0800
----------------------------------------------------------------------
.../olingo2/api/Olingo2AppIntegrationTest.java | 14 +++++++-------
.../camel/component/olingo2/Olingo2Consumer.java | 3 +--
.../component/olingo2/Olingo2AppIntegrationTest.java | 6 +++---
3 files changed, 11 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1660251d/components/camel-olingo2/camel-olingo2-api/src/test/java/org/apache/camel/component/olingo2/api/Olingo2AppIntegrationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-olingo2/camel-olingo2-api/src/test/java/org/apache/camel/component/olingo2/api/Olingo2AppIntegrationTest.java b/components/camel-olingo2/camel-olingo2-api/src/test/java/org/apache/camel/component/olingo2/api/Olingo2AppIntegrationTest.java
index d1cfb2a..9810be3 100644
--- a/components/camel-olingo2/camel-olingo2-api/src/test/java/org/apache/camel/component/olingo2/api/Olingo2AppIntegrationTest.java
+++ b/components/camel-olingo2/camel-olingo2-api/src/test/java/org/apache/camel/component/olingo2/api/Olingo2AppIntegrationTest.java
@@ -28,11 +28,6 @@ import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import org.apache.camel.component.olingo2.api.batch.Olingo2BatchChangeRequest;
import org.apache.camel.component.olingo2.api.batch.Olingo2BatchQueryRequest;
import org.apache.camel.component.olingo2.api.batch.Olingo2BatchRequest;
@@ -61,6 +56,11 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
* Integration test for {@link org.apache.camel.component.olingo2.api.impl.Olingo2AppImpl}.
* To test run the sample Olingo2 Server as outlined at
@@ -93,10 +93,10 @@ public class Olingo2AppIntegrationTest {
private static final String TEST_CAR_LINK_MANUFACTURER = "Cars('1')/$links/Manufacturer";
private static final String COUNT_OPTION = "/$count";
- private static String TEST_SERVICE_URL = "http://localhost:8080/MyFormula.svc";
+ private static final String TEST_SERVICE_URL = "http://localhost:8080/MyFormula.svc";
// private static String TEST_SERVICE_URL = "http://localhost:8080/cars-annotations-sample/MyFormula.svc";
// private static ContentType TEST_FORMAT = ContentType.APPLICATION_XML_CS_UTF_8;
- private static ContentType TEST_FORMAT = ContentType.APPLICATION_JSON_CS_UTF_8;
+ private static final ContentType TEST_FORMAT = ContentType.APPLICATION_JSON_CS_UTF_8;
private static final String INDEX = "/index.jsp";
private static Olingo2App olingoApp;
http://git-wip-us.apache.org/repos/asf/camel/blob/1660251d/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java
----------------------------------------------------------------------
diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java
index 72206d1..501ad75 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java
@@ -23,10 +23,9 @@ import java.util.concurrent.CountDownLatch;
import org.apache.camel.Processor;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.olingo2.api.Olingo2ResponseHandler;
+import org.apache.camel.component.olingo2.internal.Olingo2ApiName;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.component.AbstractApiConsumer;
-
-import org.apache.camel.component.olingo2.internal.Olingo2ApiName;
import org.apache.camel.util.component.ApiConsumerHelper;
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/1660251d/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2AppIntegrationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2AppIntegrationTest.java b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2AppIntegrationTest.java
index 87ff736..2694117 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2AppIntegrationTest.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2AppIntegrationTest.java
@@ -205,15 +205,15 @@ public class Olingo2AppIntegrationTest extends AbstractOlingo2TestSupport {
// test route for create
from("direct://CREATE")
- .to("olingo2://create/Manufacturers");
+ .to("olingo2://create/Manufacturers");
// test route for update
from("direct://UPDATE")
- .to("olingo2://update/Manufacturers('123')");
+ .to("olingo2://update/Manufacturers('123')");
// test route for delete
from("direct://DELETE")
- .to("olingo2://delete/Manufacturers('123')");
+ .to("olingo2://delete/Manufacturers('123')");
/*
// test route for merge