Skip to content

B
bspastoriza19-esi-solutions
Commit 667186e4 authored by Administrator's avatar Administrator
Browse files
Options

Improves the management and configuration of the project 

The project configuration has been simplified by unifying some part of
the mysql and h2 configurations.

In addition, the project has been configured to allow the execution of
the application with the Maven WildFly plugin.
parent 259a6760
Show whitespace changes
Inline Side-by-side
Showing with 744 additions and 179 deletions
README.md
View file @ 667186e4
...@@ -6,7 +6,7 @@ the XCS subject inside the DGSS itinerary. ...@@ -6,7 +6,7 @@ the XCS subject inside the DGSS itinerary.
## Deployment Environment ## Deployment Environment
The environment is based on Maven 3, MySQL 5.5, WildFly 8.2.1 and Eclipse Neon The environment is based on Maven 3, MySQL 5.5, WildFly 8.2.1 and Eclipse Neon
for JEE. for JavaEE.
### Java JDK 8 ### Java JDK 8
Download and install Java JDK 8, preferably the Oracle version (the commands Download and install Java JDK 8, preferably the Oracle version (the commands
...@@ -14,7 +14,8 @@ Download and install Java JDK 8, preferably the Oracle version (the commands ...@@ -14,7 +14,8 @@ Download and install Java JDK 8, preferably the Oracle version (the commands
### Maven ### Maven
Install Maven 3 in your system, if it was not installed (the `mvn` command must Install Maven 3 in your system, if it was not installed (the `mvn` command must
be available). If you are in a Debian-based OS, install the `maven` package (**don't install `maven2` package!!**). be available). If you are in a Debian-based OS, install the `maven` package
(**don't install `maven2` package!!**).
### Git ### Git
First, install Git in your system if it was not installed (the `git` command First, install Git in your system if it was not installed (the `git` command
...@@ -24,9 +25,7 @@ Concretely, we will work with a Git repository inside ...@@ -24,9 +25,7 @@ Concretely, we will work with a Git repository inside
Once Git is installed in your system, clone the project: Once Git is installed in your system, clone the project:
```bash ```bash
git clone http://sing.ei.uvigo.es/dt/gitlab/dgss-1617/xcs-sample.git git clone http://sing.ei.uvigo.es/dt/gitlab/dgss-1617/xcs-sample.git
``` ```
### Eclipse ### Eclipse
...@@ -39,26 +38,37 @@ Select your source code folder (where the `pom.xml` should be placed). ...@@ -39,26 +38,37 @@ 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 Eclipse should then import a parent project (`xcs-sample`) and 6 child projects
(`tests`, `domain`, `service`, `rest`, `jsf` and `ear`). (`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. 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 ### MySQL
In order to run the tests with the `wildfly-embedded-mysql` profile (more about 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 this in the **Sample 2** section) and to run the application, we need a MySQL
server. server.
The server can be installed as usual, but it must contain the `xcs` database and The server can be installed as usual, but it must contain two databases:
the user `xcs` identified by `xcs` should have all privileges on this database. * The `xcs` database for running the application.
You can do this by executing the following commands: * The `xcssampletest` database for testing the appliaction.
In both cases, the user `xcs` identified by `xcs` should have all privileges on
this database. You can do this by executing the following commands:
```sql ```sql
CREATE DATABASE xcs; CREATE DATABASE xcs;
GRANT ALL PRIVILEGES ON xcs TO xcs@localhost IDENTIFIED BY 'xcs'; GRANT ALL PRIVILEGES ON xcs TO xcs@localhost IDENTIFIED BY 'xcs';
FLUSH PRIVILEGES; FLUSH PRIVILEGES;
CREATE DATABASE xcssampletest;
GRANT ALL PRIVILEGES ON xcssampletest TO xcs@localhost IDENTIFIED BY 'xcs';
FLUSH PRIVILEGES;
``` ```
If you want to add some data to this database to run the application, you can If you want to add some data to the `xcs` database to run the application (data
also execute: will be automatically inseted to the `xcssampletest` database during the tests),
```sql you can also execute:
```sql
DROP TABLE IF EXISTS `User`; DROP TABLE IF EXISTS `User`;
CREATE TABLE `User` ( CREATE TABLE `User` (
`role` varchar(5) NOT NULL, `role` varchar(5) NOT NULL,
...@@ -97,17 +107,25 @@ also execute: ...@@ -97,17 +107,25 @@ also execute:
``` ```
You can find the `xcs-sample-mysql.sql` and `xcs-sample-test-mysql.sql` scripts
with these queries stored in the `additional-material/db` project folder.
### Wildfly 8 ### Wildfly 8
Before we can run the project, we need to configure a WildFly server to include Before we can run the project, we need to configure a WildFly server to include
the datasource used by the application and the security configuration. the datasource used by the application and the security configuration.
In the following sections you can find an explanation of how you can configure
the WildFly server by editing the `standalone.xml`. However, the
`additional-material/wildfly` folder includes a `standalone.xml` ready to be
used that you can just copy to your WildFly server (replacing the original
`standalone/configuration/standalone.xml` file).
#### Datasource #### Datasource
There are several ways to add a datasource to a WildFly server. We are going to There are several ways to add a datasource to a WildFly server. We are going to
add a new datasource to the `standalone/configuration/standalone.xml` add a new datasource to the `standalone/configuration/standalone.xml`
configuration file of the server. To do so, you have to edit this file and add configuration file of the server. To do so, you have to edit this file and add
the following content to the `<datasources>` element: the following content to the `<datasources>` element:
```xml ```xml
<datasource jndi-name="java:jboss/datasources/xcs" pool-name="MySQLPool"> <datasource jndi-name="java:jboss/datasources/xcs" pool-name="MySQLPool">
<connection-url>jdbc:mysql://localhost:3306/xcs</connection-url> <connection-url>jdbc:mysql://localhost:3306/xcs</connection-url>
<driver>mysql-connector-java-5.1.21.jar</driver> <driver>mysql-connector-java-5.1.21.jar</driver>
...@@ -119,7 +137,6 @@ the following content to the `<datasources>` element: ...@@ -119,7 +137,6 @@ the following content to the `<datasources>` element:
<password>xcs</password> <password>xcs</password>
</security> </security>
</datasource> </datasource>
``` ```
In addition, you also have to add the MySQL driver to the deployments folder In addition, you also have to add the MySQL driver to the deployments folder
...@@ -132,18 +149,15 @@ All the WildFly security configuration is done in the ...@@ -132,18 +149,15 @@ All the WildFly security configuration is done in the
Inside the `<security-reamls>` element you have to add: Inside the `<security-reamls>` element you have to add:
```xml ```xml
<security-realm name="RemotingRealm"> <security-realm name="RemotingRealm">
<authentication> <authentication>
<jaas name="AppRealmLoopThrough"/> <jaas name="AppRealmLoopThrough"/>
</authentication> </authentication>
</security-realm> </security-realm>
``` ```
And inside the `<security-domains>` element you have to add: And inside the `<security-domains>` element you have to add:
```xml ```xml
<security-domain name="AppRealmLoopThrough" cache-type="default"> <security-domain name="AppRealmLoopThrough" cache-type="default">
<authentication> <authentication>
<login-module code="Client" flag="required"> <login-module code="Client" flag="required">
...@@ -163,7 +177,6 @@ And inside the `<security-domains>` element you have to add: ...@@ -163,7 +177,6 @@ And inside the `<security-domains>` element you have to add:
</login-module> </login-module>
</authentication> </authentication>
</security-domain> </security-domain>
``` ```
#### Deploying the application #### Deploying the application
...@@ -177,7 +190,25 @@ the entire application. To do so, you can copy this file to the ...@@ -177,7 +190,25 @@ the entire application. To do so, you can copy this file to the
Once this is done, you can run the WildFly server executing the Once this is done, you can run the WildFly server executing the
`bin/standalone.sh` script. The application should be running in `bin/standalone.sh` script. The application should be running in
`http://localhost:8080/` `http://localhost:8080/`.
#### Running the application
This project includes the Maven WildFly plugin, which allows the execution of
the project without needing an external WildFly server. To run the application
with the running MySQL database (`xcs`) you just have to go to the `ear` module
and execute the following command:
```bash
mvn wildfly:start wildfly:deploy -P wildfly-embedded-mysql,-wildfly-embedded-h2
```
Once the application is running you can access it in the URL `http://localhost:8080/xcs-sample/jsf`.
To stop the WildFly lauched you can execute the following command:
```bash
mvn wildfly:shutdown
```
## Sample 1: Testing entities ## Sample 1: Testing entities
Using JUnit and Hamcrest, we will see how to test JPA entities or any other Using JUnit and Hamcrest, we will see how to test JPA entities or any other
...@@ -281,17 +312,3 @@ execution, making it very precise. ...@@ -281,17 +312,3 @@ execution, making it very precise.
The JaCoCo plugin is now part or the project, analyzing the test execution. This The JaCoCo plugin is now part or the project, analyzing the test execution. This
plugin generates a HTML report in the `target/site/jacoco` folder. This report plugin generates a HTML report in the `target/site/jacoco` folder. This report
is very useful to check if some part of the code is missing some tests. is very useful to check if some part of the code is missing some tests.
## Wildfly Deployment
The Wildfly Maven plugin is now part of the project. This plugin allows the
automatic deployment of the project in a Wildfly server running with a port
offset of 1000 (this means that the Wildfly uses the 9080 port as the HTTP port
and the 10990 as the management port).
The offset of a Wildfly server can be changed using the system property `jboss.socket.binding.port-offset`. For example, starting Wildfly with the
command:
```bash
$WILDFLY_HOME/bin/standalone.sh -Djboss.socket.binding.port-offset=1000
```
additional-material/db/xcs-sample-mysql.sql 0 → 100644
View file @ 667186e4
CREATE DATABASE IF NOT EXISTS `xcs`;
USE `xcs`;
DROP TABLE IF EXISTS `Pet`;
DROP TABLE IF EXISTS `User`;
--
-- Table structure for table `User`
--
CREATE TABLE `User` (
`role` varchar(5) NOT NULL,
`login` varchar(100) NOT NULL,
`password` varchar(32) NOT NULL,
PRIMARY KEY (`login`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
--
-- Table structure for table `Pet`
--
CREATE TABLE `Pet` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`animal` varchar(4) NOT NULL,
`birth` datetime NOT NULL,
`name` varchar(100) NOT NULL,
`owner` varchar(100) NOT NULL,
PRIMARY KEY (`id`),
KEY `FK_Pet_Owner` (`owner`),
CONSTRAINT `FK_Pet_Owner_login` FOREIGN KEY (`owner`) REFERENCES `User` (`login`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
--
-- User creation
--
GRANT ALL PRIVILEGES ON xcs.* TO xcs@localhost IDENTIFIED BY 'xcs';
FLUSH PRIVILEGES;
--
-- Data for table `User`
--
INSERT INTO `User` (role, login, password) VALUES
('ADMIN','jose','a3f6f4b40b24e2fd61f08923ed452f34'),
('OWNER','ana','22beeae33e9b2657f9610621502cd7a4'),
('OWNER','juan','b4fbb95580592697dc71488a1f19277e'),
('OWNER','lorena','05009e420932c21e5a68f5ef1aadd530'),
('OWNER','pepe','b43b4d046860b2bd945bca2597bf9f07');
--
-- Data for table `Pet`
--
INSERT INTO `Pet` (animal, birth, name, owner) VALUES
('CAT','2000-01-01 01:01:01','Pepecat','pepe'),
('CAT','2000-01-01 01:01:01','Max','juan'),
('DOG','2000-01-01 01:01:01','Juandog','juan'),
('CAT','2000-01-01 01:01:01','Anacat','ana'),
('DOG','2000-01-01 01:01:01','Max','ana'),
('BIRD','2000-01-01 01:01:01','Anabird','ana');
additional-material/db/xcs-sample-test-mysql.sql 0 → 100644
View file @ 667186e4
CREATE DATABASE IF NOT EXISTS `xcssampletest`;
USE `xcssampletest`;
DROP TABLE IF EXISTS `Pet`;
DROP TABLE IF EXISTS `User`;
--
-- Table structure for table `User`
--
CREATE TABLE `User` (
`role` varchar(5) NOT NULL,
`login` varchar(100) NOT NULL,
`password` varchar(32) NOT NULL,
PRIMARY KEY (`login`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
--
-- Table structure for table `Pet`
--
CREATE TABLE `Pet` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`animal` varchar(4) NOT NULL,
`birth` datetime NOT NULL,
`name` varchar(100) NOT NULL,
`owner` varchar(100) NOT NULL,
PRIMARY KEY (`id`),
KEY `FK_Pet_Owner` (`owner`),
CONSTRAINT `FK_Pet_Owner_login` FOREIGN KEY (`owner`) REFERENCES `User` (`login`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
--
-- User creation
--
GRANT ALL PRIVILEGES ON xcssampletest.* TO xcs@localhost IDENTIFIED BY 'xcs';
FLUSH PRIVILEGES;
\ No newline at end of file
additional-material/wildfly/standalone.xml 0 → 100644
View file @ 667186e4
<?xml version="1.0" ?>
<server xmlns="urn:jboss:domain:2.2">
<extensions>
<extension module="org.jboss.as.clustering.infinispan"/>
<extension module="org.jboss.as.connector"/>
<extension module="org.jboss.as.deployment-scanner"/>
<extension module="org.jboss.as.ee"/>
<extension module="org.jboss.as.ejb3"/>
<extension module="org.jboss.as.jaxrs"/>
<extension module="org.jboss.as.jdr"/>
<extension module="org.jboss.as.jmx"/>
<extension module="org.jboss.as.jpa"/>
<extension module="org.jboss.as.jsf"/>
<extension module="org.jboss.as.logging"/>
<extension module="org.jboss.as.mail"/>
<extension module="org.jboss.as.naming"/>
<extension module="org.jboss.as.pojo"/>
<extension module="org.jboss.as.remoting"/>
<extension module="org.jboss.as.sar"/>
<extension module="org.jboss.as.security"/>
<extension module="org.jboss.as.transactions"/>
<extension module="org.jboss.as.webservices"/>
<extension module="org.jboss.as.weld"/>
<extension module="org.wildfly.extension.batch"/>
<extension module="org.wildfly.extension.io"/>
<extension module="org.wildfly.extension.undertow"/>
</extensions>
<management>
<security-realms>
<security-realm name="ManagementRealm">
<authentication>
<local default-user="$local" skip-group-loading="true"/>
<properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
</authentication>
<authorization map-groups-to-roles="false">
<properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
</authorization>
</security-realm>
<security-realm name="ApplicationRealm">
<authentication>
<local default-user="$local" allowed-users="*" skip-group-loading="true"/>
<properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
</authentication>
<authorization>
<properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
</authorization>
</security-realm>
<!-- Custom realm -->
<security-realm name="RemotingRealm">
<authentication>
<jaas name="AppRealmLoopThrough" />
</authentication>
</security-realm>
</security-realms>
<audit-log>
<formatters>
<json-formatter name="json-formatter"/>
</formatters>
<handlers>
<file-handler name="file" formatter="json-formatter" path="audit-log.log" relative-to="jboss.server.data.dir"/>
</handlers>
<logger log-boot="true" log-read-only="false" enabled="false">
<handlers>
<handler name="file"/>
</handlers>
</logger>
</audit-log>
<management-interfaces>
<http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
<socket-binding http="management-http"/>
</http-interface>
</management-interfaces>
<access-control provider="simple">
<role-mapping>
<role name="SuperUser">
<include>
<user name="$local"/>
</include>
</role>
</role-mapping>
</access-control>
</management>
<profile>
<subsystem xmlns="urn:jboss:domain:logging:2.0">
<console-handler name="CONSOLE">
<level name="INFO"/>
<formatter>
<named-formatter name="COLOR-PATTERN"/>
</formatter>
</console-handler>
<periodic-rotating-file-handler name="FILE" autoflush="true">
<formatter>
<named-formatter name="PATTERN"/>
</formatter>
<file relative-to="jboss.server.log.dir" path="server.log"/>
<suffix value=".yyyy-MM-dd"/>
<append value="true"/>
</periodic-rotating-file-handler>
<logger category="com.arjuna">
<level name="WARN"/>
</logger>
<logger category="org.apache.tomcat.util.modeler">
<level name="WARN"/>
</logger>
<logger category="org.jboss.as.config">
<level name="DEBUG"/>
</logger>
<logger category="sun.rmi">
<level name="WARN"/>
</logger>
<logger category="jacorb">
<level name="WARN"/>
</logger>
<logger category="jacorb.config">
<level name="ERROR"/>
</logger>
<root-logger>
<level name="INFO"/>
<handlers>
<handler name="CONSOLE"/>
<handler name="FILE"/>
</handlers>
</root-logger>
<formatter name="PATTERN">
<pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
</formatter>
<formatter name="COLOR-PATTERN">
<pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
</formatter>
</subsystem>
<subsystem xmlns="urn:jboss:domain:batch:1.0">
<job-repository>
<in-memory/>
</job-repository>
<thread-pool>
<max-threads count="10"/>
<keepalive-time time="30" unit="seconds"/>
</thread-pool>
</subsystem>
<subsystem xmlns="urn:jboss:domain:datasources:2.0">
<datasources>
<datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
<connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
<driver>h2</driver>
<security>
<user-name>sa</user-name>
<password>sa</password>
</security>
</datasource>
<datasource jta="true" jndi-name="java:jboss/datasources/xcs" pool-name="xcs-mysql" enabled="true" use-ccm="true">
<connection-url>jdbc:mysql://localhost:3306/xcs</connection-url>
<driver-class>com.mysql.jdbc.Driver</driver-class>
<driver>mysql-connector-java-${mysql.version}.jar</driver>
<security>
<user-name>xcs</user-name>
<password>xcs</password>
</security>
</datasource>
<drivers>
<driver name="h2" module="com.h2database.h2">
<xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
</driver>
</drivers>
</datasources>
</subsystem>
<subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
<deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:ee:2.0">
<spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
<concurrent>
<context-services>
<context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
</context-services>
<managed-thread-factories>
<managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
</managed-thread-factories>
<managed-executor-services>
<managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" core-threads="5" max-threads="25" keepalive-time="5000"/>
</managed-executor-services>
<managed-scheduled-executor-services>
<managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/>
</managed-scheduled-executor-services>
</concurrent>
<default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:ejb3:2.0">
<session-bean>
<stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
<singleton default-access-timeout="5000"/>
</session-bean>
<pools>
<bean-instance-pools>
<strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
<strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
</bean-instance-pools>
</pools>
<caches>
<cache name="simple"/>
<cache name="distributable" passivation-store-ref="infinispan" aliases="passivating clustered"/>
</caches>
<passivation-stores>
<passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
</passivation-stores>
<async thread-pool-name="default"/>
<timer-service thread-pool-name="default" default-data-store="default-file-store">
<data-stores>
<file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
</data-stores>
</timer-service>
<remote connector-ref="http-remoting-connector" thread-pool-name="default"/>
<thread-pools>
<thread-pool name="default">
<max-threads count="10"/>
<keepalive-time time="100" unit="milliseconds"/>
</thread-pool>
</thread-pools>
<default-security-domain value="other"/>
<default-missing-method-permissions-deny-access value="true"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:io:1.1">
<worker name="default"/>
<buffer-pool name="default"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:infinispan:2.0">
<cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
<local-cache name="passivation" batching="true">
<file-store passivation="true" purge="false"/>
</local-cache>
<local-cache name="persistent" batching="true">
<file-store passivation="false" purge="false"/>
</local-cache>
</cache-container>
<cache-container name="ejb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan" aliases="sfsb">
<local-cache name="passivation" batching="true">
<file-store passivation="true" purge="false"/>
</local-cache>
<local-cache name="persistent" batching="true">
<file-store passivation="false" purge="false"/>
</local-cache>
</cache-container>
<cache-container name="hibernate" default-cache="local-query" module="org.hibernate">
<local-cache name="entity">
<transaction mode="NON_XA"/>
<eviction strategy="LRU" max-entries="10000"/>
<expiration max-idle="100000"/>
</local-cache>
<local-cache name="local-query">
<transaction mode="NONE"/>
<eviction strategy="LRU" max-entries="10000"/>
<expiration max-idle="100000"/>
</local-cache>
<local-cache name="timestamps">
<transaction mode="NONE"/>
<eviction strategy="NONE"/>
</local-cache>
</cache-container>
</subsystem>
<subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
<subsystem xmlns="urn:jboss:domain:jca:2.0">
<archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
<bean-validation enabled="true"/>
<default-workmanager>
<short-running-threads>
<core-threads count="50"/>
<queue-length count="50"/>
<max-threads count="50"/>
<keepalive-time time="10" unit="seconds"/>
</short-running-threads>
<long-running-threads>
<core-threads count="50"/>
<queue-length count="50"/>
<max-threads count="50"/>
<keepalive-time time="10" unit="seconds"/>
</long-running-threads>
</default-workmanager>
<cached-connection-manager/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
<subsystem xmlns="urn:jboss:domain:jmx:1.3">
<expose-resolved-model/>
<expose-expression-model/>
<remoting-connector/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:jpa:1.1">
<jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
<subsystem xmlns="urn:jboss:domain:mail:2.0">
<mail-session name="default" jndi-name="java:jboss/mail/Default">
<smtp-server outbound-socket-binding-ref="mail-smtp"/>
</mail-session>
</subsystem>
<subsystem xmlns="urn:jboss:domain:naming:2.0">
<remote-naming/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
<subsystem xmlns="urn:jboss:domain:remoting:2.0">
<endpoint worker="default"/>
<http-connector name="http-remoting-connector" connector-ref="default" security-realm="RemotingRealm"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
<subsystem xmlns="urn:jboss:domain:sar:1.0"/>
<subsystem xmlns="urn:jboss:domain:security:1.2">
<security-domains>
<security-domain name="other" cache-type="default">
<authentication>
<login-module code="Remoting" flag="optional">
<module-option name="password-stacking" value="useFirstPass"/>
</login-module>
<login-module code="RealmDirect" flag="required">
<module-option name="password-stacking" value="useFirstPass"/>
</login-module>
</authentication>
</security-domain>
<security-domain name="jboss-web-policy" cache-type="default">
<authorization>
<policy-module code="Delegating" flag="required"/>
</authorization>
</security-domain>
<security-domain name="jboss-ejb-policy" cache-type="default">
<authorization>
<policy-module code="Delegating" flag="required"/>
</authorization>
</security-domain>
<!-- Custom domain -->
<security-domain name="AppRealmLoopThrough" cache-type="default">
<authentication>
<login-module code="Client" flag="required">
<module-option name="multi-threaded" value="true" />
</login-module>
</authentication>
</security-domain>
<security-domain name="xcs-sample-security-domain">
<authentication>
<login-module code="Database" flag="required">
<module-option name="dsJndiName" value="java:jboss/datasources/xcs" />
<module-option name="principalsQuery"
value="SELECT password FROM User WHERE login=?" />
<module-option name="rolesQuery"
value="SELECT role, 'Roles' FROM User WHERE login=?" />
<module-option name="hashAlgorithm" value="MD5"/>
<module-option name="hashEncoding" value="hex"/>
<module-option name="ignorePasswordCase" value="true"/>
</login-module>
</authentication>
</security-domain>
</security-domains>
</subsystem>
<subsystem xmlns="urn:jboss:domain:transactions:2.0">
<core-environment>
<process-id>
<uuid/>
</process-id>
</core-environment>
<recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:undertow:1.2">
<buffer-cache name="default"/>
<server name="default-server">
<http-listener name="default" socket-binding="http"/>
<host name="default-host" alias="localhost">
<location name="/" handler="welcome-content"/>
<filter-ref name="server-header"/>
<filter-ref name="x-powered-by-header"/>
</host>
</server>
<servlet-container name="default">
<jsp-config/>
<websockets/>
</servlet-container>
<handlers>
<file name="welcome-content" path="${jboss.home.dir}/welcome-content"/>
</handlers>
<filters>
<response-header name="server-header" header-name="Server" header-value="WildFly/8"/>
<response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow/1"/>
</filters>
</subsystem>
<subsystem xmlns="urn:jboss:domain:webservices:1.2">
<wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
<endpoint-config name="Standard-Endpoint-Config"/>
<endpoint-config name="Recording-Endpoint-Config">
<pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
<handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
</pre-handler-chain>
</endpoint-config>
<client-config name="Standard-Client-Config"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:weld:2.0"/>
</profile>
<interfaces>
<interface name="management">
<inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
</interface>
<interface name="public">
<inet-address value="${jboss.bind.address:127.0.0.1}"/>
</interface>
<interface name="unsecure">
<inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
</interface>
</interfaces>
<socket-binding-group name="standard-sockets" default-interface="public" port-offset="0">
<socket-binding name="management-http" interface="management" port="9990"/>
<socket-binding name="management-https" interface="management" port="9993"/>
<socket-binding name="ajp" port="8009"/>
<socket-binding name="http" port="8080"/>
<socket-binding name="https" port="8443"/>
<socket-binding name="txn-recovery-environment" port="4712"/>
<socket-binding name="txn-status-manager" port="4713"/>
<outbound-socket-binding name="mail-smtp">
<remote-destination host="localhost" port="25"/>
</outbound-socket-binding>
</socket-binding-group>
</server>
ear/pom.xml
View file @ 667186e4
...@@ -68,7 +68,6 @@ ...@@ -68,7 +68,6 @@
<artifactId>wildfly-maven-plugin</artifactId> <artifactId>wildfly-maven-plugin</artifactId>
<configuration> <configuration>
<skip>false</skip> <skip>false</skip>
<port>10990</port>
<filename>${project.parent.artifactId}-${project.version}.${project.packaging}</filename> <filename>${project.parent.artifactId}-${project.version}.${project.packaging}</filename>
</configuration> </configuration>
</plugin> </plugin>
......
jsf/src/test/java/es/uvigo/esei/xcs/jsf/JsfIntegrationTestSuite.java 0 → 100644
View file @ 667186e4
package es.uvigo.esei.xcs.jsf;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
@SuiteClasses({
OwnerJsfTest.class
})
@RunWith(Suite.class)
public class JsfIntegrationTestSuite {
}
jsf/src/test/resources-wildfly-embedded-h2/standalone.xml
View file @ 667186e4
...@@ -144,12 +144,12 @@ ...@@ -144,12 +144,12 @@
</subsystem> </subsystem>
<subsystem xmlns="urn:jboss:domain:datasources:2.0"> <subsystem xmlns="urn:jboss:domain:datasources:2.0">
<datasources> <datasources>
<datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true"> <datasource jndi-name="java:jboss/datasources/xcs" pool-name="xcs-sample-h2" enabled="true" use-java-context="true">
<connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url> <connection-url>jdbc:h2:mem:xcssampletest;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
<driver>h2</driver> <driver>h2</driver>
<security> <security>
<user-name>sa</user-name> <user-name>xcs</user-name>
<password>sa</password> <password>xcs</password>
</security> </security>
</datasource> </datasource>
<drivers> <drivers>
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
<managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/> <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/>
</managed-scheduled-executor-services> </managed-scheduled-executor-services>
</concurrent> </concurrent>
<default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/> <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/xcs" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
</subsystem> </subsystem>
<subsystem xmlns="urn:jboss:domain:ejb3:2.0"> <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
<session-bean> <session-bean>
...@@ -331,7 +331,7 @@ ...@@ -331,7 +331,7 @@
<security-domain name="xcs-sample-security-domain"> <security-domain name="xcs-sample-security-domain">
<authentication> <authentication>
<login-module code="Database" flag="required"> <login-module code="Database" flag="required">
<module-option name="dsJndiName" value="java:jboss/datasources/ExampleDS" /> <module-option name="dsJndiName" value="java:jboss/datasources/xcs" />
<module-option name="principalsQuery" <module-option name="principalsQuery"
value="SELECT password FROM User WHERE login=?" /> value="SELECT password FROM User WHERE login=?" />
<module-option name="rolesQuery" <module-option name="rolesQuery"
......
jsf/src/test/resources-wildfly-embedded-h2/test-persistence.xml deleted 100644 → 0
View file @ 259a6760
<?xml version="1.0" encoding="UTF-8"?>
<persistence xmlns="http://xmlns.jcp.org/xml/ns/persistence"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence
http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"
version="2.1">
<persistence-unit name="test">
<jta-data-source>java:jboss/datasources/ExampleDS</jta-data-source>
<exclude-unlisted-classes>false</exclude-unlisted-classes>
<properties>
<property name="hibernate.hbm2ddl.auto" value="create-drop"/>
<property name="hibernate.show_sql" value="true"/>
</properties>
</persistence-unit>
</persistence>
\ No newline at end of file
jsf/src/test/resources-wildfly-embedded-mysql/standalone.xml
View file @ 667186e4
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
</security> </security>
</datasource> </datasource>
<datasource jta="true" jndi-name="java:jboss/datasources/xcs" pool-name="xcs-mysql" enabled="true" use-ccm="true"> <datasource jta="true" jndi-name="java:jboss/datasources/xcs" pool-name="xcs-mysql" enabled="true" use-ccm="true">
<connection-url>jdbc:mysql://localhost:3306/xcs</connection-url> <connection-url>jdbc:mysql://localhost:3306/xcssampletest</connection-url>
<driver-class>com.mysql.jdbc.Driver</driver-class> <driver-class>com.mysql.jdbc.Driver</driver-class>
<driver>mysql-connector-java-${mysql.version}.jar</driver> <driver>mysql-connector-java-${mysql.version}.jar</driver>
<security> <security>
......
jsf/src/test/resources/arquillian.xml
View file @ 667186e4
...@@ -13,14 +13,7 @@ ...@@ -13,14 +13,7 @@
<property name="browser">firefox</property> <property name="browser">firefox</property>
</extension> </extension>
<container qualifier="wildfly-embedded-h2" default="true"> <container qualifier="wildfly-embedded" default="true">
<configuration>
<property name="jbossHome">target/wildfly-${wildfly.version}</property>
<property name="modulePath">target/wildfly-${wildfly.version}/modules</property>
</configuration>
</container>
<container qualifier="wildfly-embedded-mysql">
<configuration> <configuration>
<property name="jbossHome">target/wildfly-${wildfly.version}</property> <property name="jbossHome">target/wildfly-${wildfly.version}</property>
<property name="modulePath">target/wildfly-${wildfly.version}/modules</property> <property name="modulePath">target/wildfly-${wildfly.version}/modules</property>
......
pom.xml
View file @ 667186e4
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>${mysql.connector.java}</version> <version>${mysql.connector.java.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
...@@ -276,6 +276,10 @@ ...@@ -276,6 +276,10 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>${maven.surefire.plugin.version}</version> <version>${maven.surefire.plugin.version}</version>
<configuration>
<!-- By default, only tests suites are executed -->
<includes>**/*TestSuite.java</includes>
</configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
...@@ -416,7 +420,7 @@ ...@@ -416,7 +420,7 @@
<systemPropertyVariables> <systemPropertyVariables>
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager> <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
<wildfly.version>${wildfly.version}</wildfly.version> <wildfly.version>${wildfly.version}</wildfly.version>
<arquillian.launch>wildfly-embedded-h2</arquillian.launch> <arquillian.launch>wildfly-embedded</arquillian.launch>
</systemPropertyVariables> </systemPropertyVariables>
<redirectTestOutputToFile>false</redirectTestOutputToFile> <redirectTestOutputToFile>false</redirectTestOutputToFile>
</configuration> </configuration>
...@@ -470,6 +474,52 @@ ...@@ -470,6 +474,52 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId>
<configuration>
<before-deployment>
<batch/>
<commands>
<command>data-source add --jndi-name=java:jboss/datasources/xcs --name=xcs-sample --jta=true --use-ccm=true --connection-url=jdbc:h2:mem:xcs;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE --driver-name=h2 --user-name=xcs --password=xcs</command>
<command>/core-service=management/security-realm=RemotingRealm:add</command>
<command>/core-service=management/security-realm=RemotingRealm/authentication=jaas:add(name="AppRealmLoopThrough")</command>
<command>/subsystem=remoting/http-connector=http-remoting-connector:write-attribute(name="security-realm", value="RemotingRealm")</command>
<command>/subsystem=security/security-domain=AppRealmLoopThrough:add(cache-type=default)</command>
<command>/subsystem=security/security-domain=AppRealmLoopThrough/authentication=classic:add(login-modules=[{"code"=>"Client", "flag" => "required", "module-options" => [("multi-threaded" => "true")]}])</command>
<command>/subsystem=security/security-domain=xcs-sample-security-domain:add</command>
<command>/subsystem=security/security-domain=xcs-sample-security-domain/authentication=classic:add(login-modules=[{"code"=>"Database", "flag" => "required", "module-options" => [("dsJndiName" => "java:jboss/datasources/xcs"),("principalsQuery" => "SELECT password FROM User WHERE login=?"),("rolesQuery" => "SELECT role, 'Roles' FROM User WHERE login=?"),("hashAlgorithm" => "MD5"),("hashEncoding" => "hex"),("ignorePasswordCase" => "true")]}])</command>
</commands>
</before-deployment>
<after-deployment>
<commands>
<command>:reload</command>
</commands>
</after-deployment>
<add-user>
<users>
<user>
<username>wildfly-admin</username>
<password>xcsadmin</password>
<applicationUser>false</applicationUser>
</user>
<user>
<username>admin</username>
<password>adminpass</password>
<applicationUser>true</applicationUser>
<groups>ADMIN</groups>
</user>
<user>
<username>owner</username>
<password>ownerpass</password>
<applicationUser>true</applicationUser>
<groups>OWNER</groups>
</user>
</users>
</add-user>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>
</profile> </profile>
...@@ -517,7 +567,7 @@ ...@@ -517,7 +567,7 @@
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager> <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
<mysql.version>${mysql.connector.java.version}</mysql.version> <mysql.version>${mysql.connector.java.version}</mysql.version>
<wildfly.version>${wildfly.version}</wildfly.version> <wildfly.version>${wildfly.version}</wildfly.version>
<arquillian.launch>wildfly-embedded-mysql</arquillian.launch> <arquillian.launch>wildfly-embedded</arquillian.launch>
</systemPropertyVariables> </systemPropertyVariables>
<redirectTestOutputToFile>false</redirectTestOutputToFile> <redirectTestOutputToFile>false</redirectTestOutputToFile>
</configuration> </configuration>
...@@ -546,7 +596,7 @@ ...@@ -546,7 +596,7 @@
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
<id>copy-dependencies</id> <id>copy-mysql</id>
<phase>process-test-classes</phase> <phase>process-test-classes</phase>
<goals> <goals>
<goal>copy</goal> <goal>copy</goal>
...@@ -556,14 +606,33 @@ ...@@ -556,14 +606,33 @@
<artifactItem> <artifactItem>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>${mysql.connector.java.version}</version>
<type>jar</type> <type>jar</type>
<overWrite>false</overWrite> <overWrite>false</overWrite>
<outputDirectory>target/wildfly-${wildfly.version}/standalone/deployments</outputDirectory> <outputDirectory>${project.build.directory}/wildfly-${wildfly.version}/standalone/deployments</outputDirectory>
</artifactItem> </artifactItem>
</artifactItems> </artifactItems>
</configuration> </configuration>
</execution> </execution>
<execution>
<id>copy-mysql-for-execution</id>
<phase>process-test-classes</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}</outputDirectory>
<destFileName>mysql-connector-java-${mysql.connector.java.version}.jar</destFileName>
</artifactItem>
</artifactItems>
</configuration>
<!-- This JAR will be used for executing the Wildfly server -->
</execution>
</executions> </executions>
</plugin> </plugin>
...@@ -578,7 +647,7 @@ ...@@ -578,7 +647,7 @@
<goal>copy-resources</goal> <goal>copy-resources</goal>
</goals> </goals>
<configuration> <configuration>
<outputDirectory>target/wildfly-${wildfly.version}/standalone/configuration</outputDirectory> <outputDirectory>${project.build.directory}/wildfly-${wildfly.version}/standalone/configuration</outputDirectory>
<resources> <resources>
<resource> <resource>
<directory>src/test/resources-wildfly-embedded-mysql</directory> <directory>src/test/resources-wildfly-embedded-mysql</directory>
...@@ -589,6 +658,41 @@ ...@@ -589,6 +658,41 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId>
<configuration>
<before-deployment>
<batch/>
<commands>
<command>deploy ${project.build.directory}/mysql-connector-java-${mysql.connector.java.version}.jar</command>
<command>data-source add --jndi-name=java:jboss/datasources/xcs --name=xcs-sample --jta=true --use-ccm=true --connection-url=jdbc:mysql://localhost:3306/xcs --driver-name=mysql-connector-java-${mysql.connector.java.version}.jar --driver-class=com.mysql.jdbc.Driver --user-name=xcs --password=xcs</command>
<command>/core-service=management/security-realm=RemotingRealm:add</command>
<command>/core-service=management/security-realm=RemotingRealm/authentication=jaas:add(name="AppRealmLoopThrough")</command>
<command>/subsystem=remoting/http-connector=http-remoting-connector:write-attribute(name="security-realm", value="RemotingRealm")</command>
<command>/subsystem=security/security-domain=AppRealmLoopThrough:add(cache-type=default)</command>
<command>/subsystem=security/security-domain=AppRealmLoopThrough/authentication=classic:add(login-modules=[{"code"=>"Client", "flag" => "required", "module-options" => [("multi-threaded" => "true")]}])</command>
<command>/subsystem=security/security-domain=xcs-sample-security-domain:add</command>
<command>/subsystem=security/security-domain=xcs-sample-security-domain/authentication=classic:add(login-modules=[{"code"=>"Database", "flag" => "required", "module-options" => [("dsJndiName" => "java:jboss/datasources/xcs"),("principalsQuery" => "SELECT password FROM User WHERE login=?"),("rolesQuery" => "SELECT role, 'Roles' FROM User WHERE login=?"),("hashAlgorithm" => "MD5"),("hashEncoding" => "hex"),("ignorePasswordCase" => "true")]}])</command>
</commands>
</before-deployment>
<after-deployment>
<commands>
<command>:reload</command>
</commands>
</after-deployment>
<add-user>
<users>
<user>
<username>wildfly-admin</username>
<password>xcsadmin</password>
<applicationUser>false</applicationUser>
</user>
</users>
</add-user>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>
</profile> </profile>
......
rest/src/test/java/es/uvigo/esei/xcs/rest/ResourceIntegrationTestSuite.java 0 → 100644
View file @ 667186e4
package es.uvigo.esei.xcs.rest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
@SuiteClasses({
OwnerResourceRestTest.class
})
@RunWith(Suite.class)
public class ResourceIntegrationTestSuite {
}
rest/src/test/java/es/uvigo/esei/xcs/rest/ResourceUnitTestSuite.java 0 → 100644
View file @ 667186e4
package es.uvigo.esei.xcs.rest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
@SuiteClasses({
OwnerResourceUnitTest.class
})
@RunWith(Suite.class)
public class ResourceUnitTestSuite {
}
rest/src/test/resources-wildfly-embedded-h2/standalone.xml
View file @ 667186e4
...@@ -144,12 +144,12 @@ ...@@ -144,12 +144,12 @@
</subsystem> </subsystem>
<subsystem xmlns="urn:jboss:domain:datasources:2.0"> <subsystem xmlns="urn:jboss:domain:datasources:2.0">
<datasources> <datasources>
<datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true"> <datasource jndi-name="java:jboss/datasources/xcs" pool-name="xcs-sample-h2" enabled="true" use-java-context="true">
<connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url> <connection-url>jdbc:h2:mem:xcssampletest;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
<driver>h2</driver> <driver>h2</driver>
<security> <security>
<user-name>sa</user-name> <user-name>xcs</user-name>
<password>sa</password> <password>xcs</password>
</security> </security>
</datasource> </datasource>
<drivers> <drivers>
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
<managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/> <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/>
</managed-scheduled-executor-services> </managed-scheduled-executor-services>
</concurrent> </concurrent>
<default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/> <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/xcs" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
</subsystem> </subsystem>
<subsystem xmlns="urn:jboss:domain:ejb3:2.0"> <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
<session-bean> <session-bean>
...@@ -331,7 +331,7 @@ ...@@ -331,7 +331,7 @@
<security-domain name="xcs-sample-security-domain"> <security-domain name="xcs-sample-security-domain">
<authentication> <authentication>
<login-module code="Database" flag="required"> <login-module code="Database" flag="required">
<module-option name="dsJndiName" value="java:jboss/datasources/ExampleDS" /> <module-option name="dsJndiName" value="java:jboss/datasources/xcs" />
<module-option name="principalsQuery" <module-option name="principalsQuery"
value="SELECT password FROM User WHERE login=?" /> value="SELECT password FROM User WHERE login=?" />
<module-option name="rolesQuery" <module-option name="rolesQuery"
......
rest/src/test/resources-wildfly-embedded-h2/test-persistence.xml deleted 100644 → 0
View file @ 259a6760
<?xml version="1.0" encoding="UTF-8"?>
<persistence xmlns="http://xmlns.jcp.org/xml/ns/persistence"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence
http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"
version="2.1">
<persistence-unit name="test">
<jta-data-source>java:jboss/datasources/ExampleDS</jta-data-source>
<exclude-unlisted-classes>false</exclude-unlisted-classes>
<properties>
<property name="hibernate.hbm2ddl.auto" value="create-drop"/>
<property name="hibernate.show_sql" value="true"/>
</properties>
</persistence-unit>
</persistence>
\ No newline at end of file
rest/src/test/resources-wildfly-embedded-mysql/beans.xml deleted 100644 → 0
View file @ 259a6760
<?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="all">
<alternatives>
<class>es.uvigo.esei.xcs.service.util.security.TestPrincipal</class>
</alternatives>
</beans>
rest/src/test/resources-wildfly-embedded-mysql/standalone.xml
View file @ 667186e4
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
</security> </security>
</datasource> </datasource>
<datasource jta="true" jndi-name="java:jboss/datasources/xcs" pool-name="xcs-mysql" enabled="true" use-ccm="true"> <datasource jta="true" jndi-name="java:jboss/datasources/xcs" pool-name="xcs-mysql" enabled="true" use-ccm="true">
<connection-url>jdbc:mysql://localhost:3306/xcs</connection-url> <connection-url>jdbc:mysql://localhost:3306/xcssampletest</connection-url>
<driver-class>com.mysql.jdbc.Driver</driver-class> <driver-class>com.mysql.jdbc.Driver</driver-class>
<driver>mysql-connector-java-${mysql.version}.jar</driver> <driver>mysql-connector-java-${mysql.version}.jar</driver>
<security> <security>
......
rest/src/test/resources/arquillian.xml
View file @ 667186e4
...@@ -9,14 +9,7 @@ ...@@ -9,14 +9,7 @@
<property name="defaultDataSeedStrategy">CLEAN_INSERT</property> <property name="defaultDataSeedStrategy">CLEAN_INSERT</property>
</extension> </extension>
<container qualifier="wildfly-embedded-h2" default="true"> <container qualifier="wildfly-embedded" default="true">
<configuration>
<property name="jbossHome">target/wildfly-${wildfly.version}</property>
<property name="modulePath">target/wildfly-${wildfly.version}/modules</property>
</configuration>
</container>
<container qualifier="wildfly-embedded-mysql">
<configuration> <configuration>
<property name="jbossHome">target/wildfly-${wildfly.version}</property> <property name="jbossHome">target/wildfly-${wildfly.version}</property>
<property name="modulePath">target/wildfly-${wildfly.version}/modules</property> <property name="modulePath">target/wildfly-${wildfly.version}/modules</property>
......
rest/src/test/resources-wildfly-embedded-h2/beans.xml → rest/src/test/resources/beans.xml
View file @ 667186e4
...@@ -8,4 +8,3 @@ ...@@ -8,4 +8,3 @@
<class>es.uvigo.esei.xcs.service.util.security.TestPrincipal</class> <class>es.uvigo.esei.xcs.service.util.security.TestPrincipal</class>
</alternatives> </alternatives>
</beans> </beans>
service/src/test/resources-wildfly-embedded-h2/beans.xml deleted 100644 → 0
View file @ 259a6760
<?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="all">
<alternatives>
<class>es.uvigo.esei.xcs.service.util.security.TestPrincipal</class>
</alternatives>
</beans>
service/src/test/resources-wildfly-embedded-h2/standalone.xml
View file @ 667186e4
...@@ -144,12 +144,12 @@ ...@@ -144,12 +144,12 @@
</subsystem> </subsystem>
<subsystem xmlns="urn:jboss:domain:datasources:2.0"> <subsystem xmlns="urn:jboss:domain:datasources:2.0">
<datasources> <datasources>
<datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true"> <datasource jndi-name="java:jboss/datasources/xcs" pool-name="xcs-sample-h2" enabled="true" use-java-context="true">
<connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url> <connection-url>jdbc:h2:mem:xcssampletest;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
<driver>h2</driver> <driver>h2</driver>
<security> <security>
<user-name>sa</user-name> <user-name>xcs</user-name>
<password>sa</password> <password>xcs</password>
</security> </security>
</datasource> </datasource>
<drivers> <drivers>
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
<managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/> <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/>
</managed-scheduled-executor-services> </managed-scheduled-executor-services>
</concurrent> </concurrent>
<default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/> <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/xcs" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
</subsystem> </subsystem>
<subsystem xmlns="urn:jboss:domain:ejb3:2.0"> <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
<session-bean> <session-bean>
...@@ -331,7 +331,7 @@ ...@@ -331,7 +331,7 @@
<security-domain name="xcs-sample-security-domain"> <security-domain name="xcs-sample-security-domain">
<authentication> <authentication>
<login-module code="Database" flag="required"> <login-module code="Database" flag="required">
<module-option name="dsJndiName" value="java:jboss/datasources/ExampleDS" /> <module-option name="dsJndiName" value="java:jboss/datasources/xcs" />
<module-option name="principalsQuery" <module-option name="principalsQuery"
value="SELECT password FROM User WHERE login=?" /> value="SELECT password FROM User WHERE login=?" />
<module-option name="rolesQuery" <module-option name="rolesQuery"
......
service/src/test/resources-wildfly-embedded-h2/test-persistence.xml deleted 100644 → 0
View file @ 259a6760
<?xml version="1.0" encoding="UTF-8"?>
<persistence xmlns="http://xmlns.jcp.org/xml/ns/persistence"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence
http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"
version="2.1">
<persistence-unit name="test">
<jta-data-source>java:jboss/datasources/ExampleDS</jta-data-source>
<exclude-unlisted-classes>false</exclude-unlisted-classes>
<properties>
<property name="hibernate.hbm2ddl.auto" value="create-drop"/>
<property name="hibernate.show_sql" value="true"/>
</properties>
</persistence-unit>
</persistence>
\ No newline at end of file
service/src/test/resources-wildfly-embedded-mysql/beans.xml deleted 100644 → 0
View file @ 259a6760
<?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="all">
<alternatives>
<class>es.uvigo.esei.xcs.service.util.security.TestPrincipal</class>
</alternatives>
</beans>
service/src/test/resources-wildfly-embedded-mysql/standalone.xml
View file @ 667186e4
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
</security> </security>
</datasource> </datasource>
<datasource jta="true" jndi-name="java:jboss/datasources/xcs" pool-name="xcs-mysql" enabled="true" use-ccm="true"> <datasource jta="true" jndi-name="java:jboss/datasources/xcs" pool-name="xcs-mysql" enabled="true" use-ccm="true">
<connection-url>jdbc:mysql://localhost:3306/xcs</connection-url> <connection-url>jdbc:mysql://localhost:3306/xcssampletest</connection-url>
<driver-class>com.mysql.jdbc.Driver</driver-class> <driver-class>com.mysql.jdbc.Driver</driver-class>
<driver>mysql-connector-java-${mysql.version}.jar</driver> <driver>mysql-connector-java-${mysql.version}.jar</driver>
<security> <security>
......
service/src/test/resources/arquillian.xml
View file @ 667186e4
...@@ -9,14 +9,7 @@ ...@@ -9,14 +9,7 @@
<property name="defaultDataSeedStrategy">CLEAN_INSERT</property> <property name="defaultDataSeedStrategy">CLEAN_INSERT</property>
</extension> </extension>
<container qualifier="wildfly-embedded-h2" default="true"> <container qualifier="wildfly-embedded" default="true">
<configuration>
<property name="jbossHome">target/wildfly-${wildfly.version}</property>
<property name="modulePath">target/wildfly-${wildfly.version}/modules</property>
</configuration>
</container>
<container qualifier="wildfly-embedded-mysql">
<configuration> <configuration>
<property name="jbossHome">target/wildfly-${wildfly.version}</property> <property name="jbossHome">target/wildfly-${wildfly.version}</property>
<property name="modulePath">target/wildfly-${wildfly.version}/modules</property> <property name="modulePath">target/wildfly-${wildfly.version}/modules</property>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment