You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2015/10/10 14:25:13 UTC
svn commit: r1707876 - in /webservices/axiom/trunk/systests/jboss-tests:
pom.xml src/test/conf/standalone.xml src/test/resources/arquillian.xml
Author: veithen
Date: Sat Oct 10 12:25:13 2015
New Revision: 1707876
URL: http://svn.apache.org/viewvc?rev=1707876&view=rev
Log:
Upgrade JBoss to 8.2.1.
Modified:
webservices/axiom/trunk/systests/jboss-tests/pom.xml
webservices/axiom/trunk/systests/jboss-tests/src/test/conf/standalone.xml
webservices/axiom/trunk/systests/jboss-tests/src/test/resources/arquillian.xml
Modified: webservices/axiom/trunk/systests/jboss-tests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/jboss-tests/pom.xml?rev=1707876&r1=1707875&r2=1707876&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/jboss-tests/pom.xml (original)
+++ webservices/axiom/trunk/systests/jboss-tests/pom.xml Sat Oct 10 12:25:13 2015
@@ -32,8 +32,8 @@
<name>JBoss Tests</name>
<properties>
- <jboss.version>7.1.1.Final</jboss.version>
- <jboss.home>${project.build.directory}/jboss-as-${jboss.version}</jboss.home>
+ <jboss.version>8.2.1.Final</jboss.version>
+ <jboss.home>${project.build.directory}/wildfly-${jboss.version}</jboss.home>
</properties>
<dependencies>
@@ -51,12 +51,12 @@
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
- <version>1.0.3.Final</version>
+ <version>1.1.2.Final-wildfly-1</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-arquillian-container-managed</artifactId>
+ <groupId>org.wildfly</groupId>
+ <artifactId>wildfly-arquillian-container-managed</artifactId>
<version>${jboss.version}</version>
<scope>test</scope>
</dependency>
@@ -89,6 +89,10 @@
</configuration>
</execution>
<execution>
+ <!-- We would prefer using wildfly-server-provisioning-maven-plugin to
+ provision the server, but unfortunately the JBoss community is still
+ unable to ensure that all required artifacts are available from Maven
+ central and the JBoss Maven repository isn't stable. -->
<id>unpack-jboss</id>
<phase>generate-test-resources</phase>
<goals>
@@ -97,8 +101,8 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-dist</artifactId>
+ <groupId>org.wildfly</groupId>
+ <artifactId>wildfly-dist</artifactId>
<version>${jboss.version}</version>
<type>zip</type>
<overWrite>false</overWrite>
@@ -125,6 +129,7 @@
<configuration>
<portNames>
<portName>jboss.managementPort</portName>
+ <portName>jboss.httpPort</portName>
</portNames>
</configuration>
</execution>
Modified: webservices/axiom/trunk/systests/jboss-tests/src/test/conf/standalone.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/jboss-tests/src/test/conf/standalone.xml?rev=1707876&r1=1707875&r2=1707876&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/jboss-tests/src/test/conf/standalone.xml (original)
+++ webservices/axiom/trunk/systests/jboss-tests/src/test/conf/standalone.xml Sat Oct 10 12:25:13 2015
@@ -17,10 +17,9 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<server xmlns="urn:jboss:domain:1.2">
+<server xmlns="urn:jboss:domain:2.2">
<extensions>
<extension module="org.jboss.as.clustering.infinispan"/>
- <extension module="org.jboss.as.configadmin"/>
<extension module="org.jboss.as.connector"/>
<extension module="org.jboss.as.deployment-scanner"/>
<extension module="org.jboss.as.ee"/>
@@ -29,53 +28,81 @@
<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.osgi"/>
<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.threads"/>
<extension module="org.jboss.as.transactions"/>
- <extension module="org.jboss.as.web"/>
<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>
</security-realms>
+ <audit-log>
+ <formatters>
+ <json-formatter name="json-formatter"/>
+ </formatters>
+ <handlers>
+ <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
+ </handlers>
+ <logger log-boot="true" log-read-only="false" enabled="false">
+ <handlers>
+ <handler name="file"/>
+ </handlers>
+ </logger>
+ </audit-log>
<management-interfaces>
- <native-interface security-realm="ManagementRealm">
- <socket-binding native="management-native"/>
- </native-interface>
- <http-interface security-realm="ManagementRealm">
+ <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:1.1">
+ <subsystem xmlns="urn:jboss:domain:logging:2.0">
<console-handler name="CONSOLE">
<level name="INFO"/>
<formatter>
- <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+ <named-formatter name="COLOR-PATTERN"/>
</formatter>
</console-handler>
- <periodic-rotating-file-handler name="FILE">
+ <periodic-rotating-file-handler name="FILE" autoflush="true">
<formatter>
- <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+ <named-formatter name="PATTERN"/>
</formatter>
<file relative-to="jboss.server.log.dir" path="server.log"/>
<suffix value=".yyyy-MM-dd"/>
@@ -87,6 +114,9 @@
<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>
@@ -103,47 +133,100 @@
<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: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: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-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>
+ <managed-thread-factories>
+ <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
+ </managed-thread-factories>
+ </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:configadmin:1.0"/>
- <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.1">
- <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ee:1.0"/>
- <subsystem xmlns="urn:jboss:domain:ejb3:1.2">
+ <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
<session-bean>
- <stateless>
- <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
- </stateless>
- <stateful default-access-timeout="5000" cache-ref="simple"/>
+ <stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
<singleton default-access-timeout="5000"/>
</session-bean>
<pools>
<bean-instance-pools>
+ <!-- A sample strict max pool configuration -->
<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" aliases="NoPassivationCache"/>
- <cache name="passivating" passivation-store-ref="file" aliases="SimpleStatefulCache"/>
+ <cache name="simple"/>
+ <cache name="distributable" aliases="passivating clustered" passivation-store-ref="infinispan"/>
</caches>
<passivation-stores>
- <file-passivation-store name="file"/>
+ <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
</passivation-stores>
<async thread-pool-name="default"/>
- <timer-service thread-pool-name="default">
- <data-store path="timer-service-data" relative-to="jboss.server.data.dir"/>
+ <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="remoting-connector" thread-pool-name="default"/>
+ <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:infinispan:1.2" default-cache-container="hibernate">
- <cache-container name="hibernate" default-cache="local-query">
+ <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" aliases="sfsb" default-cache="passivation" module="org.wildfly.clustering.ejb.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="hibernate" default-cache="local-query" module="org.hibernate">
<local-cache name="entity">
<transaction mode="NON_XA"/>
<eviction strategy="LRU" max-entries="10000"/>
@@ -161,7 +244,7 @@
</cache-container>
</subsystem>
<subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jca:1.1">
+ <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>
@@ -181,52 +264,38 @@
<cached-connection-manager/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jmx:1.1">
- <show-model value="true"/>
+ <subsystem xmlns="urn:jboss:domain:jmx:1.3">
+ <expose-resolved-model/>
+ <expose-expression-model/>
<remoting-connector/>
</subsystem>
- <subsystem xmlns="urn:jboss:domain:jpa:1.0">
- <jpa default-datasource=""/>
+ <subsystem xmlns="urn:jboss:domain:jpa:1.1">
+ <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
</subsystem>
- <subsystem xmlns="urn:jboss:domain:mail:1.0">
- <mail-session jndi-name="java:jboss/mail/Default">
+ <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:1.1"/>
- <subsystem xmlns="urn:jboss:domain:osgi:1.2" activation="lazy">
- <properties>
- <!-- Specifies the beginning start level of the framework -->
- <property name="org.osgi.framework.startlevel.beginning">1</property>
- </properties>
- <capabilities>
- <!-- modules registered with the OSGi layer on startup -->
- <capability name="javax.servlet.api:v25"/>
- <capability name="javax.transaction.api"/>
- <!-- bundles started in startlevel 1 -->
- <capability name="org.apache.felix.log" startlevel="1"/>
- <capability name="org.jboss.osgi.logging" startlevel="1"/>
- <capability name="org.apache.felix.configadmin" startlevel="1"/>
- <capability name="org.jboss.as.osgi.configadmin" startlevel="1"/>
- </capabilities>
+ <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:1.1">
- <connector name="remoting-connector" socket-binding="remoting" security-realm="ApplicationRealm"/>
+ <subsystem xmlns="urn:jboss:domain:remoting:2.0">
+ <endpoint worker="default"/>
+ <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
</subsystem>
- <subsystem xmlns="urn:jboss:domain:resource-adapters:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
<subsystem xmlns="urn:jboss:domain:sar:1.0"/>
- <subsystem xmlns="urn:jboss:domain:security:1.1">
+ <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="RealmUsersRoles" flag="required">
- <module-option name="usersProperties" value="${jboss.server.config.dir}/application-users.properties"/>
- <module-option name="rolesProperties" value="${jboss.server.config.dir}/application-roles.properties"/>
- <module-option name="realm" value="ApplicationRealm"/>
+ <login-module code="RealmDirect" flag="required">
<module-option name="password-stacking" value="useFirstPass"/>
</login-module>
</authentication>
@@ -243,25 +312,37 @@
</security-domain>
</security-domains>
</subsystem>
- <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
- <subsystem xmlns="urn:jboss:domain:transactions:1.1">
+ <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"/>
- <coordinator-environment default-timeout="300"/>
</subsystem>
- <subsystem xmlns="urn:jboss:domain:web:1.1" default-virtual-server="default-host" native="false">
- <connector name="http" protocol="HTTP/1.1" scheme="http" socket-binding="http"/>
- <virtual-server name="default-host" enable-welcome-root="true">
- <alias name="localhost"/>
- <alias name="example.com"/>
- </virtual-server>
+ <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.1">
- <modify-wsdl-address>true</modify-wsdl-address>
+ <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">
@@ -269,8 +350,9 @@
<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:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:weld:2.0"/>
</profile>
<interfaces>
<interface name="localhost">
@@ -278,11 +360,11 @@
</interface>
</interfaces>
<socket-binding-group name="standard-sockets" default-interface="localhost">
- <socket-binding name="management-native" port="${jboss.management.native.port}"/>
- <socket-binding name="management-http" port="0"/>
- <socket-binding name="http" port="0"/>
- <socket-binding name="osgi-http" port="0"/>
- <socket-binding name="remoting" port="0"/>
+ <socket-binding name="management-http" port="${jboss.management.port}"/>
+ <socket-binding name="management-https" port="0"/>
+ <socket-binding name="ajp" port="0"/>
+ <socket-binding name="http" port="${jboss.http.port}"/>
+ <socket-binding name="https" port="0"/>
<socket-binding name="txn-recovery-environment" port="0"/>
<socket-binding name="txn-status-manager" port="0"/>
<outbound-socket-binding name="mail-smtp">
Modified: webservices/axiom/trunk/systests/jboss-tests/src/test/resources/arquillian.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/jboss-tests/src/test/resources/arquillian.xml?rev=1707876&r1=1707875&r2=1707876&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/jboss-tests/src/test/resources/arquillian.xml (original)
+++ webservices/axiom/trunk/systests/jboss-tests/src/test/resources/arquillian.xml Sat Oct 10 12:25:13 2015
@@ -25,7 +25,7 @@
<property name="jbossHome">${jboss.home}</property>
<!-- Arquillian gets confused if there is an extra space at the beginning of the arg line.
Therefore we need to add a dummy argument to avoid that problem if JaCoCo is skipped. -->
- <property name="javaVmArguments">-Ddummy ${jacoco.jbossArgLine} -Djboss.management.native.port=${jboss.managementPort}</property>
+ <property name="javaVmArguments">-Ddummy ${jacoco.jbossArgLine} -Djboss.management.port=${jboss.managementPort} -Djboss.http.port=${jboss.httpPort}</property>
<property name="managementPort">${jboss.managementPort}</property>
</configuration>
</container>