From 2b300d01a48bc5ec82a1602a713fa5148fe6dd4d Mon Sep 17 00:00:00 2001 From: Yog Sothoth Date: Thu, 29 Aug 2019 12:51:12 +0300 Subject: [PATCH 1/4] Java SE support * SE server implementation with Weld SE CDI support; * updated BOM. --- bom/pom.xml | 5 + pom.xml | 11 +++ se/pom.xml | 22 +++++ se/server/pom.xml | 60 ++++++++++++ .../java/com/kumuluz/se/server/SeServer.java | 92 +++++++++++++++++++ .../com.kumuluz.ee.common.KumuluzServer | 1 + 6 files changed, 191 insertions(+) create mode 100644 se/pom.xml create mode 100644 se/server/pom.xml create mode 100644 se/server/src/main/java/com/kumuluz/se/server/SeServer.java create mode 100644 se/server/src/main/resources/META-INF/services/com.kumuluz.ee.common.KumuluzServer diff --git a/bom/pom.xml b/bom/pom.xml index 52521224..0690ca7a 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -143,6 +143,11 @@ kumuluzee-javamail-ri ${project.version} + + com.kumuluz.ee + kumuluz-server-se + ${project.version} + diff --git a/pom.xml b/pom.xml index 02a3ed41..8301f48a 100644 --- a/pom.xml +++ b/pom.xml @@ -12,6 +12,7 @@ common core servlet + se components bom profiles @@ -345,6 +346,16 @@ ${project.version} maven-plugin + + com.kumuluz.ee + kumuluz-se + ${project.version} + + + com.kumuluz.ee + kumuluz-server-se + ${project.version} + diff --git a/se/pom.xml b/se/pom.xml new file mode 100644 index 00000000..b5daee73 --- /dev/null +++ b/se/pom.xml @@ -0,0 +1,22 @@ + + + + kumuluzee + com.kumuluz.ee + 3.6.0-SNAPSHOT + + 4.0.0 + pom + + + server + + + KumuluzEE for SE + KumuluzEE support for running within Java SE env + + kumuluz-se + + \ No newline at end of file diff --git a/se/server/pom.xml b/se/server/pom.xml new file mode 100644 index 00000000..99401767 --- /dev/null +++ b/se/server/pom.xml @@ -0,0 +1,60 @@ + + + + 4.0.0 + kumuluz-server-se + + kumuluz-se + com.kumuluz.ee + 3.6.0-SNAPSHOT + + + KumuluzEE SE server + KumuluzEE server for Java SE env + + + + com.kumuluz.ee + kumuluzee-cdi-weld + + + org.glassfish.jersey.ext.cdi + jersey-cdi1x + + + org.glassfish.jersey.ext.cdi + jersey-cdi1x-ban-custom-hk2-binding + + + org.jboss.weld.servlet + weld-servlet-core + + + javax.servlet + javax.servlet-api + + + javax.transaction + javax.transaction-api + + + + + org.jboss.weld.se + weld-se-core + ${weld.version} + + + com.kumuluz.ee + kumuluzee-loader + true + + + javax.enterprise + cdi-api + provided + + + \ No newline at end of file diff --git a/se/server/src/main/java/com/kumuluz/se/server/SeServer.java b/se/server/src/main/java/com/kumuluz/se/server/SeServer.java new file mode 100644 index 00000000..cf585cf7 --- /dev/null +++ b/se/server/src/main/java/com/kumuluz/se/server/SeServer.java @@ -0,0 +1,92 @@ +package com.kumuluz.se.server; + +import java.util.logging.Logger; + +import javax.enterprise.inject.se.SeContainer; +import javax.enterprise.inject.se.SeContainerInitializer; + +import com.kumuluz.ee.common.KumuluzServer; +import com.kumuluz.ee.common.config.ServerConfig; +import com.kumuluz.ee.common.dependencies.EeComponentDependency; +import com.kumuluz.ee.common.dependencies.EeComponentType; +import com.kumuluz.ee.common.dependencies.ServerDef; + +/** + * NoOp Kumuluz server that serves as CDI SE container + * + * @author Yog Sothoth + * + */ +@ServerDef(value = "CDI No-Web server") +@EeComponentDependency(EeComponentType.CDI) +public class SeServer implements KumuluzServer { + private static final Logger log = Logger.getLogger(SeServer.class.getSimpleName()); + + private final SeContainerInitializer initializer = + SeContainerInitializer.newInstance(); + private SeContainer ctx; + private ServerConfig serverConfig; + + /* + * (non-Javadoc) + * @see com.kumuluz.ee.common.KumuluzServer#initServer() + */ + @Override + public void initServer() { + log.info("Initializing SE server"); + try { + this.ctx = initializer.initialize(); + } + catch (UnsupportedOperationException uoe) { + throw new IllegalStateException("Can't start CDI SE within a servlet environment"); + } + + Runtime.getRuntime().addShutdownHook(new Thread(this::stopServer)); + } + + /* + * (non-Javadoc) + * @see com.kumuluz.ee.common.KumuluzServer#startServer() + */ + @Override + public void startServer() { + log.info("Starting SE server"); + + if (ctx.getBeanManager() == null) { + throw new IllegalStateException("CDI Bean Manager isn't initialized"); + } + } + + /* + * (non-Javadoc) + * @see com.kumuluz.ee.common.KumuluzServer#stopServer() + */ + @Override + public void stopServer() { + log.info("Stopping SE server"); + + synchronized (ctx) { + if (ctx.isRunning()) { + ctx.close(); + } + } + } + + /* + * (non-Javadoc) + * @see com.kumuluz.ee.common.KumuluzServer#setServerConfig(com.kumuluz.ee.common.config.ServerConfig) + */ + @Override + public void setServerConfig(ServerConfig serverConfig) { + this.serverConfig = serverConfig; + } + + /* + * (non-Javadoc) + * @see com.kumuluz.ee.common.KumuluzServer#getServerConfig() + */ + @Override + public ServerConfig getServerConfig() { + return serverConfig; + } +} diff --git a/se/server/src/main/resources/META-INF/services/com.kumuluz.ee.common.KumuluzServer b/se/server/src/main/resources/META-INF/services/com.kumuluz.ee.common.KumuluzServer new file mode 100644 index 00000000..7430e2ac --- /dev/null +++ b/se/server/src/main/resources/META-INF/services/com.kumuluz.ee.common.KumuluzServer @@ -0,0 +1 @@ +com.kumuluz.se.server.SeServer \ No newline at end of file From 329e365af5aa70fcaf676ef4a0ef8b1d696a2041 Mon Sep 17 00:00:00 2001 From: Yog Sothoth Date: Tue, 3 Sep 2019 11:59:10 +0300 Subject: [PATCH 2/4] CDI project structure refactoring * Factored out all components unrelated to Weld from cdi-weld to new project cdi-common; * Created new project cdi-weld-se that incapsulates Weld SE support; * Updated server-se with these changes; * Updated parent and BOM pom.xml with new projects. --- bom/pom.xml | 10 ++++ components/cdi/common/pom.xml | 43 ++++++++++++++ .../ee/configuration/cdi/ConfigBundle.java | 0 .../ee/configuration/cdi/ConfigValue.java | 0 .../interceptors/ConfigBundleInterceptor.java | 0 .../producers/ConfigurationUtilProducer.java | 0 .../cdi/producers/EeConfigProducer.java | 0 .../cdi/producers/EeRuntimeProducer.java | 0 .../src/main/resources/META-INF/beans.xml | 5 ++ components/cdi/pom.xml | 2 + components/cdi/weld-se/pom.xml | 27 +++++++++ .../com/kumuluz/ee/cdi/CdiSeComponent.java | 47 +++++++++++++++ .../src/main/resources/META-INF/beans.xml | 5 ++ .../services/com.kumuluz.ee.common.Component | 1 + components/cdi/weld/pom.xml | 29 ++------- pom.xml | 10 ++++ se/server/pom.xml | 59 +++++-------------- .../java/com/kumuluz/se/server/SeServer.java | 54 +++++++++-------- 18 files changed, 199 insertions(+), 93 deletions(-) create mode 100644 components/cdi/common/pom.xml rename components/cdi/{weld => common}/src/main/java/com/kumuluz/ee/configuration/cdi/ConfigBundle.java (100%) rename components/cdi/{weld => common}/src/main/java/com/kumuluz/ee/configuration/cdi/ConfigValue.java (100%) rename components/cdi/{weld => common}/src/main/java/com/kumuluz/ee/configuration/cdi/interceptors/ConfigBundleInterceptor.java (100%) rename components/cdi/{weld => common}/src/main/java/com/kumuluz/ee/configuration/cdi/producers/ConfigurationUtilProducer.java (100%) rename components/cdi/{weld => common}/src/main/java/com/kumuluz/ee/configuration/cdi/producers/EeConfigProducer.java (100%) rename components/cdi/{weld => common}/src/main/java/com/kumuluz/ee/runtime/cdi/producers/EeRuntimeProducer.java (100%) create mode 100644 components/cdi/common/src/main/resources/META-INF/beans.xml create mode 100644 components/cdi/weld-se/pom.xml create mode 100644 components/cdi/weld-se/src/main/java/com/kumuluz/ee/cdi/CdiSeComponent.java create mode 100644 components/cdi/weld-se/src/main/resources/META-INF/beans.xml create mode 100644 components/cdi/weld-se/src/main/resources/META-INF/services/com.kumuluz.ee.common.Component diff --git a/bom/pom.xml b/bom/pom.xml index 0690ca7a..ee4239f1 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -78,11 +78,21 @@ kumuluzee-el-uel ${project.version} + + com.kumuluz.ee + kumuluzee-cdi-common + ${project.version} + com.kumuluz.ee kumuluzee-cdi-weld ${project.version} + + com.kumuluz.ee + kumuluzee-cdi-weld-se + ${project.version} + com.kumuluz.ee kumuluzee-jpa-eclipselink diff --git a/components/cdi/common/pom.xml b/components/cdi/common/pom.xml new file mode 100644 index 00000000..e8cd8b92 --- /dev/null +++ b/components/cdi/common/pom.xml @@ -0,0 +1,43 @@ + + 4.0.0 + + com.kumuluz.ee + kumuluzee-cdi + 3.6.0-SNAPSHOT + + kumuluzee-cdi-common + + KumuluzEE CDI Commons + KumuluzEE generic support for CDI + + + + com.kumuluz.ee + kumuluzee-common + + + + javax.enterprise + cdi-api + provided + + + javax.interceptor + javax.interceptor-api + + + javax.el + javax.el-api + + + org.jboss + jandex + + + org.jboss.logging + jboss-logging + + + \ No newline at end of file diff --git a/components/cdi/weld/src/main/java/com/kumuluz/ee/configuration/cdi/ConfigBundle.java b/components/cdi/common/src/main/java/com/kumuluz/ee/configuration/cdi/ConfigBundle.java similarity index 100% rename from components/cdi/weld/src/main/java/com/kumuluz/ee/configuration/cdi/ConfigBundle.java rename to components/cdi/common/src/main/java/com/kumuluz/ee/configuration/cdi/ConfigBundle.java diff --git a/components/cdi/weld/src/main/java/com/kumuluz/ee/configuration/cdi/ConfigValue.java b/components/cdi/common/src/main/java/com/kumuluz/ee/configuration/cdi/ConfigValue.java similarity index 100% rename from components/cdi/weld/src/main/java/com/kumuluz/ee/configuration/cdi/ConfigValue.java rename to components/cdi/common/src/main/java/com/kumuluz/ee/configuration/cdi/ConfigValue.java diff --git a/components/cdi/weld/src/main/java/com/kumuluz/ee/configuration/cdi/interceptors/ConfigBundleInterceptor.java b/components/cdi/common/src/main/java/com/kumuluz/ee/configuration/cdi/interceptors/ConfigBundleInterceptor.java similarity index 100% rename from components/cdi/weld/src/main/java/com/kumuluz/ee/configuration/cdi/interceptors/ConfigBundleInterceptor.java rename to components/cdi/common/src/main/java/com/kumuluz/ee/configuration/cdi/interceptors/ConfigBundleInterceptor.java diff --git a/components/cdi/weld/src/main/java/com/kumuluz/ee/configuration/cdi/producers/ConfigurationUtilProducer.java b/components/cdi/common/src/main/java/com/kumuluz/ee/configuration/cdi/producers/ConfigurationUtilProducer.java similarity index 100% rename from components/cdi/weld/src/main/java/com/kumuluz/ee/configuration/cdi/producers/ConfigurationUtilProducer.java rename to components/cdi/common/src/main/java/com/kumuluz/ee/configuration/cdi/producers/ConfigurationUtilProducer.java diff --git a/components/cdi/weld/src/main/java/com/kumuluz/ee/configuration/cdi/producers/EeConfigProducer.java b/components/cdi/common/src/main/java/com/kumuluz/ee/configuration/cdi/producers/EeConfigProducer.java similarity index 100% rename from components/cdi/weld/src/main/java/com/kumuluz/ee/configuration/cdi/producers/EeConfigProducer.java rename to components/cdi/common/src/main/java/com/kumuluz/ee/configuration/cdi/producers/EeConfigProducer.java diff --git a/components/cdi/weld/src/main/java/com/kumuluz/ee/runtime/cdi/producers/EeRuntimeProducer.java b/components/cdi/common/src/main/java/com/kumuluz/ee/runtime/cdi/producers/EeRuntimeProducer.java similarity index 100% rename from components/cdi/weld/src/main/java/com/kumuluz/ee/runtime/cdi/producers/EeRuntimeProducer.java rename to components/cdi/common/src/main/java/com/kumuluz/ee/runtime/cdi/producers/EeRuntimeProducer.java diff --git a/components/cdi/common/src/main/resources/META-INF/beans.xml b/components/cdi/common/src/main/resources/META-INF/beans.xml new file mode 100644 index 00000000..de235f6c --- /dev/null +++ b/components/cdi/common/src/main/resources/META-INF/beans.xml @@ -0,0 +1,5 @@ + + + \ No newline at end of file diff --git a/components/cdi/pom.xml b/components/cdi/pom.xml index 64f54e5f..f6dffe0e 100644 --- a/components/cdi/pom.xml +++ b/components/cdi/pom.xml @@ -14,7 +14,9 @@ KumuluzEE CDI component + common weld + weld-se kumuluzee-cdi diff --git a/components/cdi/weld-se/pom.xml b/components/cdi/weld-se/pom.xml new file mode 100644 index 00000000..be1bc45c --- /dev/null +++ b/components/cdi/weld-se/pom.xml @@ -0,0 +1,27 @@ + + 4.0.0 + + com.kumuluz.ee + kumuluzee-cdi + 3.6.0-SNAPSHOT + + kumuluzee-cdi-weld-se + + KumuluzEE CDI Weld SE + KumuluzEE CDI component implemented by Weld for JavaSE environments + + + + com.kumuluz.ee + kumuluzee-cdi-common + + + + org.jboss.weld.se + weld-se-core + ${weld.version} + + + \ No newline at end of file diff --git a/components/cdi/weld-se/src/main/java/com/kumuluz/ee/cdi/CdiSeComponent.java b/components/cdi/weld-se/src/main/java/com/kumuluz/ee/cdi/CdiSeComponent.java new file mode 100644 index 00000000..d6f5fb36 --- /dev/null +++ b/components/cdi/weld-se/src/main/java/com/kumuluz/ee/cdi/CdiSeComponent.java @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2014-2017 Kumuluz and/or its affiliates + * and other contributors as indicated by the @author tags and + * the contributor list. + * + * Licensed under the MIT License (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://opensource.org/licenses/MIT + * + * The software is provided "AS IS", WITHOUT WARRANTY OF ANY KIND, express or + * implied, including but not limited to the warranties of merchantability, + * fitness for a particular purpose and noninfringement. in no event shall the + * authors or copyright holders be liable for any claim, damages or other + * liability, whether in an action of contract, tort or otherwise, arising from, + * out of or in connection with the software or the use or other dealings in the + * software. See the License for the specific language governing permissions and + * limitations under the License. +*/ +package com.kumuluz.ee.cdi; + +import com.kumuluz.ee.common.Component; +import com.kumuluz.ee.common.config.EeConfig; +import com.kumuluz.ee.common.dependencies.EeComponentDef; +import com.kumuluz.ee.common.dependencies.EeComponentType; +import com.kumuluz.ee.common.wrapper.KumuluzServerWrapper; + +import java.util.logging.Logger; + +/** + * @author Yog Sothoth + * @since 3.5.0 + */ +@EeComponentDef(name = "Weld SE", type = EeComponentType.CDI) +public class CdiSeComponent implements Component { + private Logger log = Logger.getLogger(CdiSeComponent.class.getSimpleName()); + + @Override + public void init(KumuluzServerWrapper server, EeConfig eeConfig) { + } + + @Override + public void load() { + log.info("Initiating Weld SE"); + } +} diff --git a/components/cdi/weld-se/src/main/resources/META-INF/beans.xml b/components/cdi/weld-se/src/main/resources/META-INF/beans.xml new file mode 100644 index 00000000..de235f6c --- /dev/null +++ b/components/cdi/weld-se/src/main/resources/META-INF/beans.xml @@ -0,0 +1,5 @@ + + + \ No newline at end of file diff --git a/components/cdi/weld-se/src/main/resources/META-INF/services/com.kumuluz.ee.common.Component b/components/cdi/weld-se/src/main/resources/META-INF/services/com.kumuluz.ee.common.Component new file mode 100644 index 00000000..fe894ec6 --- /dev/null +++ b/components/cdi/weld-se/src/main/resources/META-INF/services/com.kumuluz.ee.common.Component @@ -0,0 +1 @@ +com.kumuluz.ee.cdi.CdiSeComponent \ No newline at end of file diff --git a/components/cdi/weld/pom.xml b/components/cdi/weld/pom.xml index f4ffc68b..7c507bdc 100644 --- a/components/cdi/weld/pom.xml +++ b/components/cdi/weld/pom.xml @@ -15,20 +15,11 @@ kumuluzee-cdi-weld - - com.kumuluz.ee - kumuluzee-common - - - - javax.interceptor - javax.interceptor-api - - - javax.el - javax.el-api - - + + com.kumuluz.ee + kumuluzee-cdi-common + + org.jboss.weld.servlet weld-servlet-core @@ -52,14 +43,6 @@ - - org.jboss - jandex - - - org.jboss.logging - jboss-logging - org.glassfish.jersey.ext.cdi @@ -83,7 +66,5 @@ - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 8301f48a..ca028074 100644 --- a/pom.xml +++ b/pom.xml @@ -184,11 +184,21 @@ ${project.version} pom + + com.kumuluz.ee + kumuluzee-cdi-common + ${project.version} + com.kumuluz.ee kumuluzee-cdi-weld ${project.version} + + com.kumuluz.ee + kumuluzee-cdi-weld-se + ${project.version} + com.kumuluz.ee kumuluzee-jpa diff --git a/se/server/pom.xml b/se/server/pom.xml index 99401767..d0549758 100644 --- a/se/server/pom.xml +++ b/se/server/pom.xml @@ -1,60 +1,33 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 4.0.0 + 4.0.0 kumuluz-server-se - - kumuluz-se - com.kumuluz.ee - 3.6.0-SNAPSHOT - + + kumuluz-se + com.kumuluz.ee + 3.6.0-SNAPSHOT + KumuluzEE SE server KumuluzEE server for Java SE env - - + + com.kumuluz.ee - kumuluzee-cdi-weld - - - org.glassfish.jersey.ext.cdi - jersey-cdi1x - - - org.glassfish.jersey.ext.cdi - jersey-cdi1x-ban-custom-hk2-binding - - - org.jboss.weld.servlet - weld-servlet-core - - - javax.servlet - javax.servlet-api - - - javax.transaction - javax.transaction-api - - + kumuluzee-cdi-weld-se - org.jboss.weld.se - weld-se-core - ${weld.version} - - - com.kumuluz.ee - kumuluzee-loader - true - + com.kumuluz.ee + kumuluzee-loader + true + javax.enterprise cdi-api provided - + \ No newline at end of file diff --git a/se/server/src/main/java/com/kumuluz/se/server/SeServer.java b/se/server/src/main/java/com/kumuluz/se/server/SeServer.java index cf585cf7..6dc74d5c 100644 --- a/se/server/src/main/java/com/kumuluz/se/server/SeServer.java +++ b/se/server/src/main/java/com/kumuluz/se/server/SeServer.java @@ -7,8 +7,6 @@ import com.kumuluz.ee.common.KumuluzServer; import com.kumuluz.ee.common.config.ServerConfig; -import com.kumuluz.ee.common.dependencies.EeComponentDependency; -import com.kumuluz.ee.common.dependencies.EeComponentType; import com.kumuluz.ee.common.dependencies.ServerDef; /** @@ -18,40 +16,39 @@ * */ @ServerDef(value = "CDI No-Web server") -@EeComponentDependency(EeComponentType.CDI) public class SeServer implements KumuluzServer { - private static final Logger log = Logger.getLogger(SeServer.class.getSimpleName()); - - private final SeContainerInitializer initializer = - SeContainerInitializer.newInstance(); - private SeContainer ctx; - private ServerConfig serverConfig; - - /* - * (non-Javadoc) - * @see com.kumuluz.ee.common.KumuluzServer#initServer() - */ + private static final Logger LOG = Logger.getLogger(SeServer.class.getSimpleName()); + + private final SeContainerInitializer initializer = SeContainerInitializer.newInstance(); + private SeContainer ctx; + private ServerConfig serverConfig; + + /* + * (non-Javadoc) + * + * @see com.kumuluz.ee.common.KumuluzServer#initServer() + */ @Override public void initServer() { - log.info("Initializing SE server"); + LOG.info("Initializing SE server"); try { this.ctx = initializer.initialize(); + } catch (UnsupportedOperationException uoe) { + throw new IllegalStateException("Can't start CDI SE within a servlet environment"); } - catch (UnsupportedOperationException uoe) { - throw new IllegalStateException("Can't start CDI SE within a servlet environment"); - } - + Runtime.getRuntime().addShutdownHook(new Thread(this::stopServer)); } /* * (non-Javadoc) + * * @see com.kumuluz.ee.common.KumuluzServer#startServer() */ @Override public void startServer() { - log.info("Starting SE server"); - + LOG.info("Starting SE server"); + if (ctx.getBeanManager() == null) { throw new IllegalStateException("CDI Bean Manager isn't initialized"); } @@ -59,12 +56,13 @@ public void startServer() { /* * (non-Javadoc) + * * @see com.kumuluz.ee.common.KumuluzServer#stopServer() */ @Override public void stopServer() { - log.info("Stopping SE server"); - + LOG.info("Stopping SE server"); + synchronized (ctx) { if (ctx.isRunning()) { ctx.close(); @@ -74,19 +72,23 @@ public void stopServer() { /* * (non-Javadoc) - * @see com.kumuluz.ee.common.KumuluzServer#setServerConfig(com.kumuluz.ee.common.config.ServerConfig) + * + * @see + * com.kumuluz.ee.common.KumuluzServer#setServerConfig(com.kumuluz.ee.common. + * config.ServerConfig) */ @Override public void setServerConfig(ServerConfig serverConfig) { - this.serverConfig = serverConfig; + this.serverConfig = serverConfig; } /* * (non-Javadoc) + * * @see com.kumuluz.ee.common.KumuluzServer#getServerConfig() */ @Override public ServerConfig getServerConfig() { - return serverConfig; + return serverConfig; } } From 7a892d308623d50a0ac91446f7ae4a3f4b95b2ae Mon Sep 17 00:00:00 2001 From: Yog Sothoth Date: Thu, 5 Sep 2019 17:25:36 +0300 Subject: [PATCH 3/4] Further structure refactoring * Merged kumuluz-se-server to kumuluzee-cdi-weld-se and removed the former. * Removed corresponding projects from parent and BOM pom.xml --- bom/pom.xml | 5 --- .../java/com/kumuluz/se/server/SeServer.java | 0 .../com.kumuluz.ee.common.KumuluzServer | 0 pom.xml | 11 ------- se/pom.xml | 22 ------------- se/server/pom.xml | 33 ------------------- 6 files changed, 71 deletions(-) rename {se/server => components/cdi/weld-se}/src/main/java/com/kumuluz/se/server/SeServer.java (100%) rename {se/server => components/cdi/weld-se}/src/main/resources/META-INF/services/com.kumuluz.ee.common.KumuluzServer (100%) delete mode 100644 se/pom.xml delete mode 100644 se/server/pom.xml diff --git a/bom/pom.xml b/bom/pom.xml index ee4239f1..72a39cc6 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -153,11 +153,6 @@ kumuluzee-javamail-ri ${project.version} - - com.kumuluz.ee - kumuluz-server-se - ${project.version} - diff --git a/se/server/src/main/java/com/kumuluz/se/server/SeServer.java b/components/cdi/weld-se/src/main/java/com/kumuluz/se/server/SeServer.java similarity index 100% rename from se/server/src/main/java/com/kumuluz/se/server/SeServer.java rename to components/cdi/weld-se/src/main/java/com/kumuluz/se/server/SeServer.java diff --git a/se/server/src/main/resources/META-INF/services/com.kumuluz.ee.common.KumuluzServer b/components/cdi/weld-se/src/main/resources/META-INF/services/com.kumuluz.ee.common.KumuluzServer similarity index 100% rename from se/server/src/main/resources/META-INF/services/com.kumuluz.ee.common.KumuluzServer rename to components/cdi/weld-se/src/main/resources/META-INF/services/com.kumuluz.ee.common.KumuluzServer diff --git a/pom.xml b/pom.xml index ca028074..8f365160 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,6 @@ common core servlet - se components bom profiles @@ -356,16 +355,6 @@ ${project.version} maven-plugin - - com.kumuluz.ee - kumuluz-se - ${project.version} - - - com.kumuluz.ee - kumuluz-server-se - ${project.version} - diff --git a/se/pom.xml b/se/pom.xml deleted file mode 100644 index b5daee73..00000000 --- a/se/pom.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - kumuluzee - com.kumuluz.ee - 3.6.0-SNAPSHOT - - 4.0.0 - pom - - - server - - - KumuluzEE for SE - KumuluzEE support for running within Java SE env - - kumuluz-se - - \ No newline at end of file diff --git a/se/server/pom.xml b/se/server/pom.xml deleted file mode 100644 index d0549758..00000000 --- a/se/server/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - 4.0.0 - kumuluz-server-se - - kumuluz-se - com.kumuluz.ee - 3.6.0-SNAPSHOT - - - KumuluzEE SE server - KumuluzEE server for Java SE env - - - - com.kumuluz.ee - kumuluzee-cdi-weld-se - - - com.kumuluz.ee - kumuluzee-loader - true - - - javax.enterprise - cdi-api - provided - - - \ No newline at end of file From d0ea65e81bb623b079cb1c78d793e4d3a744f6a8 Mon Sep 17 00:00:00 2001 From: Yog-Sothoth Date: Wed, 27 Nov 2019 13:46:19 +0300 Subject: [PATCH 4/4] Updated parent version --- components/cdi/common/pom.xml | 2 +- components/cdi/weld-se/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/cdi/common/pom.xml b/components/cdi/common/pom.xml index e8cd8b92..bead64cd 100644 --- a/components/cdi/common/pom.xml +++ b/components/cdi/common/pom.xml @@ -5,7 +5,7 @@ com.kumuluz.ee kumuluzee-cdi - 3.6.0-SNAPSHOT + 3.7.0-SNAPSHOT kumuluzee-cdi-common diff --git a/components/cdi/weld-se/pom.xml b/components/cdi/weld-se/pom.xml index be1bc45c..bd1f77ea 100644 --- a/components/cdi/weld-se/pom.xml +++ b/components/cdi/weld-se/pom.xml @@ -5,7 +5,7 @@ com.kumuluz.ee kumuluzee-cdi - 3.6.0-SNAPSHOT + 3.7.0-SNAPSHOT kumuluzee-cdi-weld-se