Skip to content

Commit cf2c0a2

Browse files
committed
Fix kumuluzee; Add spring-configs; Update README
1 parent 6d8b126 commit cf2c0a2

20 files changed

+287
-130
lines changed

.travis.yml

+8-15
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ script:
103103
- http :8080/kafka/query
104104
- http :8080/kafka/produce
105105
- http :8080/kafka/produce
106-
- stop_any 8080 8080 9092 2181
106+
- stop_any 8080 8080 9092 2181 80
107107
- sudo killall -9 java
108108

109109
# kotlin-swarm
@@ -134,6 +134,7 @@ script:
134134
- http :8080
135135
- http :8080/health
136136
- docker-compose -f docker-compose-maven.yaml down -v >/dev/null 2>&1
137+
- stop_any 8080 80
137138

138139
## kotlin-javaee-cdi-h2
139140
#- cd ${parent}/kotlin-javaee-cdi-h2
@@ -310,17 +311,19 @@ script:
310311
docker-compose down -v >/dev/null 2>&1
311312
done
312313
313-
# tomee-ext.js, glassfish-ext.js
314+
# ext.js
314315
- >
315316
for path in \
316317
tomee-ext.js \
317318
glassfish-ext.js \
319+
jboss-eap-ext.js \
318320
; do
319321
320322
cd ${parent}/${path}
321323
bash mvnw clean package -U -T 4 >/dev/null 2>&1
322324
stop_any 8080
323-
docker-compose up -d --build --force-recreate --remove-orphans >/dev/null 2>&1
325+
docker-compose build --force-rm --pull --no-cache >/dev/null 2>&1
326+
docker-compose up -d --build --remove-orphans >/dev/null 2>&1
324327
sleep 30
325328
http :8080/ui/
326329
http :8080/rest-api/health
@@ -363,14 +366,14 @@ script:
363366
- bash mvnw clean package >/dev/null 2>&1
364367
- java -jar ./target/*.jar &
365368
- wait_for 8000
366-
- sleep 3
369+
- sleep 5
367370
- http :8000/
368371
- http :8000/api/v1/ws
369372
- http :8000/api/v1/ws\?wsdl
370373
- curl -XPOST http://localhost:8000/api/v1/ws --header "content-type:text/xml" -d @./request.xml | xmllint --format -
371374
- stop_any 8000
372375
- docker-compose build --force-rm --no-cache --pull >/dev/null 2>&1
373-
- docker-compose up --force-recreate --remove-orphans &
376+
- docker-compose up --build &
374377
- sleep 35
375378
- curl -sS localhost:8000 | jq
376379
- curl -sS localhost:8000/api/v1/ws | xmllint --format -
@@ -389,16 +392,6 @@ script:
389392
#- http :8080/
390393
#- docker-compose down -v
391394

392-
# jboss-eap-ext.js
393-
- cd ${parent}/jboss-eap-ext.js
394-
- bash mvnw clean package -U -T 4 >/dev/null 2>&1
395-
- docker-compose up -d --build --force-recreate --remove-orphans >/dev/null 2>&1
396-
- stop_any 8080
397-
- sleep 30
398-
- http :8080/ui/
399-
- http :8080/rest-api/health
400-
- docker-compose down -v >/dev/null 2>&1
401-
402395
## kotlin-java-ee-payara-docker
403396
#- cd ${parent}/kotlin-java-ee-payara-docker
404397
#- bash gradlew clean war

jboss-eap-ext.js/pom.xml

+14-1
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,36 @@
22
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
5+
56
<groupId>daggerok</groupId>
67
<artifactId>jboss-eap-ext.js</artifactId>
78
<version>0.0.1</version>
89
<packaging>pom</packaging>
910

1011
<properties>
11-
<maven.compiler.source>1.7</maven.compiler.source>
12+
<failOnMissingWebXml>false</failOnMissingWebXml>
1213
<maven.compiler.target>1.7</maven.compiler.target>
14+
<maven.compiler.source>${maven.compiler.target}</maven.compiler.source>
1315
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1416
</properties>
1517

1618
<build>
19+
<defaultGoal>clean package</defaultGoal>
1720
<finalName>${project.artifactId}</finalName>
1821
</build>
1922

2023
<modules>
2124
<module>rest-api</module>
2225
<module>ui</module>
2326
</modules>
27+
28+
<dependencies>
29+
<dependency>
30+
<groupId>javax</groupId>
31+
<artifactId>javaee-api</artifactId>
32+
<version>7.0</version>
33+
<scope>provided</scope>
34+
</dependency>
35+
</dependencies>
36+
2437
</project>

jboss-eap-ext.js/rest-api/pom.xml

+7-20
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,16 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55

6-
<groupId>daggerok</groupId>
6+
<parent>
7+
<groupId>daggerok</groupId>
8+
<artifactId>jboss-eap-ext.js</artifactId>
9+
<version>0.0.1</version>
10+
</parent>
11+
712
<artifactId>rest-api</artifactId>
8-
<version>0.0.1</version>
913
<packaging>war</packaging>
1014

11-
<properties>
12-
<failOnMissingWebXml>false</failOnMissingWebXml>
13-
<maven.compiler.source>1.7</maven.compiler.source>
14-
<maven.compiler.target>1.7</maven.compiler.target>
15-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16-
</properties>
17-
18-
<build>
19-
<finalName>${project.artifactId}</finalName>
20-
</build>
21-
2215
<dependencies>
23-
<dependency>
24-
<groupId>javax</groupId>
25-
<artifactId>javaee-api</artifactId>
26-
<version>7.0</version>
27-
<scope>provided</scope>
28-
</dependency>
29-
3016
<dependency><!-- Default constructor tu fix: Caused by: org.yaml.snakeyaml.error.YAMLException: No JavaBean properties found in org.glassfish.json.JsonStringImpl -->
3117
<groupId>org.projectlombok</groupId>
3218
<artifactId>lombok</artifactId>
@@ -46,4 +32,5 @@
4632
<version>1.0.4</version>
4733
</dependency>
4834
</dependencies>
35+
4936
</project>

jboss-eap-ext.js/ui/pom.xml

+7-20
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,22 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55

6-
<groupId>daggerok</groupId>
6+
<parent>
7+
<groupId>daggerok</groupId>
8+
<artifactId>jboss-eap-ext.js</artifactId>
9+
<version>0.0.1</version>
10+
</parent>
11+
712
<artifactId>ui</artifactId>
8-
<version>0.0.1</version>
913
<packaging>war</packaging>
1014

11-
<properties>
12-
<failOnMissingWebXml>false</failOnMissingWebXml>
13-
<maven.compiler.source>1.7</maven.compiler.source>
14-
<maven.compiler.target>1.7</maven.compiler.target>
15-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16-
</properties>
17-
18-
<build>
19-
<finalName>${project.artifactId}</finalName>
20-
</build>
21-
2215
<dependencies>
2316
<dependency>
2417
<groupId>org.webjars</groupId>
2518
<artifactId>extjs</artifactId>
2619
<!--<version>6.2.0</version>-->
2720
<version>3.4.0</version>
2821
</dependency>
29-
30-
<dependency>
31-
<groupId>javax</groupId>
32-
<artifactId>javaee-api</artifactId>
33-
<version>7.0</version>
34-
<scope>provided</scope>
35-
</dependency>
3622
</dependencies>
23+
3724
</project>

kumuluzee-mp-2.0-jax-ws/docker-compose.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ version: "2.1"
33
services:
44

55
kumuluzee-mp-2.0-jax-ws:
6-
restart: unless-stopped
76
build: .
87
volumes: ["kumuluzee-mp-2.0-jax-ws-data:/home/appuser"]
98
ports: ["8000:8000"]
109
networks: [backing-services]
10+
#restart: unless-stopped
1111
#mem_limit: 786432000 # container limit: 700Mb (700 * 1024 * 1024)
1212

1313
volumes:

kumuluzee-mp-2.0-jax-ws/pom.xml

+20-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<maven.compiler.target>1.8</maven.compiler.target>
1717
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1818
<kumuluz.version>2.5.2</kumuluz.version>
19+
<kumuluz-logs.version>1.3.0</kumuluz-logs.version>
1920
</properties>
2021

2122
<repositories>
@@ -55,6 +56,13 @@
5556
<type>pom</type>
5657
<scope>import</scope>
5758
</dependency>
59+
<dependency>
60+
<groupId>com.kumuluz.ee.logs</groupId>
61+
<artifactId>kumuluzee-logs</artifactId>
62+
<version>${kumuluz-logs.version}</version>
63+
<type>pom</type>
64+
<scope>import</scope>
65+
</dependency>
5866
</dependencies>
5967
</dependencyManagement>
6068

@@ -63,7 +71,6 @@
6371
<groupId>com.kumuluz.ee</groupId>
6472
<artifactId>kumuluzee-microProfile-1.2</artifactId>
6573
</dependency>
66-
6774
<dependency>
6875
<groupId>com.kumuluz.ee</groupId>
6976
<artifactId>kumuluzee-jax-ws-metro</artifactId>
@@ -75,12 +82,23 @@
7582
<version>1.16.18</version>
7683
<scope>provided</scope>
7784
</dependency>
78-
85+
<!--
7986
<dependency>
8087
<groupId>org.slf4j</groupId>
8188
<artifactId>slf4j-jdk14</artifactId>
8289
<version>1.7.25</version>
8390
</dependency>
91+
<dependency>
92+
<groupId>com.kumuluz.ee.logs</groupId>
93+
<artifactId>kumuluzee-logs-jul</artifactId>
94+
<version>1.3.0</version>
95+
</dependency>
96+
-->
97+
<dependency>
98+
<groupId>com.kumuluz.ee.logs</groupId>
99+
<artifactId>kumuluzee-logs-log4j2</artifactId>
100+
<version>1.3.0</version>
101+
</dependency>
84102
</dependencies>
85103

86104
<build>

spring-faces/README.adoc

+64-4
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,71 @@
22

33
//tag::content[]
44
=== spring-faces
5+
Spring + JSF (Prime Faces)
56

6-
JSF deployed to:
7-
- glassfish 5
8-
- apache tomcat 9
7+
Deployed to:
8+
- Glassfish 5.0
9+
- apache tomcat 9.0.6
910

10-
.build
11+
==== spring / JSF integration
12+
.Faces knows about spring: src/main/webapp/WEB-INF/faces-config.xml
13+
[sources,xml]
14+
----
15+
<?xml version="1.0" encoding="UTF-8"?>
16+
<faces-config version="2.2"
17+
xmlns="http://xmlns.jcp.org/xml/ns/javaee"
18+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
20+
http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd">
21+
22+
<!-- spring -->
23+
<application>
24+
<el-resolver>org.springframework.web.jsf.el.SpringBeanFacesELResolver</el-resolver>
25+
</application>
26+
27+
</faces-config>
28+
----
29+
30+
.Web project knows about spring: src/main/webapp/WEB-INF/web.xml
31+
[sources,xml]
32+
----
33+
<?xml version="1.0" encoding="UTF-8"?>
34+
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
35+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
36+
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
37+
38+
<!-- spring -->
39+
<listener>
40+
<listener-class>com.sun.faces.config.ConfigureListener</listener-class>
41+
</listener>
42+
<listener>
43+
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
44+
</listener>
45+
<listener>
46+
<listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
47+
</listener>
48+
49+
</web-app>
50+
----
51+
52+
.Spring configuration src/main/webapp/WEB-INF/applicationContext.xml
53+
[sources,xml]
54+
----
55+
<?xml version="1.0" encoding="UTF-8"?>
56+
<beans xmlns="http://www.springframework.org/schema/beans"
57+
xmlns:context="http://www.springframework.org/schema/context"
58+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
59+
xsi:schemaLocation="http://www.springframework.org/schema/beans
60+
http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
61+
http://www.springframework.org/schema/context
62+
http://www.springframework.org/schema/context/spring-context-4.3.xsd">
63+
64+
<context:component-scan base-package="daggerok" />
65+
</beans>
66+
----
67+
68+
==== build, run, test
69+
[sources,bash]
1170
----
1271
./mvnw clean package com.dkanejs.maven.plugins:docker-compose-maven-plugin:1.0.1:up
1372
curl localhost:8080/app/
@@ -23,6 +82,7 @@ http :9990/console/index.html
2382
links:
2483

2584
. link:https://musingsinjava.wordpress.com/2014/11/02/enabling-jsf-2-2-and-cdi-1-2-on-tomcat-8/[Tomcat + JSF (weld dependency)]
85+
. link:https://www.youtube.com/playlist?list=PL73qvSDlAVVhIVQX7d36glpQllxCIxEyR[Full Stack Enterprise Web Development with Java, Maven, JSF, PrimeFaces, Spring, Hibernate]
2686

2787
generated by link:https://github.com/daggerok/generator-daggerok-fatjar/[daggerok-fatjar] yeoman generator
2888

spring-faces/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ dependencies {
5959
compile("org.springframework:spring-web:4.3.14.RELEASE")
6060
// javax
6161
compile("javax.inject:javax.inject:1")
62+
providedCompile("javax.servlet:jstl:1.1.2")
6263
providedCompile("javax:javaee-web-api:$javaeeVersion")
6364

6465
compileOnly("org.projectlombok:lombok:$lombokVersion")

spring-faces/pom.xml

+8-2
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,15 @@
5454
<artifactId>all-themes</artifactId>
5555
<version>1.0.10</version>
5656
</dependency>
57-
<!-- Tomcat required this -->
57+
<!-- Tomcat required this: @ManagedBean, @SessionScoped, @RequestScoped -->
5858
<!--
5959
<dependency>
6060
<groupId>org.jboss.weld.servlet</groupId>
6161
<artifactId>weld-servlet</artifactId>
6262
<version>2.4.7.Final</version>
6363
</dependency>
6464
-->
65+
<!-- @Scope("session"), ... -->
6566
<dependency>
6667
<groupId>org.springframework</groupId>
6768
<artifactId>spring-context</artifactId>
@@ -72,12 +73,17 @@
7273
<artifactId>spring-web</artifactId>
7374
<version>${spring.version}</version>
7475
</dependency>
75-
<!-- javax -->
76+
<!-- @Named -->
7677
<dependency>
7778
<groupId>javax.inject</groupId>
7879
<artifactId>javax.inject</artifactId>
7980
<version>1</version>
8081
</dependency>
82+
<dependency>
83+
<groupId>javax.servlet</groupId>
84+
<artifactId>jstl</artifactId>
85+
<version>1.1.2</version>
86+
</dependency>
8187
<dependency>
8288
<groupId>javax</groupId>
8389
<artifactId>javaee-web-api</artifactId>

0 commit comments

Comments
 (0)