Skip to content

Commit f907848

Browse files
radcortezradcortez
committed
Merge branch 'release/3.9'
2 parents 0d47f7e + 764b3d2 commit f907848

3 files changed

Lines changed: 37 additions & 8 deletions

File tree

‎README.md‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ few instructions here: [Codenvy setup to demo applications using Docker: Java EE
3030
* Copy the file javaee7-angular.war from target directory to your Wildfly installation folder
3131
`standalone/deployments`
3232

33-
* You can also deploy the app, using Maven Wildfly Plugin with the following command: `mvn wildfly:deploy`.
34-
You need to have Wildfly running.
33+
* You can also deploy the app using the Maven Wildfly Plugin with the following command: `mvn wildfly:deploy`. You need to have Wildfly running.
3534

3635
* Start Wildfly and go to http://localhost:8080/javaee7-angular/ (http://localhost:8080/javaee7-angular/)
3736

@@ -51,9 +50,15 @@ few instructions here: [Codenvy setup to demo applications using Docker: Java EE
5150

5251
* Go to http://localhost:8080/javaee7-angular/ (http://localhost:8080/javaee7-angular/)
5352

54-
### Deploy in Embedded-Glassfish 3.1 ###
53+
### Deploy in Embedded-Glassfish 4.1 ###
5554

56-
* You can also deploy the app, using Maven Embedded-Glassfish Plugin with the following command: `mvn embedded-glassfish:run`
55+
* Just run `mvn embedded-glassfish:run`
56+
57+
* Go to http://localhost:8080/javaee7-angular/ (http://localhost:8080/javaee7-angular/)
58+
59+
### Run with TomEE ###
60+
61+
* Just run `mvn tomee:run`
5762

5863
* Go to http://localhost:8080/javaee7-angular/ (http://localhost:8080/javaee7-angular/)
5964

‎pom.xml‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<groupId>com.cortez.samples</groupId>
55
<artifactId>javaee7-angular</artifactId>
6-
<version>3.8</version>
6+
<version>3.9</version>
77
<packaging>war</packaging>
88

99
<name>javaee7-angular</name>
@@ -131,6 +131,30 @@
131131
</execution>
132132
</executions>
133133
</plugin>
134+
135+
<plugin>
136+
<groupId>org.apache.tomee.maven</groupId>
137+
<artifactId>tomee-maven-plugin</artifactId>
138+
<version>7.0.1</version>
139+
<configuration>
140+
<libs>
141+
<lib>remove:openjpa-</lib>
142+
<lib>org.hibernate:hibernate-core:5.2.0.Final</lib>
143+
<lib>org.hibernate.common:hibernate-commons-annotations:5.0.1.Final</lib>
144+
<lib>org.jboss.logging:jboss-logging:3.3.0.Final</lib>
145+
<lib>dom4j:dom4j:1.6.1</lib>
146+
<lib>org.javassist:javassist:3.18.1-GA</lib>
147+
<lib>com.fasterxml:classmate:1.1.0</lib>
148+
<lib>antlr:antlr:2.7.7</lib>
149+
</libs>
150+
<systemVariables>
151+
<javax.persistence.provider>
152+
org.hibernate.jpa.HibernatePersistenceProvider
153+
</javax.persistence.provider>
154+
</systemVariables>
155+
<warFile>target/javaee7-angular.war</warFile>
156+
</configuration>
157+
</plugin>
134158
</plugins>
135159
</build>
136160

‎src/main/resources/sql/load.sql‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (1, 'Uzumaki Naruto', 'Konoha', 'http://img1.wikia.nocookie.net/__cb20140523045537/naruto/images/thumb/3/36/Naruto_Uzumaki.png/300px-Naruto_Uzumaki.png')
22
INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (2, 'Hatake Kakashi', 'Konoha', 'http://img1.wikia.nocookie.net/__cb20140616090940/naruto/images/thumb/b/b3/KakashiHatake.png/300px-KakashiHatake.png')
33
INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (3, 'Haruno Sakura', 'Konoha', 'http://vignette2.wikia.nocookie.net/naruto/images/b/ba/Sakurap2.png/revision/latest/scale-to-width-down/300?cb=20150825101949')
4-
INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (4, 'Uchiha Sasuke', 'Missing-nin', 'http://img1.wikia.nocookie.net/__cb20150110232732/naruto/images/c/c3/Sasuke_headshot.png')
4+
INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (4, 'Uchiha Sasuke', 'Missing-nin', 'http://vignette1.wikia.nocookie.net/naruto/images/9/98/Sasuke_p2_headshot.png/revision/latest?cb=20150110232732')
55
INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (5, 'Gaara', 'Sunagakure', 'http://img3.wikia.nocookie.net/__cb20130910220958/naruto/images/thumb/0/0f/Gaara_Part_II.png/300px-Gaara_Part_II.png')
66
INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (6, 'Killer Bee', 'Kumogakure', 'http://vignette3.wikia.nocookie.net/naruto/images/6/63/Killer_B.png/revision/latest/scale-to-width-down/300?cb=20150917075056')
77
INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (7, 'Jiraya', 'Konoha', 'http://img2.wikia.nocookie.net/__cb20120925123905/naruto/images/thumb/2/21/Profile_Jiraiya.PNG/300px-Profile_Jiraiya.PNG')
88
INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (8, 'Namikaze Minato', 'Konoha', 'http://img4.wikia.nocookie.net/__cb20140209115534/naruto/images/thumb/1/1f/Minato_Namikaze.PNG/300px-Minato_Namikaze.PNG')
9-
INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (9, 'Uchiha Madara', 'Missing-nin', 'http://img2.wikia.nocookie.net/__cb20140724225045/naruto/images/thumb/c/cf/Madara_newshot.png/300px-Madara_newshot.png')
9+
INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (9, 'Uchiha Madara', 'Missing-nin', 'http://vignette3.wikia.nocookie.net/naruto/images/0/0c/Madara_img2.png/revision/latest?cb=20160115141947')
1010
INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (10, 'Senju Hashirama', 'Konoha', 'http://img2.wikia.nocookie.net/__cb20120915132454/naruto/images/thumb/7/7e/Hashirama_Senju.png/300px-Hashirama_Senju.png')
1111
INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (11, 'Might Guy', 'Konoha', 'http://img1.wikia.nocookie.net/__cb20150401084456/naruto/images/3/31/Might_Guy.png')
1212
INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (12, 'Hyuga Neji', 'Konoha', 'http://img1.wikia.nocookie.net/__cb20150123214015/naruto/images/6/63/Neji_Part_2.png')
1313
INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (13, 'Rock Lee', 'Konoha', 'http://img1.wikia.nocookie.net/__cb20131029112352/naruto/images/thumb/7/7d/Lee_timeskip.png/300px-Lee_timeskip.png')
14-
INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (14, 'Uchiha Obito', 'Missing-nin', 'http://img1.wikia.nocookie.net/__cb20140616090247/naruto/images/thumb/a/a0/Obito_Uchiha2.png/300px-Obito_Uchiha2.png')
14+
INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (14, 'Uchiha Obito', 'Missing-nin', 'http://vignette4.wikia.nocookie.net/naruto/images/4/4a/Obito_Uchiha.png/revision/latest?cb=20160312115221')
1515
INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (15, 'Kurama', 'Tailed Beast', 'http://img1.wikia.nocookie.net/__cb20140818171718/naruto/images/thumb/7/7b/Kurama2.png/300px-Kurama2.png')
1616
INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (16, 'Uzumaki Kushina', 'Konoha', 'http://img4.wikia.nocookie.net/__cb20121006054451/naruto/images/thumb/4/4d/Kushina_2.png/300px-Kushina_2.png')
1717
INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (17, 'Nara Shikamaru', 'Konoha', 'http://img1.wikia.nocookie.net/__cb20130917013425/naruto/images/thumb/9/9a/Shikamaru_Nara.png/300px-Shikamaru_Nara.png')

0 commit comments

Comments
 (0)