From 6840294c5d2d0cbf867954c7ed381d8e14156f81 Mon Sep 17 00:00:00 2001 From: Miguel Reboiro-Jato Date: Wed, 28 Sep 2016 13:18:43 +0200 Subject: [PATCH] Updates the project for the 16/17 course The README.md has been update to reference the new course and the new Eclipse version. In addition, the general pom.xml file has been updated to include the newer versions of the dependencies, and the ear/pom.xml has been modified to include more project information in the generated EAR. On the other hand, the testing mysql-ds.xml have been removed and the standalone.xml testing files have been updated to include the datasource data. --- README.md | 19 ++++------- ear/pom.xml | 4 +++ .../mysql-ds.xml | 17 ---------- .../standalone.xml | 9 +++++ jsf/src/test/resources/arquillian.xml | 4 +++ pom.xml | 34 ++++++++----------- .../mysql-ds.xml | 17 ---------- .../standalone.xml | 9 +++++ .../mysql-ds.xml | 17 ---------- .../standalone.xml | 9 +++++ 10 files changed, 56 insertions(+), 83 deletions(-) delete mode 100644 jsf/src/test/resources-wildfly-embedded-mysql/mysql-ds.xml delete mode 100644 rest/src/test/resources-wildfly-embedded-mysql/mysql-ds.xml delete mode 100644 service/src/test/resources-wildfly-embedded-mysql/mysql-ds.xml diff --git a/README.md b/README.md index 69bdc9b..38d11aa 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ the XCS subject inside the DGSS itinerary. ## Deployment Environment -The environment is based on Maven 3, MySQL 5.5, WildFly 8.2.1 and Eclipse Mars +The environment is based on Maven 3, MySQL 5.5, WildFly 8.2.1 and Eclipse Neon for JEE. ### Java JDK 8 @@ -14,7 +14,7 @@ Download and install Java JDK 8, preferably the Oracle version (the commands ### Maven Install Maven 3 in your system, if it was not installed (the `mvn` command must -be available) +be available). If you are in a Debian-based OS, install the `maven` package (**don't install `maven2` package!!**). ### Git First, install git in your system if it was not installed (the `git` command @@ -22,25 +22,20 @@ must be available). We will work with Git to get updates of these sample. Concretely, we will work with a Git repository inside [our Gitlab server](http://sing.ei.uvigo.es/dt/gitlab). - Git URL: `http://sing.ei.uvigo.es/dt/gitlab/dgss/xcs-sample.git` + Git URL: `http://sing.ei.uvigo.es/dt/gitlab/dgss-1617/xcs-sample.git` ### Eclipse -You can use any other IDE, such as IntelliJ IDEA or NetBeans, as long as they -are compatible with Maven projects. -Before continue, you have **to patch Eclipse Mars**, concretely the m2e-wtp -plugin. Go to `Help -> Install New Software`. Work with repository located -at `http://download.eclipse.org/m2e-wtp/snapshots/mars/` and then select and -install "Maven Integration for WTP". Restart Eclipse. - -Open Eclipse Mars JEE and import your Maven project with +Open Eclipse Neon for Java EE and import your Maven project with `File -> Import -> Maven -> Existing Maven Projects` -Select your source code folder (where the `pom.xml` should be placed) +Select your source code folder (where the `pom.xml` should be placed). Eclipse should then import a parent project (`xcs-sample`) and 6 child projects (`tests`, `domain`, `service`, `rest`, `jsf` and `ear`). +If you want, you can use any other IDE, such as IntelliJ IDEA or NetBeans, as long as they are compatible with Maven projects, but we recommend using Eclipse Neon for Java EE. + ### MySQL In order to run the tests with the `wildfly-embedded-mysql` profile (more about this in the **Sample 2** section) and to run the application, we need a MySQL diff --git a/ear/pom.xml b/ear/pom.xml index 6d5a55a..b885397 100644 --- a/ear/pom.xml +++ b/ear/pom.xml @@ -43,6 +43,10 @@ org.apache.maven.plugins maven-ear-plugin + xcs-sample + XCS Sample + XCS Sample + ${project.parent.artifactId}-${project.version} lib/ true diff --git a/jsf/src/test/resources-wildfly-embedded-mysql/mysql-ds.xml b/jsf/src/test/resources-wildfly-embedded-mysql/mysql-ds.xml deleted file mode 100644 index e35c79b..0000000 --- a/jsf/src/test/resources-wildfly-embedded-mysql/mysql-ds.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - jdbc:mysql://localhost:3306/xcs - mysql-connector-java-${mysql.version}.jar - - 30 - - - xcs - xcs - - - - \ No newline at end of file diff --git a/jsf/src/test/resources-wildfly-embedded-mysql/standalone.xml b/jsf/src/test/resources-wildfly-embedded-mysql/standalone.xml index 28088fd..048d22f 100644 --- a/jsf/src/test/resources-wildfly-embedded-mysql/standalone.xml +++ b/jsf/src/test/resources-wildfly-embedded-mysql/standalone.xml @@ -152,6 +152,15 @@ sa + + jdbc:mysql://localhost:3306/xcs + com.mysql.jdbc.Driver + mysql-connector-java-${mysql.version}.jar + + xcs + xcs + + org.h2.jdbcx.JdbcDataSource diff --git a/jsf/src/test/resources/arquillian.xml b/jsf/src/test/resources/arquillian.xml index dd1edb8..964f078 100644 --- a/jsf/src/test/resources/arquillian.xml +++ b/jsf/src/test/resources/arquillian.xml @@ -8,6 +8,10 @@ CLEAN_INSERT + + + firefox + diff --git a/pom.xml b/pom.xml index 034c1c6..50cbb0e 100644 --- a/pom.xml +++ b/pom.xml @@ -40,9 +40,9 @@ 7.0 - 1.1.9.Final + 1.1.11.Final 1.0.0.Alpha3 - 2.48.2 + 2.53.1 8.2.1.Final @@ -52,24 +52,24 @@ 4.12 2.0.0.0 3.4 - 0.7.4.201502262128 + 0.7.7.201606060606 1.0.0.Alpha8 1.0.0.Alpha7 1.5.10 5.1.21 - 3.0.13.Final - 2.1.0.Alpha3 + 3.0.19.Final + 2.1.0.Final - 1.1.0.Alpha4 - 3.3 - 2.4 - 2.10.3 + 1.1.0.Alpha11 + 3.5.1 + 3.0.1 + 2.10.4 2.8.2 2.10 - 2.18.1 - 2.7 - 2.10.1 + 2.19.1 + 3.0.1 + 2.10.1 @@ -295,7 +295,7 @@ org.apache.maven.plugins maven-ear-plugin - ${maven.ear.plugin} + ${maven.ear.plugin.version} org.jacoco @@ -578,17 +578,11 @@ copy-resources - target/wildfly-${wildfly.version}/standalone + target/wildfly-${wildfly.version}/standalone/configuration - - src/test/resources-wildfly-embedded-mysql - mysql-ds.xml - deployments - src/test/resources-wildfly-embedded-mysql standalone.xml - configuration diff --git a/rest/src/test/resources-wildfly-embedded-mysql/mysql-ds.xml b/rest/src/test/resources-wildfly-embedded-mysql/mysql-ds.xml deleted file mode 100644 index e35c79b..0000000 --- a/rest/src/test/resources-wildfly-embedded-mysql/mysql-ds.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - jdbc:mysql://localhost:3306/xcs - mysql-connector-java-${mysql.version}.jar - - 30 - - - xcs - xcs - - - - \ No newline at end of file diff --git a/rest/src/test/resources-wildfly-embedded-mysql/standalone.xml b/rest/src/test/resources-wildfly-embedded-mysql/standalone.xml index 28088fd..048d22f 100644 --- a/rest/src/test/resources-wildfly-embedded-mysql/standalone.xml +++ b/rest/src/test/resources-wildfly-embedded-mysql/standalone.xml @@ -152,6 +152,15 @@ sa + + jdbc:mysql://localhost:3306/xcs + com.mysql.jdbc.Driver + mysql-connector-java-${mysql.version}.jar + + xcs + xcs + + org.h2.jdbcx.JdbcDataSource diff --git a/service/src/test/resources-wildfly-embedded-mysql/mysql-ds.xml b/service/src/test/resources-wildfly-embedded-mysql/mysql-ds.xml deleted file mode 100644 index e35c79b..0000000 --- a/service/src/test/resources-wildfly-embedded-mysql/mysql-ds.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - jdbc:mysql://localhost:3306/xcs - mysql-connector-java-${mysql.version}.jar - - 30 - - - xcs - xcs - - - - \ No newline at end of file diff --git a/service/src/test/resources-wildfly-embedded-mysql/standalone.xml b/service/src/test/resources-wildfly-embedded-mysql/standalone.xml index 28088fd..048d22f 100644 --- a/service/src/test/resources-wildfly-embedded-mysql/standalone.xml +++ b/service/src/test/resources-wildfly-embedded-mysql/standalone.xml @@ -152,6 +152,15 @@ sa + + jdbc:mysql://localhost:3306/xcs + com.mysql.jdbc.Driver + mysql-connector-java-${mysql.version}.jar + + xcs + xcs + + org.h2.jdbcx.JdbcDataSource -- 2.18.1