Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Java SE support #150

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Java SE support #150

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2b300d0
Java SE support
ikonkere Aug 29, 2019
329e365
CDI project structure refactoring
ikonkere Sep 3, 2019
7a892d3
Further structure refactoring
ikonkere Sep 5, 2019
636248f
Merge pull request #1 from kumuluz/master
ikonkere Nov 27, 2019
d0ea65e
Updated parent version
ikonkere Nov 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,21 @@
<artifactId>kumuluzee-el-uel</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.kumuluz.ee</groupId>
<artifactId>kumuluzee-cdi-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.kumuluz.ee</groupId>
<artifactId>kumuluzee-cdi-weld</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.kumuluz.ee</groupId>
<artifactId>kumuluzee-cdi-weld-se</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.kumuluz.ee</groupId>
<artifactId>kumuluzee-jpa-eclipselink</artifactId>
Expand Down Expand Up @@ -143,6 +153,11 @@
<artifactId>kumuluzee-javamail-ri</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.kumuluz.ee</groupId>
<artifactId>kumuluz-server-se</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
43 changes: 43 additions & 0 deletions components/cdi/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.kumuluz.ee</groupId>
<artifactId>kumuluzee-cdi</artifactId>
<version>3.6.0-SNAPSHOT</version>
</parent>
<artifactId>kumuluzee-cdi-common</artifactId>

<name>KumuluzEE CDI Commons</name>
<description>KumuluzEE generic support for CDI</description>

<dependencies>
<dependency>
<groupId>com.kumuluz.ee</groupId>
<artifactId>kumuluzee-common</artifactId>
</dependency>

<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.interceptor</groupId>
<artifactId>javax.interceptor-api</artifactId>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jandex</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</dependency>
</dependencies>
</project>
0 ...uz/ee/configuration/cdi/ConfigBundle.java → ...uz/ee/configuration/cdi/ConfigBundle.java
View file
Open in desktop
File renamed without changes.
0 ...luz/ee/configuration/cdi/ConfigValue.java → ...luz/ee/configuration/cdi/ConfigValue.java
View file
Open in desktop
File renamed without changes.
0 ...interceptors/ConfigBundleInterceptor.java → ...interceptors/ConfigBundleInterceptor.java
View file
Open in desktop
File renamed without changes.
0 .../producers/ConfigurationUtilProducer.java → .../producers/ConfigurationUtilProducer.java
View file
Open in desktop
File renamed without changes.
0 ...ation/cdi/producers/EeConfigProducer.java → ...ation/cdi/producers/EeConfigProducer.java
View file
Open in desktop
File renamed without changes.
0 ...time/cdi/producers/EeRuntimeProducer.java → ...time/cdi/producers/EeRuntimeProducer.java
View file
Open in desktop
File renamed without changes.
5 changes: 5 additions & 0 deletions components/cdi/common/src/main/resources/META-INF/beans.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
bean-discovery-mode="annotated">
</beans>
2 changes: 2 additions & 0 deletions components/cdi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
<description>KumuluzEE CDI component</description>

<modules>
<module>common</module>
<module>weld</module>
<module>weld-se</module>
</modules>

<artifactId>kumuluzee-cdi</artifactId>
Expand Down
27 changes: 27 additions & 0 deletions components/cdi/weld-se/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.kumuluz.ee</groupId>
<artifactId>kumuluzee-cdi</artifactId>
<version>3.6.0-SNAPSHOT</version>
</parent>
<artifactId>kumuluzee-cdi-weld-se</artifactId>

<name>KumuluzEE CDI Weld SE</name>
<description>KumuluzEE CDI component implemented by Weld for JavaSE environments</description>

<dependencies>
<dependency>
<groupId>com.kumuluz.ee</groupId>
<artifactId>kumuluzee-cdi-common</artifactId>
</dependency>

<dependency>
<groupId>org.jboss.weld.se</groupId>
<artifactId>weld-se-core</artifactId>
<version>${weld.version}</version>
</dependency>
</dependencies>
</project>
47 changes: 47 additions & 0 deletions components/cdi/weld-se/src/main/java/com/kumuluz/ee/cdi/CdiSeComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
}
}
5 changes: 5 additions & 0 deletions components/cdi/weld-se/src/main/resources/META-INF/beans.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
bean-discovery-mode="annotated">
</beans>
1 change: 1 addition & 0 deletions components/cdi/weld-se/src/main/resources/META-INF/services/com.kumuluz.ee.common.Component
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
com.kumuluz.ee.cdi.CdiSeComponent
29 changes: 5 additions & 24 deletions components/cdi/weld/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,11 @@
<artifactId>kumuluzee-cdi-weld</artifactId>

<dependencies>
<dependency>
<groupId>com.kumuluz.ee</groupId>
<artifactId>kumuluzee-common</artifactId>
</dependency>

<dependency>
<groupId>javax.interceptor</groupId>
<artifactId>javax.interceptor-api</artifactId>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
</dependency>

<dependency>
<groupId>com.kumuluz.ee</groupId>
<artifactId>kumuluzee-cdi-common</artifactId>
</dependency>

<dependency>
<groupId>org.jboss.weld.servlet</groupId>
<artifactId>weld-servlet-core</artifactId>
Expand All @@ -52,14 +43,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jandex</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</dependency>

<dependency>
<groupId>org.glassfish.jersey.ext.cdi</groupId>
Expand All @@ -83,7 +66,5 @@
</exclusion>
</exclusions>
</dependency>

</dependencies>

</project>
21 changes: 21 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<module>common</module>
<module>core</module>
<module>servlet</module>
<module>se</module>
<module>components</module>
<module>bom</module>
<module>profiles</module>
Expand Down Expand Up @@ -183,11 +184,21 @@
<version>${project.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>com.kumuluz.ee</groupId>
<artifactId>kumuluzee-cdi-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.kumuluz.ee</groupId>
<artifactId>kumuluzee-cdi-weld</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.kumuluz.ee</groupId>
<artifactId>kumuluzee-cdi-weld-se</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.kumuluz.ee</groupId>
<artifactId>kumuluzee-jpa</artifactId>
Expand Down Expand Up @@ -345,6 +356,16 @@
<version>${project.version}</version>
<type>maven-plugin</type>
</dependency>
<dependency>
<groupId>com.kumuluz.ee</groupId>
<artifactId>kumuluz-se</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.kumuluz.ee</groupId>
<artifactId>kumuluz-server-se</artifactId>
<version>${project.version}</version>
</dependency>

<!-- Java EE specification dependencies-->
<dependency>
Expand Down
22 changes: 22 additions & 0 deletions se/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
<parent>
<artifactId>kumuluzee</artifactId>
<groupId>com.kumuluz.ee</groupId>
<version>3.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>

<modules>
<module>server</module>
</modules>

<name>KumuluzEE for SE</name>
<description>KumuluzEE support for running within Java SE env</description>

<artifactId>kumuluz-se</artifactId>

</project>
33 changes: 33 additions & 0 deletions se/server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">

<modelVersion>4.0.0</modelVersion>
<artifactId>kumuluz-server-se</artifactId>
ikonkere marked this conversation as resolved.
Show resolved Hide resolved
<parent>
<artifactId>kumuluz-se</artifactId>
<groupId>com.kumuluz.ee</groupId>
<version>3.6.0-SNAPSHOT</version>
</parent>

<name>KumuluzEE SE server</name>
<description>KumuluzEE server for Java SE env</description>

<dependencies>
<dependency>
ikonkere marked this conversation as resolved.
Show resolved Hide resolved
<groupId>com.kumuluz.ee</groupId>
ikonkere marked this conversation as resolved.
Show resolved Hide resolved
<artifactId>kumuluzee-cdi-weld-se</artifactId>
</dependency>
<dependency>
<groupId>com.kumuluz.ee</groupId>
ikonkere marked this conversation as resolved.
Show resolved Hide resolved
<artifactId>kumuluzee-loader</artifactId>
<optional>true</optional>
</dependency>
<dependency>
ikonkere marked this conversation as resolved.
Show resolved Hide resolved
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
Loading