You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metamodel.apache.org by ka...@apache.org on 2019/06/04 19:40:10 UTC
[metamodel-membrane] branch master updated (2b83190 -> 1f1720f)
This is an automated email from the ASF dual-hosted git repository.
kaspersor pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/metamodel-membrane.git.
from 2b83190 Removed digital signature files (of other JAR files) from shaded jar.
new 1c61b93 Update WebServer.java
new 7224097 Add files via upload
new 02cddcb Update CorsHandlers.java
new 0aae74f Update WebServer.java
new 1f1720f METAMODEL-1212: Cosmetic fixes to CORS feature.
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.md | 6 +++++-
.../apache/metamodel/membrane/server/CorsHandlers.java | 13 ++++++-------
.../org/apache/metamodel/membrane/server/WebServer.java | 17 ++++++++++++++---
3 files changed, 25 insertions(+), 11 deletions(-)
copy core/src/main/java/org/apache/metamodel/membrane/app/exceptions/NoSuchDataSourceException.java => undertow/src/main/java/org/apache/metamodel/membrane/server/CorsHandlers.java (73%)
[metamodel-membrane] 02/05: Add files via upload
Posted by ka...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kaspersor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/metamodel-membrane.git
commit 7224097411055b9a9ebe458f6f70e7c7c20fdee5
Author: Nicola Vitucci <ni...@gmail.com>
AuthorDate: Fri May 24 11:35:07 2019 +0100
Add files via upload
---
.../metamodel/membrane/server/CorsHandlers.java | 28 ++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/undertow/src/main/java/org/apache/metamodel/membrane/server/CorsHandlers.java b/undertow/src/main/java/org/apache/metamodel/membrane/server/CorsHandlers.java
new file mode 100644
index 0000000..8e21d40
--- /dev/null
+++ b/undertow/src/main/java/org/apache/metamodel/membrane/server/CorsHandlers.java
@@ -0,0 +1,28 @@
+/**
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.metamodel.membrane.server;
+
+import io.undertow.server.HttpHandler;
+import io.undertow.server.handlers.SetHeaderHandler;
+
+public class CorsHandlers {
+ public HttpHandler allowOrigin(HttpHandler next) {
+ return new SetHeaderHandler(next, "Access-Control-Allow-Origin", "*");
+ }
+}
[metamodel-membrane] 05/05: METAMODEL-1212: Cosmetic fixes to CORS
feature.
Posted by ka...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kaspersor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/metamodel-membrane.git
commit 1f1720f374833647ca4e9912a15faf3e6ae79f9b
Author: Kasper Sørensen <i....@gmail.com>
AuthorDate: Tue Jun 4 21:39:52 2019 +0200
METAMODEL-1212: Cosmetic fixes to CORS feature.
Closes #22
---
CHANGES.md | 6 +++++-
.../main/java/org/apache/metamodel/membrane/server/WebServer.java | 5 ++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 0d5c6c6..41b6f20 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,8 @@
-### Apache MetaModel Membrane 0.1 [work in progress]
+### Apache MetaModel Membrane [work in progress]
+
+* [METAMODEL-1212] - Added support for CORS headers.
+
+### Apache MetaModel Membrane 0.1
* [METAMODEL-1153] - Added endpoints for deleting data sources.
* [METAMODEL-1147] - Implemented Swagger codegen to build model classes from swagger file.
diff --git a/undertow/src/main/java/org/apache/metamodel/membrane/server/WebServer.java b/undertow/src/main/java/org/apache/metamodel/membrane/server/WebServer.java
index 4ec6054..03a0dce 100644
--- a/undertow/src/main/java/org/apache/metamodel/membrane/server/WebServer.java
+++ b/undertow/src/main/java/org/apache/metamodel/membrane/server/WebServer.java
@@ -88,12 +88,11 @@ public class WebServer {
final DeploymentManager manager = Servlets.defaultContainer().addDeployment(deployment);
manager.deploy();
- HttpHandler handler;
+ final HttpHandler handler;
if (enableCors) {
CorsHandlers corsHandlers = new CorsHandlers();
handler = corsHandlers.allowOrigin(manager.start());
- }
- else {
+ } else {
handler = manager.start();
}
[metamodel-membrane] 01/05: Update WebServer.java
Posted by ka...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kaspersor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/metamodel-membrane.git
commit 1c61b930382e33f23619515b5a77c43af07da62e
Author: Nicola Vitucci <ni...@gmail.com>
AuthorDate: Fri May 24 11:32:44 2019 +0100
Update WebServer.java
---
.../metamodel/membrane/server/WebServer.java | 23 ++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/undertow/src/main/java/org/apache/metamodel/membrane/server/WebServer.java b/undertow/src/main/java/org/apache/metamodel/membrane/server/WebServer.java
index 4e3d188..d74c953 100644
--- a/undertow/src/main/java/org/apache/metamodel/membrane/server/WebServer.java
+++ b/undertow/src/main/java/org/apache/metamodel/membrane/server/WebServer.java
@@ -6,9 +6,9 @@
* 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
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
* 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
@@ -33,6 +33,7 @@ import org.springframework.web.servlet.DispatcherServlet;
import com.google.common.base.Strings;
import io.undertow.Undertow;
+import io.undertow.server.HttpHandler;
import io.undertow.server.handlers.resource.FileResourceManager;
import io.undertow.servlet.Servlets;
import io.undertow.servlet.api.DeploymentInfo;
@@ -52,10 +53,12 @@ public class WebServer {
final String portEnv = System.getenv("MEMBRANE_HTTP_PORT");
final int port = Strings.isNullOrEmpty(portEnv) ? DEFAULT_PORT : Integer.parseInt(portEnv);
+ final String enableCorsEnv = System.getenv("ENABLE_CORS");
+ final boolean enableCors = !Strings.isNullOrEmpty(enableCorsEnv);
logger.info("Apache MetaModel Membrane server initiating on port {}", port);
- startServer(port);
+ startServer(port, enableCors);
logger.info("Apache MetaModel Membrane server started on port {}", port);
}
@@ -69,7 +72,7 @@ public class WebServer {
}
}
- public static void startServer(int port) throws Exception {
+ public static void startServer(int port, boolean enableCors) throws Exception {
final DeploymentInfo deployment = Servlets.deployment().setClassLoader(WebServer.class.getClassLoader());
deployment.setContextPath("");
deployment.setDeploymentName("membrane");
@@ -85,7 +88,15 @@ public class WebServer {
final DeploymentManager manager = Servlets.defaultContainer().addDeployment(deployment);
manager.deploy();
- final Undertow server = Undertow.builder().addHttpListener(port, "0.0.0.0").setHandler(manager.start()).build();
+ HttpHandler handler;
+ if (enableCors) {
+ CorsHandlers corsHandlers = new CorsHandlers();
+ handler = corsHandlers.allowOrigin(manager.start());
+ }
+ else
+ handler = manager.start();
+
+ final Undertow server = Undertow.builder().addHttpListener(port, "0.0.0.0").setHandler(handler).build();
server.start();
Runtime.getRuntime().addShutdownHook(new Thread() {
[metamodel-membrane] 04/05: Update WebServer.java
Posted by ka...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kaspersor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/metamodel-membrane.git
commit 0aae74fd9f8d29b86249359746d31b5e06bb71e5
Author: Nicola Vitucci <ni...@gmail.com>
AuthorDate: Thu May 30 16:26:49 2019 +0100
Update WebServer.java
---
.../java/org/apache/metamodel/membrane/server/WebServer.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/undertow/src/main/java/org/apache/metamodel/membrane/server/WebServer.java b/undertow/src/main/java/org/apache/metamodel/membrane/server/WebServer.java
index d74c953..4ec6054 100644
--- a/undertow/src/main/java/org/apache/metamodel/membrane/server/WebServer.java
+++ b/undertow/src/main/java/org/apache/metamodel/membrane/server/WebServer.java
@@ -6,9 +6,9 @@
* 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ * 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
@@ -53,7 +53,7 @@ public class WebServer {
final String portEnv = System.getenv("MEMBRANE_HTTP_PORT");
final int port = Strings.isNullOrEmpty(portEnv) ? DEFAULT_PORT : Integer.parseInt(portEnv);
- final String enableCorsEnv = System.getenv("ENABLE_CORS");
+ final String enableCorsEnv = System.getenv("MEMBRANE_ENABLE_CORS");
final boolean enableCors = !Strings.isNullOrEmpty(enableCorsEnv);
logger.info("Apache MetaModel Membrane server initiating on port {}", port);
@@ -93,8 +93,9 @@ public class WebServer {
CorsHandlers corsHandlers = new CorsHandlers();
handler = corsHandlers.allowOrigin(manager.start());
}
- else
+ else {
handler = manager.start();
+ }
final Undertow server = Undertow.builder().addHttpListener(port, "0.0.0.0").setHandler(handler).build();
server.start();
[metamodel-membrane] 03/05: Update CorsHandlers.java
Posted by ka...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kaspersor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/metamodel-membrane.git
commit 02cddcb56260d80a7d99661fd07b75681b106f83
Author: Nicola Vitucci <ni...@gmail.com>
AuthorDate: Thu May 30 16:25:41 2019 +0100
Update CorsHandlers.java
---
.../java/org/apache/metamodel/membrane/server/CorsHandlers.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/undertow/src/main/java/org/apache/metamodel/membrane/server/CorsHandlers.java b/undertow/src/main/java/org/apache/metamodel/membrane/server/CorsHandlers.java
index 8e21d40..869bd26 100644
--- a/undertow/src/main/java/org/apache/metamodel/membrane/server/CorsHandlers.java
+++ b/undertow/src/main/java/org/apache/metamodel/membrane/server/CorsHandlers.java
@@ -6,9 +6,9 @@
* 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ * 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