======== assembly/assembly.xml

17c17
<         <include>org.wildfly:wildfly-dist:tar.gz:${version.wildfly9}</include>
---
>         <include>org.wildfly:wildfly-dist:tar.gz:${version.wildfly}</include>
50c50
<       <outputDirectory>server/wildfly-${version.wildfly9}/modules</outputDirectory>
---
>       <outputDirectory>server/wildfly-${version.wildfly}/modules</outputDirectory>
79c79
<       <outputDirectory>server/wildfly-${version.wildfly9}/standalone/configuration</outputDirectory>
---
>       <outputDirectory>server/wildfly-${version.wildfly}/standalone/configuration</outputDirectory>
83c83
<       <outputDirectory>server/wildfly-${version.wildfly9}/standalone/configuration</outputDirectory>
---
>       <outputDirectory>server/wildfly-${version.wildfly}/standalone/configuration</outputDirectory>
87c87
<       <outputDirectory>server/wildfly-${version.wildfly9}/bin/</outputDirectory>
---
>       <outputDirectory>server/wildfly-${version.wildfly}/bin/</outputDirectory>
91c91
<       <outputDirectory>server/wildfly-${version.wildfly9}/bin/</outputDirectory>
---
>       <outputDirectory>server/wildfly-${version.wildfly}/bin/</outputDirectory>

======== assembly/pom.xml

5,6c5,6
<     <groupId>org.camunda.bpm.wildfly9</groupId>
<     <artifactId>camunda-wildfly9</artifactId>
---
>     <groupId>org.camunda.bpm.wildfly</groupId>
>     <artifactId>camunda-wildfly</artifactId>
10c10
<   <artifactId>camunda-wildfly9-assembly</artifactId>
---
>   <artifactId>camunda-wildfly-assembly</artifactId>
13c13
<   <name>camunda BPM - Wildfly 9 Assembly</name>
---
>   <name>camunda BPM - Wildfly Assembly</name>
24c24
<       <version>${version.wildfly9}</version>
---
>       <version>${version.wildfly}</version>
26,31d25
<       <exclusions>
<         <exclusion>
<           <groupId>jaxen</groupId>
<           <artifactId>jaxen</artifactId>
<         </exclusion>
<       </exclusions>
79,80c73,74
<       <groupId>org.camunda.bpm.wildfly9</groupId>
<       <artifactId>camunda-wildfly9-modules</artifactId>
---
>       <groupId>org.camunda.bpm.wildfly</groupId>
>       <artifactId>camunda-wildfly-modules</artifactId>

======== assembly/src/wildfly/standalone-full.xml

1c1
< <?xml version="1.0" ?>
---
> <?xml version='1.0' encoding='UTF-8'?>
3c3
< <server xmlns="urn:jboss:domain:3.0">
---
> <server xmlns="urn:jboss:domain:2.2">
9a10
>         <extension module="org.jboss.as.jacorb"/>
28d28
<         <extension module="org.wildfly.extension.bean-validation"/>
30,31d29
<         <extension module="org.wildfly.extension.request-controller"/>
<         <extension module="org.wildfly.extension.security.manager"/>
33,34c31,32
<         <extension module="org.wildfly.iiop-openjdk"/>
<         <extension module="org.camunda.bpm.wildfly9.camunda-wildfly9-subsystem"/>
---
>         <extension module="org.jboss.as.threads"/>
>         <extension module="org.camunda.bpm.wildfly.camunda-wildfly-subsystem"/>
86c84
<         <subsystem xmlns="urn:jboss:domain:logging:3.0">
---
>         <subsystem xmlns="urn:jboss:domain:logging:2.0">
127c125
<                 <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/>
---
>                 <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
130c128
<                 <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/>
---
>                 <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
142,143c140
<         <subsystem xmlns="urn:jboss:domain:bean-validation:1.0"/>
<         <subsystem xmlns="urn:jboss:domain:datasources:3.0">
---
>         <subsystem xmlns="urn:jboss:domain:datasources:2.0">
171c168
<         <subsystem xmlns="urn:jboss:domain:ee:3.0">
---
>         <subsystem xmlns="urn:jboss:domain:ee:2.0">
177,179d173
<                 <managed-thread-factories>
<                     <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
<                 </managed-thread-factories>
185a180,182
>                 <managed-thread-factories>
>                     <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
>                 </managed-thread-factories>
189c186
<         <subsystem xmlns="urn:jboss:domain:ejb3:3.0">
---
>         <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
228d224
<             <log-system-exceptions value="true"/>
234,239c230
<         <subsystem xmlns="urn:jboss:domain:infinispan:3.0">
<             <cache-container name="server" default-cache="default" module="org.wildfly.clustering.server">
<                 <local-cache name="default">
<                     <transaction mode="BATCH"/>
<                 </local-cache>
<             </cache-container>
---
>         <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
241,242c232
<                 <local-cache name="passivation">
<                     <transaction mode="BATCH"/>
---
>                 <local-cache name="passivation" batching="true">
245,246c235
<                 <local-cache name="persistent">
<                     <transaction mode="BATCH"/>
---
>                 <local-cache name="persistent" batching="true">
251,252c240
<                 <local-cache name="passivation">
<                     <transaction mode="BATCH"/>
---
>                 <local-cache name="passivation" batching="true">
255,256c243
<                 <local-cache name="persistent">
<                     <transaction mode="BATCH"/>
---
>                 <local-cache name="persistent" batching="true">
260c247
<             <cache-container name="hibernate" default-cache="local-query" module="org.hibernate.infinispan">
---
>             <cache-container name="hibernate" default-cache="local-query" module="org.hibernate">
266a254
>                     <transaction mode="NONE"/>
270c258,261
<                 <local-cache name="timestamps"/>
---
>                 <local-cache name="timestamps">
>                     <transaction mode="NONE"/>
>                     <eviction strategy="NONE"/>
>                 </local-cache>
273,274c264,265
<         <subsystem xmlns="urn:jboss:domain:iiop-openjdk:1.0">
<             <orb socket-binding="iiop" ssl-socket-binding="iiop-ssl"/>
---
>         <subsystem xmlns="urn:jboss:domain:jacorb:1.3">
>             <orb socket-binding="jacorb" ssl-socket-binding="jacorb-ssl">
275a267
>             </orb>
278c270
<         <subsystem xmlns="urn:jboss:domain:jca:3.0">
---
>         <subsystem xmlns="urn:jboss:domain:jca:2.0">
313c305
<         <subsystem xmlns="urn:jboss:domain:messaging:3.0">
---
>         <subsystem xmlns="urn:jboss:domain:messaging:2.0">
395c387
<         <subsystem xmlns="urn:jboss:domain:remoting:3.0">
---
>         <subsystem xmlns="urn:jboss:domain:remoting:2.0">
399,400c391
<         <subsystem xmlns="urn:jboss:domain:resource-adapters:3.0"/>
<         <subsystem xmlns="urn:jboss:domain:request-controller:1.0"/>
---
>         <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
402,408d392
<         <subsystem xmlns="urn:jboss:domain:security-manager:1.0">
<             <deployment-permissions>
<                 <maximum-set>
<                     <permission class="java.security.AllPermission"/>
<                 </maximum-set>
<             </deployment-permissions>
<         </subsystem>
433c417
<         <subsystem xmlns="urn:jboss:domain:transactions:3.0">
---
>         <subsystem xmlns="urn:jboss:domain:transactions:2.0">
441c425
<         <subsystem xmlns="urn:jboss:domain:undertow:2.0">
---
>         <subsystem xmlns="urn:jboss:domain:undertow:1.2">
459c443
<                 <response-header name="server-header" header-name="Server" header-value="WildFly/9"/>
---
>                 <response-header name="server-header" header-name="Server" header-value="WildFly/8"/>
463c447
<         <subsystem xmlns="urn:jboss:domain:webservices:2.0">
---
>         <subsystem xmlns="urn:jboss:domain:webservices:1.2">
473a458,465
>         <subsystem xmlns="urn:jboss:domain:threads:1.1">
>             <bounded-queue-thread-pool name="job-executor-tp" allow-core-timeout="true">
>               <core-threads count="3" />
>               <queue-length count="3" />
>               <max-threads count="10" />
>               <keepalive-time time="10" unit="seconds" />
>             </bounded-queue-thread-pool>
>         </subsystem>
508d499
< 
509a501
>                 
531a524
>                 
586,587c579,581
<         <socket-binding name="iiop" interface="unsecure" port="3528"/>
<         <socket-binding name="iiop-ssl" interface="unsecure" port="3529"/>
---
>         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
>         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
>         <socket-binding name="messaging-group" port="0" multicast-address="${jboss.messaging.group.address:231.7.7.7}" multicast-port="${jboss.messaging.group.port:9876}"/>

======== assembly/src/wildfly/standalone.xml

1c1
< <?xml version="1.0" ?>
---
> <?xml version='1.0' encoding='UTF-8'?>
3c3
< <server xmlns="urn:jboss:domain:3.0">
---
> <server xmlns="urn:jboss:domain:2.2">
26d25
<         <extension module="org.wildfly.extension.bean-validation"/>
28,29d26
<         <extension module="org.wildfly.extension.request-controller"/>
<         <extension module="org.wildfly.extension.security.manager"/>
31c28,29
<         <extension module="org.camunda.bpm.wildfly9.camunda-wildfly9-subsystem"/>
---
>         <extension module="org.jboss.as.threads"/>
>         <extension module="org.camunda.bpm.wildfly.camunda-wildfly-subsystem"/>
83c81
<         <subsystem xmlns="urn:jboss:domain:logging:3.0">
---
>         <subsystem xmlns="urn:jboss:domain:logging:2.0">
124c122
<                 <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/>
---
>                 <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
127c125
<                 <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/>
---
>                 <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
139,140c137
<         <subsystem xmlns="urn:jboss:domain:bean-validation:1.0"/>
<         <subsystem xmlns="urn:jboss:domain:datasources:3.0">
---
>         <subsystem xmlns="urn:jboss:domain:datasources:2.0">
168c165
<         <subsystem xmlns="urn:jboss:domain:ee:3.0">
---
>         <subsystem xmlns="urn:jboss:domain:ee:2.0">
174,176d170
<                 <managed-thread-factories>
<                     <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
<                 </managed-thread-factories>
182a177,179
>                 <managed-thread-factories>
>                     <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
>                 </managed-thread-factories>
184c181
<             <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" 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/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"/>
186c183
<         <subsystem xmlns="urn:jboss:domain:ejb3:3.0">
---
>         <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
220d216
<             <log-system-exceptions value="true"/>
226,231c222
<         <subsystem xmlns="urn:jboss:domain:infinispan:3.0">
<             <cache-container name="server" default-cache="default" module="org.wildfly.clustering.server">
<                 <local-cache name="default">
<                     <transaction mode="BATCH"/>
<                 </local-cache>
<             </cache-container>
---
>         <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
233,234c224
<                 <local-cache name="passivation">
<                     <transaction mode="BATCH"/>
---
>                 <local-cache name="passivation" batching="true">
237,238c227
<                 <local-cache name="persistent">
<                     <transaction mode="BATCH"/>
---
>                 <local-cache name="persistent" batching="true">
243,244c232
<                 <local-cache name="passivation">
<                     <transaction mode="BATCH"/>
---
>                 <local-cache name="passivation" batching="true">
247,248c235
<                 <local-cache name="persistent">
<                     <transaction mode="BATCH"/>
---
>                 <local-cache name="persistent" batching="true">
252c239
<             <cache-container name="hibernate" default-cache="local-query" module="org.hibernate.infinispan">
---
>             <cache-container name="hibernate" default-cache="local-query" module="org.hibernate">
258a246
>                     <transaction mode="NONE"/>
262c250,253
<                 <local-cache name="timestamps"/>
---
>                 <local-cache name="timestamps">
>                     <transaction mode="NONE"/>
>                     <eviction strategy="NONE"/>
>                 </local-cache>
266c257
<         <subsystem xmlns="urn:jboss:domain:jca:3.0">
---
>         <subsystem xmlns="urn:jboss:domain:jca:2.0">
304c295
<         <subsystem xmlns="urn:jboss:domain:remoting:3.0">
---
>         <subsystem xmlns="urn:jboss:domain:remoting:2.0">
308,309c299
<         <subsystem xmlns="urn:jboss:domain:resource-adapters:3.0"/>
<         <subsystem xmlns="urn:jboss:domain:request-controller:1.0"/>
---
>         <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
311,317d300
<         <subsystem xmlns="urn:jboss:domain:security-manager:1.0">
<             <deployment-permissions>
<                 <maximum-set>
<                     <permission class="java.security.AllPermission"/>
<                 </maximum-set>
<             </deployment-permissions>
<         </subsystem>
342c325
<         <subsystem xmlns="urn:jboss:domain:transactions:3.0">
---
>         <subsystem xmlns="urn:jboss:domain:transactions:2.0">
350c333
<         <subsystem xmlns="urn:jboss:domain:undertow:2.0">
---
>         <subsystem xmlns="urn:jboss:domain:undertow:1.2">
368c351
<                 <response-header name="server-header" header-name="Server" header-value="WildFly/9"/>
---
>                 <response-header name="server-header" header-name="Server" header-value="WildFly/8"/>
372c355
<         <subsystem xmlns="urn:jboss:domain:webservices:2.0">
---
>         <subsystem xmlns="urn:jboss:domain:webservices:1.2">
382a366,373
>         <subsystem xmlns="urn:jboss:domain:threads:1.1">
>             <bounded-queue-thread-pool name="job-executor-tp" allow-core-timeout="true">
>               <core-threads count="3" />
>               <queue-length count="3" />
>               <max-threads count="10" />
>               <keepalive-time time="10" unit="seconds" />
>             </bounded-queue-thread-pool>
>         </subsystem>
417d407
< 
418a409
>                 
440a432
>                 

======== distro/assembly.xml

19c19
<         <include>org.camunda.bpm.wildfly9:camunda-wildfly9-assembly</include>
---
>         <include>org.camunda.bpm.wildfly:camunda-wildfly-assembly</include>
41c41
<   		<outputDirectory>server/wildfly-${version.wildfly9}/standalone/deployments</outputDirectory>
---
>   		<outputDirectory>server/wildfly-${version.wildfly}/standalone/deployments</outputDirectory>
48c48
<         <outputDirectory>server/wildfly-${version.wildfly9}/standalone/deployments</outputDirectory>
---
>         <outputDirectory>server/wildfly-${version.wildfly}/standalone/deployments</outputDirectory>
55c55
<         <outputDirectory>server/wildfly-${version.wildfly9}/standalone/deployments</outputDirectory>
---
>         <outputDirectory>server/wildfly-${version.wildfly}/standalone/deployments</outputDirectory>
62c62
<         <outputDirectory>server/wildfly-${version.wildfly9}/standalone/deployments</outputDirectory>
---
>         <outputDirectory>server/wildfly-${version.wildfly}/standalone/deployments</outputDirectory>
70c70
<       <outputDirectory>server/wildfly-${version.wildfly9}/standalone/deployments/camunda-welcome.war</outputDirectory>
---
>       <outputDirectory>server/wildfly-${version.wildfly}/standalone/deployments/camunda-welcome.war</outputDirectory>
77c77
<       <outputDirectory>server/wildfly-${version.wildfly9}/standalone/deployments/</outputDirectory>
---
>       <outputDirectory>server/wildfly-${version.wildfly}/standalone/deployments/</outputDirectory>

======== distro/pom.xml

5,6c5,6
<     <groupId>org.camunda.bpm.wildfly9</groupId>
<     <artifactId>camunda-wildfly9</artifactId>
---
>     <groupId>org.camunda.bpm.wildfly</groupId>
>     <artifactId>camunda-wildfly</artifactId>
10c10
<   <artifactId>camunda-bpm-wildfly9</artifactId>
---
>   <artifactId>camunda-bpm-wildfly</artifactId>
13c13
<   <name>camunda BPM - Wildfly 9 Distro</name>
---
>   <name>camunda BPM - Wildfly Distro</name>
27,28c27,28
<       <groupId>org.camunda.bpm.wildfly9</groupId>
<       <artifactId>camunda-wildfly9-assembly</artifactId>
---
>       <groupId>org.camunda.bpm.wildfly</groupId>
>       <artifactId>camunda-wildfly-assembly</artifactId>
86c86
<               <finalName>camunda-bpm-wildfly9-${project.version}</finalName>
---
>               <finalName>camunda-bpm-wildfly-${project.version}</finalName>

======== modules/pom.xml

5,6c5,6
<     <groupId>org.camunda.bpm.wildfly9</groupId>
<     <artifactId>camunda-wildfly9</artifactId>
---
>     <groupId>org.camunda.bpm.wildfly</groupId>
>     <artifactId>camunda-wildfly</artifactId>
10c10
<   <artifactId>camunda-wildfly9-modules</artifactId>
---
>   <artifactId>camunda-wildfly-modules</artifactId>
12c12
<   <name>camunda BPM - Wildfly 9 Modules</name>
---
>   <name>camunda BPM - Wildfly Modules</name>
20,21c20,21
<       <groupId>org.camunda.bpm.wildfly9</groupId>
<       <artifactId>camunda-wildfly9-subsystem</artifactId>
---
>       <groupId>org.camunda.bpm.wildfly</groupId>
>       <artifactId>camunda-wildfly-subsystem</artifactId>
89,94d88
<       <exclusions>
<         <exclusion>
<           <groupId>org.apache.httpcomponents</groupId>
<           <artifactId>httpclient</artifactId>
<         </exclusion>
<       </exclusions>
100,105d93
<       <exclusions>
<         <exclusion>
<           <groupId>org.apache.httpcomponents</groupId>
<           <artifactId>httpclient</artifactId>
<         </exclusion>
<       </exclusions>
186c174
<                       <regexpmapper from="^(org.camunda.bpm.*)/((camunda-[A-Za-z9-]*)[0-9\.]*).*.jar$$" to="\1/\3${project.version}.jar" handledirsep="yes" />
---
>                       <regexpmapper from="^(org.camunda.bpm.*)/((camunda-[A-Za-z-]*)[0-9\.]*).*.jar$$" to="\1/\3${project.version}.jar" handledirsep="yes" />

======== modules/src/main/modules/org/camunda/bpm/wildfly9/camunda-wildfly9-subsystem/main/module.xml neu!!!


======== modules/src/main/modules/org/camunda/connect/camunda-connect-http-client/main/module.xml

13c13
<     <module name="org.apache.httpcomponents" />
---
>     <module name="org.apache.httpcomponents.httpclient" />

======== modules/src/main/modules/org/camunda/connect/camunda-connect-soap-http-client/main/module.xml

14c14
<     <module name="org.apache.httpcomponents" />
---
>     <module name="org.apache.httpcomponents.httpclient" />

======== pom.xml

11,12c11,12
<   <groupId>org.camunda.bpm.wildfly9</groupId>
<   <artifactId>camunda-wildfly9</artifactId>
---
>   <groupId>org.camunda.bpm.wildfly</groupId>
>   <artifactId>camunda-wildfly</artifactId>
15c15
<   <name>camunda BPM - Wildfly 9</name>
---
>   <name>camunda BPM - Wildfly</name>

======== subsystem/pom.xml

5,6c5,6
<     <groupId>org.camunda.bpm.wildfly9</groupId>
<     <artifactId>camunda-wildfly9</artifactId>
---
>     <groupId>org.camunda.bpm.wildfly</groupId>
>     <artifactId>camunda-wildfly</artifactId>
10c10
<   <artifactId>camunda-wildfly9-subsystem</artifactId>
---
>   <artifactId>camunda-wildfly-subsystem</artifactId>
13c13
<   <name>camunda BPM - Wildfly 9 Subsystem</name>
---
>   <name>camunda BPM - Wildfly Subsystem</name>
40a41,52
>       <artifactId>wildfly-controller</artifactId>
>       <version>${version.wildfly}</version>
>       <scope>provided</scope>
>     </dependency>
>     <dependency>
>       <groupId>org.wildfly</groupId>
>       <artifactId>wildfly-server</artifactId>
>       <version>${version.wildfly}</version>
>       <scope>provided</scope>
>     </dependency>
>     <dependency>
>       <groupId>org.wildfly</groupId>
42c54
<       <version>${version.wildfly9}</version>
---
>       <version>${version.wildfly}</version>
48c60
<       <version>${version.wildfly9}</version>
---
>       <version>${version.wildfly}</version>
60c72
<       <groupId>org.wildfly.core</groupId>
---
>       <groupId>org.wildfly</groupId>
62c74
<       <version>${version.wildfly9.core}</version>
---
>       <version>${version.wildfly}</version>

======== subsystem/src/main/java/org/camunda/bpm/container/impl/jboss/extension/BpmPlatformExtension.java

31d30
< import org.jboss.as.controller.ModelVersion;
64c63
<     SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME, ModelVersion.create(BPM_PLATFORM_SUBSYSTEM_MAJOR_VERSION, BPM_PLATFORM_SUBSYSTEM_MINOR_VERSION));
---
>     SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME, BPM_PLATFORM_SUBSYSTEM_MAJOR_VERSION, BPM_PLATFORM_SUBSYSTEM_MINOR_VERSION);

======== subsystem/src/main/java/org/camunda/bpm/container/impl/jboss/extension/BpmPlatformParser.java

285d284
< 
412d410
< 
587c585,586
<     String attributeString = reader.getAttributeValue("", attributeName) == null ? null : reader.getAttributeValue("", attributeName).trim();
---
>     String attributeString = 
>             reader.getAttributeValue("", attributeName) == null ? null : reader.getAttributeValue("", attributeName).trim();

======== subsystem/src/main/java/org/camunda/bpm/container/impl/jboss/extension/handler/JobExecutorAdd.java

28,29d27
< import java.util.concurrent.ThreadFactory;
< import java.util.concurrent.TimeUnit;
39d36
< import org.jboss.as.threads.BoundedQueueThreadPoolService;
41d37
< import org.jboss.as.threads.ThreadFactoryService;
43d38
< import org.jboss.as.threads.TimeSpec;
46d40
< import org.jboss.msc.service.ServiceBuilder;
49,50d42
< import org.jboss.msc.service.ServiceName;
< import org.jboss.msc.service.ServiceTarget;
94d85
<     ServiceName jobExecutorThreadPoolServiceName = ServiceNames.forManagedThreadPool(jobExecutorThreadPoolName);
96,97d86
<     performRuntimeThreadPool(context, jobExecutorThreadPoolName, jobExecutorThreadPoolServiceName, verificationHandler, newControllers);
< 
100c89
<         .addDependency(jobExecutorThreadPoolServiceName, ManagedQueueExecutorService.class, service.getManagedQueueInjector())
---
>         .addDependency(ThreadsServices.EXECUTOR.append(jobExecutorThreadPoolName), ManagedQueueExecutorService.class, service.getManagedQueueInjector())
109,143d97
<   private void performRuntimeThreadPool(OperationContext context, String name, ServiceName jobExecutorThreadPoolServiceName,
<       ServiceVerificationHandler verificationHandler, List<ServiceController<?>> newControllers)
<       throws OperationFailedException {
< 
<     ServiceTarget serviceTarget = context.getServiceTarget();
< 
<     ThreadFactoryService threadFactory = new ThreadFactoryService();
<     threadFactory.setThreadGroupName("Camunda BPM "+name);
< 
<     final ServiceName threadFactoryServiceName = ThreadsServices.threadFactoryName(name);
< 
<     ServiceBuilder<ThreadFactory> factoryBuilder = serviceTarget.addService(threadFactoryServiceName, threadFactory);
<     if (verificationHandler != null) {
<       factoryBuilder.addListener(verificationHandler);
<     }
<     if (newControllers != null) {
<       newControllers.add(factoryBuilder.install());
<     } else {
<       factoryBuilder.install();
<     }
< 
<     final BoundedQueueThreadPoolService service = new BoundedQueueThreadPoolService(3, 19, 3, false, new TimeSpec(TimeUnit.SECONDS, 10), true);
< 
<     ServiceBuilder<ManagedQueueExecutorService> builder = serviceTarget.addService(jobExecutorThreadPoolServiceName, service)
<         .addDependency(threadFactoryServiceName, ThreadFactory.class, service.getThreadFactoryInjector())
<         .setInitialMode(ServiceController.Mode.ACTIVE);
<     if (verificationHandler != null) {
<       builder.addListener(verificationHandler);
<     }
<     if (newControllers != null) {
<       newControllers.add(builder.install());
<     } else {
<       builder.install();
<     }
<   }

======== subsystem/src/main/java/org/camunda/bpm/container/impl/jboss/service/ServiceNames.java

15d14
< import org.jboss.as.threads.CommonAttributes;
130,132d128
<   public static ServiceName forMscThreadFactoryService(String threadPoolName) {
<     return JOB_EXECUTOR.append(CommonAttributes.THREAD_FACTORY).append(threadPoolName);
<   }
134,136d129
<   public static ServiceName forManagedThreadPool(String threadPoolName) {
<     return JOB_EXECUTOR.append(threadPoolName);
<   }