Update config for WildFly 10.0.0.CR2

zanata · Dec 10, 2015 · 490b128 · 490b128
1 parent e42e819
commit 490b128
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 36 deletions.
diff --git a/functional-test/src/test/resources/conf/standalone_wildfly.xml b/functional-test/src/test/resources/conf/standalone_wildfly.xml
@@ -178,7 +178,7 @@
       </thread-pool>
     </subsystem>
     <subsystem xmlns="urn:jboss:domain:bean-validation:1.0"/>
-    <subsystem xmlns="urn:jboss:domain:datasources:3.0">
+    <subsystem xmlns="urn:jboss:domain:datasources:4.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>
@@ -198,7 +198,7 @@
     <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
       <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
     </subsystem>
-    <subsystem xmlns="urn:jboss:domain:ee:3.0">
+    <subsystem xmlns="urn:jboss:domain:ee:4.0">
       <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
       <concurrent>
         <context-services>
@@ -208,17 +208,20 @@
           <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-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" 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-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" 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:3.1">
+    <subsystem xmlns="urn:jboss:domain:ejb3:4.0">
       <session-bean>
         <stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
+        <stateless>
+          <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
+        </stateless>
         <singleton default-access-timeout="5000"/>
       </session-bean>
       <mdb>
@@ -227,8 +230,9 @@
       </mdb>
       <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"/>
+          <!-- Automatically configure pools. Alternatively, max-pool-size can be set to a specific value -->
+          <strict-max-pool name="slsb-strict-max-pool" derive-size="from-worker-pools" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
+          <strict-max-pool name="mdb-strict-max-pool" derive-size="from-cpu-count" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
         </bean-instance-pools>
       </pools>
       <caches>
@@ -296,6 +300,11 @@
           <eviction max-entries="10000" strategy="LRU"/>
           <expiration max-idle="100000"/>
         </local-cache>
+        <local-cache name="immutable-entity">
+          <transaction mode="NON_XA"/>
+          <eviction strategy="LRU" max-entries="10000"/>
+          <expiration max-idle="100000"/>
+        </local-cache>
         <local-cache name="local-query">
           <eviction max-entries="10000" strategy="LRU"/>
           <expiration max-idle="100000"/>
@@ -355,11 +364,8 @@
           <role name="guest" delete-non-durable-queue="true" create-non-durable-queue="true" consume="true" send="true"/>
         </security-setting>
         <address-setting name="#" message-counter-history-day-limit="10" page-size-bytes="2097152" max-size-bytes="10485760" expiry-address="jms.queue.ExpiryQueue" dead-letter-address="jms.queue.DLQ"/>
-        <http-connector name="http-connector" socket-binding="http">
-          <param name="http-upgrade-endpoint" value="http-acceptor"/>
-        </http-connector>
-        <http-connector name="http-connector-throughput" socket-binding="http">
-          <param name="http-upgrade-endpoint" value="http-acceptor-throughput"/>
+        <http-connector name="http-connector" socket-binding="http" endpoint="http-acceptor"/>
+        <http-connector name="http-connector-throughput" socket-binding="http" endpoint="http-acceptor-throughput">
           <param name="batch-delay" value="50"/>
         </http-connector>
         <in-vm-connector name="in-vm" server-id="0"/>

diff --git a/pom.xml b/pom.xml
@@ -1719,7 +1719,7 @@
         <wildfly.client.version>8.1.0.Final</wildfly.client.version>
         <!-- used in the wildfly8 profile in zanata-war -->
         <!-- This is the server version -->
-        <wildfly.version>10.0.0.Beta2</wildfly.version>
+        <wildfly.version>10.0.0.CR2</wildfly.version>
         <!-- In case this profile was activated by default: -->
         <appserver>wildfly8</appserver>
         <cargo.installation>https://repository.jboss.org/nexus/content/groups/developer/org/wildfly/wildfly-dist/${wildfly.version}/wildfly-dist-${wildfly.version}.zip</cargo.installation>

diff --git a/zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml b/zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
@@ -192,7 +192,7 @@
       </thread-pool>
     </subsystem>
     <subsystem xmlns="urn:jboss:domain:bean-validation:1.0" />
-    <subsystem xmlns="urn:jboss:domain:datasources:3.0">
+    <subsystem xmlns="urn:jboss:domain:datasources:4.0">
       <datasources>
         <datasource jndi-name="java:jboss/datasources/zanataDatasource"
           pool-name="zanataDatasource" enabled="true"
@@ -225,7 +225,7 @@
         scan-interval="5000"
         runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}" />
     </subsystem>
-    <subsystem xmlns="urn:jboss:domain:ee:3.0">
+    <subsystem xmlns="urn:jboss:domain:ee:4.0">
       <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
       <concurrent>
         <context-services>
@@ -239,16 +239,10 @@
             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-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" 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-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" keepalive-time="3000"/>
         </managed-scheduled-executor-services>
       </concurrent>
       <default-bindings
@@ -259,10 +253,13 @@
         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:3.1">
+    <subsystem xmlns="urn:jboss:domain:ejb3:4.0">
       <session-bean>
         <stateful default-access-timeout="5000" cache-ref="simple"
           passivation-disabled-cache-ref="simple" />
+        <stateless>
+          <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
+        </stateless>
         <singleton default-access-timeout="5000" />
       </session-bean>
       <mdb>
@@ -272,12 +269,9 @@
       </mdb>
       <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" />
+          <!-- Automatically configure pools. Alternatively, max-pool-size can be set to a specific value -->
+          <strict-max-pool name="slsb-strict-max-pool" derive-size="from-worker-pools" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
+          <strict-max-pool name="mdb-strict-max-pool" derive-size="from-cpu-count" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
         </bean-instance-pools>
       </pools>
       <caches>
@@ -355,6 +349,11 @@
           <eviction max-entries="10000" strategy="LRU" />
           <expiration max-idle="100000" />
         </local-cache>
+        <local-cache name="immutable-entity">
+          <transaction mode="NON_XA"/>
+          <eviction strategy="LRU" max-entries="10000"/>
+          <expiration max-idle="100000"/>
+        </local-cache>
         <local-cache name="local-query">
           <eviction max-entries="10000" strategy="LRU" />
           <expiration max-idle="100000" />
@@ -422,12 +421,8 @@
           page-size-bytes="2097152" max-size-bytes="10485760"
           expiry-address="jms.queue.ExpiryQueue"
           dead-letter-address="jms.queue.DLQ" />
-        <http-connector name="http-connector" socket-binding="http">
-          <param name="http-upgrade-endpoint" value="http-acceptor" />
-        </http-connector>
-        <http-connector name="http-connector-throughput" socket-binding="http">
-          <param name="http-upgrade-endpoint"
-            value="http-acceptor-throughput" />
+        <http-connector name="http-connector" socket-binding="http" endpoint="http-acceptor"/>
+        <http-connector name="http-connector-throughput" socket-binding="http" endpoint="http-acceptor-throughput">
           <param name="batch-delay" value="50" />
         </http-connector>
         <in-vm-connector name="in-vm" server-id="0" />