Skip to content

Commit

Permalink
Upgrade supported WildFly version to 11. (kiegroup#983) (#26)
Browse files Browse the repository at this point in the history
* Upgrade supported WildFly version to 11.

This reverts commit 1d8f778.

* Clean up auth properties files comments

* fixed server logging in GWT SDM
  • Loading branch information
cristianonicolai committed Mar 4, 2018
1 parent 69f2dd1 commit 6d48772
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 47 deletions.
2 changes: 1 addition & 1 deletion jbpm-wb-integration/jbpm-wb-integration-backend/pom.xml
Expand Up @@ -32,7 +32,7 @@

<properties>
<java.module.name>org.jbpm.wb.integration.backend</java.module.name>
<jboss.home>${project.build.directory}/wildfly-${version.org.wildfly.gwt.sdm}</jboss.home>
<jboss.home>${project.build.directory}/wildfly-${version.org.jboss.errai.wildfly}</jboss.home>
</properties>

<dependencies>
Expand Down
7 changes: 7 additions & 0 deletions jbpm-wb-showcase/pom.xml
Expand Up @@ -50,6 +50,13 @@
</exclusions>
</dependency>

<!-- Disables WF logging subsystem in SDM -->
<dependency>
<groupId>org.kie.workbench</groupId>
<artifactId>kie-wb-common-wf-sdm-extensions</artifactId>
<scope>provided</scope>
</dependency>

<!-- dependencies added because of new illegal transitive dependency check -->
<dependency>
<groupId>org.gwtbootstrap3</groupId>
Expand Down
20 changes: 0 additions & 20 deletions jbpm-wb-showcase/src/main/resources/application-roles.properties
@@ -1,23 +1,3 @@
#
# Properties declaration of users roles for the realm 'ApplicationRealm' which is the default realm
# for application services on a new installation.
#
# This includes the following protocols: remote ejb, remote jndi, web, remote jms
#
# Users can be added to this properties file at any time, updates after the server has started
# will be automatically detected.
#
# The format of this file is as follows: -
#
# A utility script is provided which can be executed from the bin folder to add the users: -
# - Linux
# bin/add-user.sh
#
# - Windows
# bin\add-user.bat
#
# The following illustrates how an admin user could be defined.
#
admin=admin,Administrators,kiemgmt,kie-server
salaboy=user,admin,IT,HR,Accounting,kie-server
maciek=user,admin,Translator,kie-server,HR,PM,IT,Accounting
Expand Down
25 changes: 1 addition & 24 deletions jbpm-wb-showcase/src/main/resources/application-users.properties
@@ -1,31 +1,8 @@
#
# Properties declaration of users for the realm 'ApplicationRealm' which is the default realm
# for application services on a new installation.
#
# This includes the following protocols: remote ejb, remote jndi, web, remote jms
#
# Users can be added to this properties file at any time, updates after the server has started
# will be automatically detected.
#
# The format of this realm is as follows: -
#
# A utility script is provided which can be executed from the bin folder to add the users: -
# - Linux
# bin/add-user.sh
#
# - Windows
# bin\add-user.bat
# The following illustrates how an admin user could be defined, this
# is for illustration only and does not correspond to a usable password.
#
admin=207b6e0cc556d7084b5e2db7d822555c
salaboy=d4af256e7007fea2e581d539e05edd1b
maciek=fee266469048d89dabc31f3d11d12336
kris=0bfd0f47d4817f2557c91cbab38bb92d
katy=fd37b5d0b82ce027bfad677a54fbccee
john=afda4373c6021f3f5841cd6c0a027244
jack=984ba30e11dda7b9ed86ba7b73d01481
kieserver=16c6511893651c9b4b57e0c027a96075
#
#$REALM_NAME=ApplicationRealm$ This line is used by the add-user utility to identify the realm name already used in this file.
#
kieserver=16c6511893651c9b4b57e0c027a96075
2 changes: 1 addition & 1 deletion jbpm-wb-showcase/src/main/resources/logback.xml
Expand Up @@ -12,7 +12,7 @@
<logger name="org.kie" level="info" />
<logger name="org.jbpm" level="info" />

<root level="error">
<root level="info">
<appender-ref ref="consoleAppender" />
</root>

Expand Down
Expand Up @@ -35,7 +35,6 @@
WildFly/EAP provider for the user system management, as this webapp does by default. -->
<module name="org.jboss.as.controller-client"/>
<module name="org.jboss.as.domain-management"/>
<module name="org.jboss.sasl"/>
<module name="org.jboss.msc"/>
<module name="org.jboss.dmr"/>
</dependencies>
Expand Down

0 comments on commit 6d48772

Please sign in to comment.