Skip to content

Commit e2f3a49

Browse files
daggerokdaggerok
committed
fix Dockerfile dublecates for all ears
1 parent 1efbeff commit e2f3a49

File tree

66 files changed

+1130
-77
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+1130
-77
lines changed

‎.travis.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@ script:
8484
- http :8080/client/get\?key=EJB
8585
- http :8080/client/set\?key=EJB\&value=some-value
8686
- http :8080/client/get\?key=EJB
87-
- http post :8080/client/reset/counter/incr
88-
- http post :8080/client/reset/counter/increment
89-
- http post :8080/client/reset/counter/decr
90-
- http post :8080/client/reset/counter/incr
87+
- http post :8080/client/counter/incr
88+
- http post :8080/client/counter/increment
89+
- http post :8080/client/counter/decr
90+
- http post :8080/client/counter/incr
9191
- http :8080/client/get\?key=EJB
9292
- http post :8080/client/reset
9393
- docker-compose down -v

‎ear/Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
FROM daggerok/jboss-eap-6.4:alpine
22
RUN echo "JAVA_OPTS=\"\$JAVA_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 \"" >> ${JBOSS_HOME}/bin/standalone.conf
33
EXPOSE 5005 8081
4-
ADD ./ear/target/*.ear ./client/target/*.war ${JBOSS_HOME}/standalone/deployments/
5-
4+
ADD ./ear/target/*.ear ${JBOSS_HOME}/standalone/deployments/

‎ear/modules/module-1/src/main/webapp/WEB-INF/web.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<!-- Java EE 6: http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/index.html#6 -->
88
<!-- Java EE 7: http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/index.html#7 -->
99
<!-- Java EE 8: http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/index.html#8 -->
10-
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
11-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
11+
xmlns="http://xmlns.jcp.org/xml/ns/javaee"
1212
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
1313
version="3.1">
1414
</web-app>

‎ear/modules/module-2/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
<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/maven-v4_0_0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55

‎ear/modules/module-2/src/main/webapp/WEB-INF/web.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<!-- Java EE 6: http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/index.html#6 -->
88
<!-- Java EE 7: http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/index.html#7 -->
99
<!-- Java EE 8: http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/index.html#8 -->
10-
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
11-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
11+
xmlns="http://xmlns.jcp.org/xml/ns/javaee"
1212
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
1313
version="3.1">
1414
<welcome-file-list>

‎ear/modules/module-3/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
<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/maven-v4_0_0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55

‎ear/modules/module-3/src/main/webapp/WEB-INF/web.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<!-- Java EE 6: http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/index.html#6 -->
88
<!-- Java EE 7: http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/index.html#7 -->
99
<!-- Java EE 8: http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/index.html#8 -->
10-
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
11-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
11+
xmlns="http://xmlns.jcp.org/xml/ns/javaee"
1212
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
1313
version="3.1">
1414
<welcome-file-list>

‎ear/modules/module-4/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
<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/maven-v4_0_0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55

‎ear/modules/module-4/src/main/java/daggerok/JNDIContextServlet.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33
import lombok.SneakyThrows;
44
import lombok.val;
55

6-
import javax.naming.Context;
76
import javax.naming.InitialContext;
8-
import javax.naming.NameClassPair;
9-
import javax.naming.NamingEnumeration;
107
import javax.servlet.ServletException;
118
import javax.servlet.annotation.WebServlet;
129
import javax.servlet.http.HttpServlet;

‎ear/modules/module-4/src/main/webapp/WEB-INF/web.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<!-- Java EE 6: http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/index.html#6 -->
88
<!-- Java EE 7: http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/index.html#7 -->
99
<!-- Java EE 8: http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/index.html#8 -->
10-
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
11-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
11+
xmlns="http://xmlns.jcp.org/xml/ns/javaee"
1212
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
1313
version="3.1">
1414
<welcome-file-list>

0 commit comments

Comments
 (0)