You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/03/25 17:15:40 UTC
[1/3] camel git commit: Fix syntax to correspond to the correct
naming of contextIdPattern
Repository: camel
Updated Branches:
refs/heads/camel-2.16.x d60324cbd -> 77f09309c
refs/heads/master b523b1be3 -> 359f4c5c4
Fix syntax to correspond to the correct naming of contextIdPattern
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/359f4c5c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/359f4c5c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/359f4c5c
Branch: refs/heads/master
Commit: 359f4c5c4cc1b673eaa8d43b21d6208aef2caa4b
Parents: b523b1b
Author: Aurelien Pupier <ap...@redhat.com>
Authored: Fri Mar 25 16:10:45 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Mar 25 17:14:24 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/rest/RestApiEndpoint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/359f4c5c/camel-core/src/main/java/org/apache/camel/component/rest/RestApiEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/rest/RestApiEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/rest/RestApiEndpoint.java
index eca625c..935bc25 100644
--- a/camel-core/src/main/java/org/apache/camel/component/rest/RestApiEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/rest/RestApiEndpoint.java
@@ -41,7 +41,7 @@ import org.apache.camel.util.ObjectHelper;
/**
* The rest-api component is used for providing Swagger API of the REST services which has been defined using the rest-dsl in Camel.
*/
-@UriEndpoint(scheme = "rest-api", title = "REST API", syntax = "rest-api:path/contextId", consumerOnly = true, label = "core,rest", lenientProperties = true)
+@UriEndpoint(scheme = "rest-api", title = "REST API", syntax = "rest-api:path/contextIdPattern", consumerOnly = true, label = "core,rest", lenientProperties = true)
public class RestApiEndpoint extends DefaultEndpoint {
public static final String DEFAULT_API_COMPONENT_NAME = "swagger";
[3/3] camel git commit: Fix syntax to correspond to the correct
naming of contextIdPattern
Posted by da...@apache.org.
Fix syntax to correspond to the correct naming of contextIdPattern
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/77f09309
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/77f09309
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/77f09309
Branch: refs/heads/camel-2.16.x
Commit: 77f09309cd2f3b2ef73c92ed8507257c63ec5f83
Parents: 1c7577b
Author: Aurelien Pupier <ap...@redhat.com>
Authored: Fri Mar 25 16:10:45 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Mar 25 17:15:26 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/rest/RestApiEndpoint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/77f09309/camel-core/src/main/java/org/apache/camel/component/rest/RestApiEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/rest/RestApiEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/rest/RestApiEndpoint.java
index 113d9d4..8561bde 100644
--- a/camel-core/src/main/java/org/apache/camel/component/rest/RestApiEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/rest/RestApiEndpoint.java
@@ -41,7 +41,7 @@ import org.apache.camel.util.ObjectHelper;
/**
* The rest-api component is used for providing Swagger API of the REST services which has been defined using the rest-dsl in Camel.
*/
-@UriEndpoint(scheme = "rest-api", title = "REST API", syntax = "rest-api:path/contextId", consumerOnly = true, label = "core,rest", lenientProperties = true)
+@UriEndpoint(scheme = "rest-api", title = "REST API", syntax = "rest-api:path/contextIdPattern", consumerOnly = true, label = "core,rest", lenientProperties = true)
public class RestApiEndpoint extends DefaultEndpoint {
public static final String DEFAULT_API_COMPONENT_NAME = "swagger";
[2/3] camel git commit: CAMEL-9761: Use constant for default CORS
headers.
Posted by da...@apache.org.
CAMEL-9761: Use constant for default CORS headers.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1c7577b1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1c7577b1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1c7577b1
Branch: refs/heads/camel-2.16.x
Commit: 1c7577b115cccb22428340fc2b21f52ed72a42a9
Parents: d60324c
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Mar 25 16:05:40 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Mar 25 17:15:18 2016 +0100
----------------------------------------------------------------------
.../org/apache/camel/swagger/RestSwaggerSupport.java | 15 +++++++++------
.../camel/swagger/servlet/RestSwaggerCorsFilter.java | 10 ++++++----
2 files changed, 15 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1c7577b1/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
index 0017873..a7cbc06 100644
--- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
+++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
@@ -40,6 +40,7 @@ import org.apache.camel.model.ModelHelper;
import org.apache.camel.model.rest.RestDefinition;
import org.apache.camel.model.rest.RestsDefinition;
import org.apache.camel.spi.ClassResolver;
+import org.apache.camel.spi.RestConfiguration;
import org.apache.camel.util.CamelVersionHelper;
import org.apache.camel.util.EndpointHelper;
import org.slf4j.Logger;
@@ -187,9 +188,10 @@ public class RestSwaggerSupport {
LOG.trace("renderResourceListing");
if (cors) {
- response.setHeader("Access-Control-Allow-Headers", "Origin, Accept, X-Requested-With, Content-Type, Access-Control-Request-Method, Access-Control-Request-Headers");
- response.setHeader("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, DELETE, TRACE, OPTIONS, CONNECT, PATCH");
- response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Origin", RestConfiguration.CORS_ACCESS_CONTROL_ALLOW_ORIGIN);
+ response.setHeader("Access-Control-Allow-Methods", RestConfiguration.CORS_ACCESS_CONTROL_ALLOW_METHODS);
+ response.setHeader("Access-Control-Allow-Headers", RestConfiguration.CORS_ACCESS_CONTROL_ALLOW_HEADERS);
+ response.setHeader("Access-Control-Max-Age", RestConfiguration.CORS_ACCESS_CONTROL_MAX_AGE);
}
List<RestDefinition> rests = getRestDefinitions(contextId);
@@ -220,9 +222,10 @@ public class RestSwaggerSupport {
LOG.trace("renderCamelContexts");
if (cors) {
- response.setHeader("Access-Control-Allow-Headers", "Origin, Accept, X-Requested-With, Content-Type, Access-Control-Request-Method, Access-Control-Request-Headers");
- response.setHeader("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, DELETE, TRACE, OPTIONS, CONNECT, PATCH");
- response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Origin", RestConfiguration.CORS_ACCESS_CONTROL_ALLOW_ORIGIN);
+ response.setHeader("Access-Control-Allow-Methods", RestConfiguration.CORS_ACCESS_CONTROL_ALLOW_METHODS);
+ response.setHeader("Access-Control-Allow-Headers", RestConfiguration.CORS_ACCESS_CONTROL_ALLOW_HEADERS);
+ response.setHeader("Access-Control-Max-Age", RestConfiguration.CORS_ACCESS_CONTROL_MAX_AGE);
}
response.setHeader(Exchange.CONTENT_TYPE, "application/json");
http://git-wip-us.apache.org/repos/asf/camel/blob/1c7577b1/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/servlet/RestSwaggerCorsFilter.java
----------------------------------------------------------------------
diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/servlet/RestSwaggerCorsFilter.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/servlet/RestSwaggerCorsFilter.java
index 4aca487..3570fe6 100644
--- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/servlet/RestSwaggerCorsFilter.java
+++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/servlet/RestSwaggerCorsFilter.java
@@ -25,6 +25,8 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletResponse;
+import org.apache.camel.spi.RestConfiguration;
+
/**
* A simple CORS filter that can used to allow the swagger ui or other API browsers from remote origins to access the
* Rest services exposes by this Camel swagger component.
@@ -45,10 +47,10 @@ public class RestSwaggerCorsFilter implements Filter {
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
HttpServletResponse res = (HttpServletResponse) response;
- res.setHeader("Access-Control-Allow-Origin", "*");
- res.setHeader("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, DELETE, TRACE, OPTIONS, CONNECT, PATCH");
- res.setHeader("Access-Control-Max-Age", "3600");
- res.setHeader("Access-Control-Allow-Headers", "Origin, Accept, X-Requested-With, Content-Type, Access-Control-Request-Method, Access-Control-Request-Headers");
+ res.setHeader("Access-Control-Allow-Origin", RestConfiguration.CORS_ACCESS_CONTROL_ALLOW_ORIGIN);
+ res.setHeader("Access-Control-Allow-Methods", RestConfiguration.CORS_ACCESS_CONTROL_ALLOW_METHODS);
+ res.setHeader("Access-Control-Allow-Headers", RestConfiguration.CORS_ACCESS_CONTROL_ALLOW_HEADERS);
+ res.setHeader("Access-Control-Max-Age", RestConfiguration.CORS_ACCESS_CONTROL_MAX_AGE);
chain.doFilter(request, response);
}