Hi Tobias, On Sat, Jan 28, 2017 at 12:31 PM, <[email protected]> wrote:
> Repository: wicket > Updated Branches: > refs/heads/master 5b5e25c9c -> f4d5ddc84 > > > arquillian integration test management port is now configurable > > Project: http://git-wip-us.apache.org/repos/asf/wicket/repo > Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f4d5ddc8 > Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f4d5ddc8 > Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f4d5ddc8 > > Branch: refs/heads/master > Commit: f4d5ddc84a75aaa15f834c6ad38112008349dd11 > Parents: 5b5e25c > Author: Tobias Soloschenko <[email protected]> > Authored: Sat Jan 28 12:30:04 2017 +0100 > Committer: Tobias Soloschenko <[email protected]> > Committed: Sat Jan 28 12:30:04 2017 +0100 > > ---------------------------------------------------------------------- > testing/wicket-arquillian/pom.xml | 18 ++++++++-- > .../src/main/resources/arquillian.xml | 35 ++++++++++++++++++++ > .../src/test/resources/arquillian.xml | 34 ------------------- > 3 files changed, 50 insertions(+), 37 deletions(-) > ---------------------------------------------------------------------- > > > http://git-wip-us.apache.org/repos/asf/wicket/blob/ > f4d5ddc8/testing/wicket-arquillian/pom.xml > ---------------------------------------------------------------------- > diff --git a/testing/wicket-arquillian/pom.xml > b/testing/wicket-arquillian/pom.xml > index 4671b66..0910a5e 100644 > --- a/testing/wicket-arquillian/pom.xml > +++ b/testing/wicket-arquillian/pom.xml > @@ -36,6 +36,11 @@ > </description> > > <properties> > + <!-- port configuration --> > + <wicket.arquillian.server.port>48787</wicket.arquillian. > server.port> > + <wicket.arquillian.management. > port>11091</wicket.arquillian.management.port> > + <!-- end port configuration --> > + > <arquillian.version>1.1.12.Final</arquillian.version> > <maven.dependency.plugin.version>2.10</maven. > dependency.plugin.version> > <maven.surefire.plugin.version>2.18.1</maven. > surefire.plugin.version> > @@ -109,6 +114,12 @@ > </dependencies> > > <build> > + <resources> > + <resource> > + <directory>src/main/resources</directory> > + <filtering>true</filtering> > + </resource> > + </resources> > <pluginManagement> > <plugins> > <plugin> > @@ -144,9 +155,9 @@ > <version>${maven.surefire. > plugin.version}</version> > <configuration> > <systemPropertyVariables> > - > <!--<jboss.socket.binding.port-offset>1100</jboss. > socket.binding.port-offset>--> > - > <!--<jboss.management.http.port>11090</jboss.management.http.port>--> > - > <jboss.http.port>48181</jboss.http.port> > + <!-- > <jboss.socket.binding.port-offset>1100</jboss.socket.binding.port-offset> > --> > + > <jboss.management.http.port>${wicket.arquillian.management. > port}</jboss.management.http.port> > + > <jboss.http.port>${wicket.arquillian.server.port}</jboss.http.port> > > <java.util.logging.manager>org.jboss.logmanager. > LogManager</java.util.logging.manager> > > <jboss.home>${project.build.directory}/wildfly-${wildfly. > version}</jboss.home> > > <module.path>${project.build.directory}/wildfly-${wildfly. > version}/modules</module.path> > @@ -159,6 +170,7 @@ > <artifactId>wildfly-maven- > plugin</artifactId> > <version>${version.wildfly. > maven.plugin}</version> > <configuration> > + <port>${wicket.arquillian. > management.port}</port> > <filename>target/${project. > build.finalName}.war</filename> > </configuration> > </plugin> > > http://git-wip-us.apache.org/repos/asf/wicket/blob/ > f4d5ddc8/testing/wicket-arquillian/src/main/resources/arquillian.xml > ---------------------------------------------------------------------- > diff --git a/testing/wicket-arquillian/src/main/resources/arquillian.xml > b/testing/wicket-arquillian/src/main/resources/arquillian.xml > new file mode 100644 > index 0000000..9147c06 > --- /dev/null > +++ b/testing/wicket-arquillian/src/main/resources/arquillian.xml > @@ -0,0 +1,35 @@ > +<?xml version="1.0" encoding="UTF-8"?> > +<!-- > + Licensed to the Apache Software Foundation (ASF) under one or more > + contributor license agreements. See the NOTICE file distributed with > + this work for additional information regarding copyright ownership. > + The ASF licenses this file to You under the Apache License, Version 2.0 > + (the "License"); you may not use this file except in compliance with > + the License. You may obtain a copy of the License at > + > + http://www.apache.org/licenses/LICENSE-2.0 > + > + Unless required by applicable law or agreed to in writing, software > + distributed under the License is distributed on an "AS IS" BASIS, > + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or > implied. > + See the License for the specific language governing permissions and > + limitations under the License. > +--> > +<arquillian xmlns="http://jboss.org/schema/arquillian"; > + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; > + xsi:schemaLocation="http://jboss.org/schema/arquillian > http://jboss.org/schema/arquillian/arquillian_1_0.xsd";> > + > + <defaultProtocol type="Servlet 3.0" /> > + <engine> > + <property name="deploymentExportPath">target</property> > + </engine> > + > + <container qualifier="wildfly" default="true"> > + <configuration> > + <property name="managementPort">${ > wicket.arquillian.management.port}</property> > + <property name="jbossHome">target/ > wildfly-${wildfly.version}</property> > + <property name="javaVmArguments">- > Xrunjdwp:transport=dt_socket,address=${wicket.arquillian. > server.port},server=y,suspend=n</property> > This is not correct! Here the address if the one the JVM should use for remote debugging, not the one for HTTP connections. I have the feeling that 'javaVmArguments' is not used at all by Arquillian. Otherwise it would fail at starting with an error that the port is already taken. > + </configuration> > + </container> > + > +</arquillian> > > http://git-wip-us.apache.org/repos/asf/wicket/blob/ > f4d5ddc8/testing/wicket-arquillian/src/test/resources/arquillian.xml > ---------------------------------------------------------------------- > diff --git a/testing/wicket-arquillian/src/test/resources/arquillian.xml > b/testing/wicket-arquillian/src/test/resources/arquillian.xml > deleted file mode 100644 > index 5343d8d..0000000 > --- a/testing/wicket-arquillian/src/test/resources/arquillian.xml > +++ /dev/null > @@ -1,34 +0,0 @@ > -<?xml version="1.0" encoding="UTF-8"?> > -<!-- > - Licensed to the Apache Software Foundation (ASF) under one or more > - contributor license agreements. See the NOTICE file distributed with > - this work for additional information regarding copyright ownership. > - The ASF licenses this file to You under the Apache License, Version 2.0 > - (the "License"); you may not use this file except in compliance with > - the License. You may obtain a copy of the License at > - > - http://www.apache.org/licenses/LICENSE-2.0 > - > - Unless required by applicable law or agreed to in writing, software > - distributed under the License is distributed on an "AS IS" BASIS, > - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or > implied. > - See the License for the specific language governing permissions and > - limitations under the License. > ---> > -<arquillian xmlns="http://jboss.org/schema/arquillian"; > - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; > - xsi:schemaLocation="http://jboss.org/schema/arquillian > http://jboss.org/schema/arquillian/arquillian_1_0.xsd";> > - > - <defaultProtocol type="Servlet 3.0" /> > - <engine> > - <property name="deploymentExportPath">target</property> > - </engine> > - > - <container qualifier="wildfly" default="true"> > - <configuration> > - <property name="jbossHome">target/ > wildfly-${wildfly.version}</property> > - <property name="javaVmArguments">- > Xrunjdwp:transport=dt_socket,address=48787,server=y,suspend=n</property> > - </configuration> > - </container> > - > -</arquillian> > >
