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 2013/11/19 10:18:31 UTC
[1/4] git commit: CAMEL-6971 Added the get method of schemaLocations
Updated Branches:
refs/heads/camel-2.11.x b5a726c40 -> f137db198
refs/heads/camel-2.12.x 053255f9a -> 061e85eb3
CAMEL-6971 Added the get method of schemaLocations
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/061e85eb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/061e85eb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/061e85eb
Branch: refs/heads/camel-2.12.x
Commit: 061e85eb33ede2df3511298da76069e88b01308a
Parents: 20f14a1
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Nov 19 17:15:00 2013 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Nov 19 17:17:49 2013 +0800
----------------------------------------------------------------------
.../java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/061e85eb/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
index 1e1296b..0b4c816 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
@@ -408,6 +408,10 @@ public class CxfRsEndpoint extends DefaultEndpoint implements HeaderFilterStrate
public void setSchemaLocations(List<String> schemas) {
this.schemaLocations = schemas;
}
+
+ public List<String> getSchemaLocations() {
+ return schemaLocations;
+ }
/**
* See documentation of {@link BindingStyle}.
[4/4] git commit: CAMEL-6971 Added the get method of schemaLocations
Posted by ni...@apache.org.
CAMEL-6971 Added the get method of schemaLocations
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f137db19
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f137db19
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f137db19
Branch: refs/heads/camel-2.11.x
Commit: f137db198866b178f05af68b08d95b3d94489ac6
Parents: 8f1ccdd
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Nov 19 17:15:00 2013 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Nov 19 17:18:03 2013 +0800
----------------------------------------------------------------------
.../java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f137db19/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
index 1e1296b..0b4c816 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
@@ -408,6 +408,10 @@ public class CxfRsEndpoint extends DefaultEndpoint implements HeaderFilterStrate
public void setSchemaLocations(List<String> schemas) {
this.schemaLocations = schemas;
}
+
+ public List<String> getSchemaLocations() {
+ return schemaLocations;
+ }
/**
* See documentation of {@link BindingStyle}.
[3/4] git commit: Polish the test code of SSLContextParametersTest
Posted by ni...@apache.org.
Polish the test code of SSLContextParametersTest
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8f1ccdde
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8f1ccdde
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8f1ccdde
Branch: refs/heads/camel-2.11.x
Commit: 8f1ccdde35739a881aaf27c22cafe92fb81179ea
Parents: b5a726c
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Nov 19 17:13:12 2013 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Nov 19 17:18:03 2013 +0800
----------------------------------------------------------------------
.../camel/util/jsse/SSLContextParametersTest.java | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8f1ccdde/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java b/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
index 7351ac5..11c82b2 100644
--- a/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
@@ -27,6 +27,8 @@ import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLServerSocket;
import javax.net.ssl.SSLSocket;
+import junit.framework.AssertionFailedError;
+
import org.apache.camel.CamelContext;
public class SSLContextParametersTest extends AbstractJsseParametersTest {
@@ -40,6 +42,12 @@ public class SSLContextParametersTest extends AbstractJsseParametersTest {
Arrays.asList(new Pattern[0]));
assertEquals(2, result.size());
assertStartsWith(result, "TLS");
+ try {
+ assertStartsWith((String[]) null, "TLS");
+ fail("We chould got an exception here!");
+ } catch (AssertionFailedError ex) {
+ assertEquals("Get a wrong message", "The values should not be null", ex.getMessage());
+ }
}
public void testPropertyPlaceholders() throws Exception {
@@ -752,14 +760,16 @@ public class SSLContextParametersTest extends AbstractJsseParametersTest {
}
protected void assertStartsWith(String[] values, String prefix) {
+ assertNotNull("The values should not be null", values);
for (String value : values) {
- assertTrue(value.startsWith(prefix));
+ assertTrue(value + " does not start with the prefix " + prefix, value.startsWith(prefix));
}
}
protected void assertStartsWith(Collection<String> values, String prefix) {
+ assertNotNull("The values should not be null", values);
for (String value : values) {
- assertTrue(value.startsWith(prefix));
+ assertTrue(value + " does not start with the prefix " + prefix, value.startsWith(prefix));
}
}
}
[2/4] git commit: Polish the test code of SSLContextParametersTest
Posted by ni...@apache.org.
Polish the test code of SSLContextParametersTest
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/20f14a18
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/20f14a18
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/20f14a18
Branch: refs/heads/camel-2.12.x
Commit: 20f14a18616074df4a9dcff7404c57bc66804e13
Parents: 053255f
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Nov 19 17:13:12 2013 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Nov 19 17:17:49 2013 +0800
----------------------------------------------------------------------
.../camel/util/jsse/SSLContextParametersTest.java | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/20f14a18/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java b/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
index 7351ac5..11c82b2 100644
--- a/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
@@ -27,6 +27,8 @@ import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLServerSocket;
import javax.net.ssl.SSLSocket;
+import junit.framework.AssertionFailedError;
+
import org.apache.camel.CamelContext;
public class SSLContextParametersTest extends AbstractJsseParametersTest {
@@ -40,6 +42,12 @@ public class SSLContextParametersTest extends AbstractJsseParametersTest {
Arrays.asList(new Pattern[0]));
assertEquals(2, result.size());
assertStartsWith(result, "TLS");
+ try {
+ assertStartsWith((String[]) null, "TLS");
+ fail("We chould got an exception here!");
+ } catch (AssertionFailedError ex) {
+ assertEquals("Get a wrong message", "The values should not be null", ex.getMessage());
+ }
}
public void testPropertyPlaceholders() throws Exception {
@@ -752,14 +760,16 @@ public class SSLContextParametersTest extends AbstractJsseParametersTest {
}
protected void assertStartsWith(String[] values, String prefix) {
+ assertNotNull("The values should not be null", values);
for (String value : values) {
- assertTrue(value.startsWith(prefix));
+ assertTrue(value + " does not start with the prefix " + prefix, value.startsWith(prefix));
}
}
protected void assertStartsWith(Collection<String> values, String prefix) {
+ assertNotNull("The values should not be null", values);
for (String value : values) {
- assertTrue(value.startsWith(prefix));
+ assertTrue(value + " does not start with the prefix " + prefix, value.startsWith(prefix));
}
}
}