You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2015/12/01 12:51:20 UTC
[1/4] wicket git commit: inrtoduced missing version variables in pom.
Removed from arquillian.xml PermGen JVM parameter
Repository: wicket
Updated Branches:
refs/heads/lambdas ae70d7d02 -> 73ac8c7e6
inrtoduced missing version variables in pom. Removed from arquillian.xml PermGen JVM parameter
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c70c0a2f
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c70c0a2f
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c70c0a2f
Branch: refs/heads/lambdas
Commit: c70c0a2fb0bdd66a30b5a787bc521f00eba87de5
Parents: 058f733
Author: Andrea Del Bene <ad...@apache.org>
Authored: Tue Dec 1 11:06:11 2015 +0100
Committer: Andrea Del Bene <ad...@apache.org>
Committed: Tue Dec 1 12:05:14 2015 +0100
----------------------------------------------------------------------
testing/wicket-arquillian/pom.xml | 6 ++++--
testing/wicket-arquillian/src/test/resources/arquillian.xml | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/c70c0a2f/testing/wicket-arquillian/pom.xml
----------------------------------------------------------------------
diff --git a/testing/wicket-arquillian/pom.xml b/testing/wicket-arquillian/pom.xml
index 0d32812..26c9c0f 100644
--- a/testing/wicket-arquillian/pom.xml
+++ b/testing/wicket-arquillian/pom.xml
@@ -44,6 +44,7 @@
<slf4j.version>1.7.12</slf4j.version>
<wildfly.version>8.2.1.Final</wildfly.version>
<version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
+ <jee.spec.version>1.0.3.Final</jee.spec.version>
</properties>
<dependencyManagement>
@@ -62,7 +63,7 @@
<dependency>
<groupId>org.jboss.spec</groupId>
<artifactId>jboss-javaee-7.0</artifactId>
- <version>1.0.2.Final</version>
+ <version>${jee.spec.version}</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
@@ -97,6 +98,7 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
</dependency>
+
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
@@ -154,7 +156,7 @@
<plugin>
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId>
- <version>1.0.2.Final</version>
+ <version>${version.wildfly.maven.plugin}</version>
<configuration>
<filename>target/${project.build.finalName}.war</filename>
</configuration>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c70c0a2f/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
index f4ed277..28a84fb 100644
--- a/testing/wicket-arquillian/src/test/resources/arquillian.xml
+++ b/testing/wicket-arquillian/src/test/resources/arquillian.xml
@@ -29,7 +29,7 @@
<property name="jbossHome">target/wildfly-${wildfly.version}</property>
<property name="managementPort">48990</property>
<!-- DEBUG MODE MANAGED: -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n -->
- <property name="javaVmArguments">-Djboss.socket.binding.port-offset=38000 -Xmx128m -XX:MaxPermSize=128m -Xrunjdwp:transport=dt_socket,address=48787,server=y,suspend=n
+ <property name="javaVmArguments">-Djboss.socket.binding.port-offset=38000 -Xmx128m -Xrunjdwp:transport=dt_socket,address=48787,server=y,suspend=n
</property>
</configuration>
</container>
[4/4] wicket git commit: Introduced MarkupContainer#childrenStream to
leverage Java 8 Stream when accessing children components
Posted by ad...@apache.org.
Introduced MarkupContainer#childrenStream to leverage Java 8 Stream when accessing children components
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/73ac8c7e
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/73ac8c7e
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/73ac8c7e
Branch: refs/heads/lambdas
Commit: 73ac8c7e6da3ff9dd0244ad66c63944ba3d64c78
Parents: c70c0a2
Author: Andrea Del Bene <ad...@apache.org>
Authored: Tue Dec 1 12:49:22 2015 +0100
Committer: Andrea Del Bene <ad...@apache.org>
Committed: Tue Dec 1 12:49:49 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/wicket/MarkupContainer.java | 17 +++++
.../org/apache/wicket/MarkupContainerTest.java | 39 ++++++++++-
.../org/apache/wicket/util/NestedIterator.java | 70 ++++++++++++++++++++
3 files changed, 125 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/73ac8c7e/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
index 916b994..fb2cf1f 100644
--- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
@@ -24,6 +24,8 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
import org.apache.commons.collections4.map.LinkedMap;
import org.apache.wicket.core.util.string.ComponentStrings;
@@ -43,6 +45,7 @@ import org.apache.wicket.model.IComponentInheritedModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.IWrapModel;
import org.apache.wicket.settings.DebugSettings;
+import org.apache.wicket.util.NestedIterator;
import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.lang.Classes;
import org.apache.wicket.util.lang.Generics;
@@ -2191,4 +2194,18 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
{
add(component);
}
+
+ /**
+ * Creates a {@code java.util.stream.Stream} returning all the children (included nested ones)
+ * of the this container.
+ *
+ * @return a stream returning children.
+ */
+ public Stream<Component> childrenStream()
+ {
+ NestedIterator<Component> nestedIterator = new NestedIterator<>(this);
+ Iterable<Component> iterable = () -> nestedIterator;
+
+ return StreamSupport.stream(iterable.spliterator(), false);
+ }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/73ac8c7e/wicket-core/src/test/java/org/apache/wicket/MarkupContainerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/MarkupContainerTest.java b/wicket-core/src/test/java/org/apache/wicket/MarkupContainerTest.java
index aba2148..1bea201 100644
--- a/wicket-core/src/test/java/org/apache/wicket/MarkupContainerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/MarkupContainerTest.java
@@ -29,6 +29,7 @@ import java.util.ConcurrentModificationException;
import java.util.Iterator;
import java.util.List;
import java.util.Random;
+import java.util.stream.Stream;
import org.apache.commons.collections4.map.LinkedMap;
import org.apache.wicket.core.util.lang.WicketObjects;
@@ -37,6 +38,7 @@ import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.panel.EmptyPanel;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
@@ -1208,7 +1210,42 @@ public class MarkupContainerTest extends WicketTestCase
assertThat(iterator1.hasNext(), is(false));
assertThat(iterator2.hasNext(), is(false));
}
-
+
+ @Test
+ public void testStreamOfChildren() throws Exception
+ {
+ WebMarkupContainer wmc = new WebMarkupContainer("id");
+ WebMarkupContainer container = new WebMarkupContainer("container");
+ addNChildren(wmc, 10);
+
+ wmc.add(container);
+ container.add(new Form<>("form"));
+
+ long wmcNumber = filterChildrenStreamByClass(wmc, WebMarkupContainer.class).count();
+ assertEquals(2l, wmcNumber);
+
+ long formNumber = filterChildrenStreamByClass(wmc, Form.class).count();
+ assertEquals(1l, formNumber);
+
+ long labelNumber = filterChildrenStreamByClass(wmc, Label.class).count();
+ assertEquals(10l, labelNumber);
+ }
+
+ /**
+ * Returns a stream containg only children components who are instance of
+ * <code>filterClass</code>.
+ *
+ * @param container
+ * the parent markup container
+ * @param filterClass
+ * the component class to use as filter
+ * @return a stream containg only children who are instance of param <code>filterClass</code>
+ */
+ private Stream<Component> filterChildrenStreamByClass(MarkupContainer container, Class<? extends Component> filterClass)
+ {
+ return container.childrenStream().filter(filterClass::isInstance);
+ }
+
/**
* Asserts that the children property of the {@code wmc} is of a particular {@code type}.
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/73ac8c7e/wicket-util/src/main/java/org/apache/wicket/util/NestedIterator.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/NestedIterator.java b/wicket-util/src/main/java/org/apache/wicket/util/NestedIterator.java
new file mode 100644
index 0000000..f2526db
--- /dev/null
+++ b/wicket-util/src/main/java/org/apache/wicket/util/NestedIterator.java
@@ -0,0 +1,70 @@
+package org.apache.wicket.util;
+
+/*
+ * 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.
+ */
+import java.util.ArrayDeque;
+import java.util.Deque;
+import java.util.Iterator;
+
+/**
+ * Wrapper class for {@link java.util.Iterator} meant to recursively
+ * iterate over its elements if they are iterable.
+ *
+ * @author Andrea Del Bene
+ */
+public class NestedIterator<E> implements Iterator<E>
+{
+ private Iterator<E> currentIterator;
+ private Deque<Iterator<E>> iteratorStack = new ArrayDeque<>();
+
+ public NestedIterator(Iterator<E> currentIterator)
+ {
+ this.currentIterator = currentIterator;
+ }
+
+ public NestedIterator(Iterable<E> iterable)
+ {
+ this(iterable.iterator());
+ }
+
+ @Override
+ public boolean hasNext()
+ {
+ if (!currentIterator.hasNext() && !iteratorStack.isEmpty())
+ {
+ currentIterator = iteratorStack.pop();
+ }
+
+ return currentIterator.hasNext();
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public E next()
+ {
+ E nextElement = currentIterator.next();
+
+ if (nextElement instanceof Iterable)
+ {
+ iteratorStack.push(currentIterator);
+ currentIterator = ((Iterable<E>)nextElement).iterator();
+ }
+
+ return nextElement;
+ }
+
+}
[3/4] wicket git commit: WICKET-6048 german translation for
EqualInputValidator fix
Posted by ad...@apache.org.
WICKET-6048 german translation for EqualInputValidator fix
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e9f0a9d7
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e9f0a9d7
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e9f0a9d7
Branch: refs/heads/lambdas
Commit: e9f0a9d7905cbc10ae4c67d4809e7143663dee8b
Parents: ae70d7d
Author: Sven Meier <sv...@apache.org>
Authored: Mon Nov 30 14:09:28 2015 +0100
Committer: Andrea Del Bene <ad...@apache.org>
Committed: Tue Dec 1 12:05:14 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/Application_de.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/e9f0a9d7/wicket-core/src/main/java/org/apache/wicket/Application_de.properties
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Application_de.properties b/wicket-core/src/main/java/org/apache/wicket/Application_de.properties
index 7014ff2..014d991 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Application_de.properties
+++ b/wicket-core/src/main/java/org/apache/wicket/Application_de.properties
@@ -33,7 +33,7 @@ EmailAddressValidator=Der Wert von '${label}' ist keine g\u00fcltige Email-Adres
CreditCardValidator=Die Kreditkartennummer ist ung\u00fcltig.
UrlValidator='${label}' ist keine g\u00fcltige URL.
-EqualInputValidator='${input0}' vom Label ${label0} und '${input1}' vom Label ${label1} m\u00fcssen gleich sein.
+EqualInputValidator='${input0}' f\u00fcr ${label0} und '${input1}' f\u00fcr ${label1} m\u00fcssen gleich sein.
EqualPasswordInputValidator=${label0} und ${label1} m\u00fcssen gleich sein.
null=Bitte w\u00e4hlen
[2/4] wicket git commit: fix for CI with Arquillian and java 8
Posted by ad...@apache.org.
fix for CI with Arquillian and java 8
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/058f7335
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/058f7335
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/058f7335
Branch: refs/heads/lambdas
Commit: 058f73352b7df68f2509a0395c2a5fab512f53e3
Parents: e9f0a9d
Author: Andrea Del Bene <ad...@apache.org>
Authored: Mon Nov 30 10:32:28 2015 +0100
Committer: Andrea Del Bene <ad...@apache.org>
Committed: Tue Dec 1 12:05:14 2015 +0100
----------------------------------------------------------------------
testing/wicket-arquillian/pom.xml | 325 +++++--------------
.../src/test/resources/arquillian.xml | 2 +-
2 files changed, 85 insertions(+), 242 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/058f7335/testing/wicket-arquillian/pom.xml
----------------------------------------------------------------------
diff --git a/testing/wicket-arquillian/pom.xml b/testing/wicket-arquillian/pom.xml
index 1720e9c..0d32812 100644
--- a/testing/wicket-arquillian/pom.xml
+++ b/testing/wicket-arquillian/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.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
@@ -18,14 +18,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
<version>8.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
-
+
<artifactId>wicket-arquillian-testing</artifactId>
<packaging>war</packaging>
@@ -36,289 +36,131 @@
WAR version (everything in a single .war file).
</description>
-
<properties>
- <!-- Wildfly dependency versions -->
+ <arquillian.version>1.1.10.Final</arquillian.version>
+ <maven.dependency.plugin.version>2.10</maven.dependency.plugin.version>
+ <maven.surefire.plugin.version>2.18.1</maven.surefire.plugin.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <slf4j.version>1.7.12</slf4j.version>
+ <wildfly.version>8.2.1.Final</wildfly.version>
<version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
- <version.wildfly_8>8.2.1.Final</version.wildfly_8>
-
- <!-- Java EE 6 SPEC JBoss -->
- <version.jboss.spec.javaee.6.0>3.0.3.Final</version.jboss.spec.javaee.6.0>
-
- <!-- ShrinkWrap Resolvers Maven -->
- <version.shrinkwrap.resolvers>2.2.0</version.shrinkwrap.resolvers>
-
- <!-- Arquillian -->
- <version.arquillian_core>1.1.9.Final</version.arquillian_core>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-container-test-impl-base</artifactId>
- <version>${version.arquillian_core}</version>
- <classifier>tests</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.core</groupId>
- <artifactId>arquillian-core-impl-base</artifactId>
- <version>${version.arquillian_core}</version>
- <classifier>tests</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
- <version>3.3.0.Final</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.marshalling</groupId>
- <artifactId>jboss-marshalling</artifactId>
- <version>1.4.10.Final</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.marshalling</groupId>
- <artifactId>jboss-marshalling-river</artifactId>
- <version>1.4.10.Final</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.remoting</groupId>
- <artifactId>jboss-remoting</artifactId>
- <version>4.0.14.Final</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.xnio</groupId>
- <artifactId>xnio-api</artifactId>
- <version>3.3.2.Final</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.xnio</groupId>
- <artifactId>xnio-nio</artifactId>
- <version>3.3.2.Final</version>
- </dependency>
- <dependency>
- <groupId>org.wildfly</groupId>
- <artifactId>wildfly-arquillian-container-managed</artifactId>
- <version>${version.wildfly_8}</version>
- </dependency>
- <!-- Arquillian -->
- <!-- Override dependency resolver with latest version. This must go *BEFORE*
- the Arquillian BOM. -->
- <dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
- <version>${version.arquillian_core}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.shrinkwrap.resolver</groupId>
- <artifactId>shrinkwrap-resolver-bom</artifactId>
- <version>${version.shrinkwrap.resolvers}</version>
+ <version>${arquillian.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
- <!-- JBoss distributes a complete set of Java EE 6 APIs including a Bill
- of Materials (BOM). A BOM specifies the versions of a "stack" (or a collection)
- of artifacts. We use this here so that we always get the correct versions
- of artifacts. Here we use the jboss-javaee-6.0-with-tools stack (you can
- read this as the JBoss stack of the Java EE 6 APIs, with some extras tools
- for your project, such as Arquillian for testing) and the jboss-javaee-6.0-with-hibernate
- stack you can read this as the JBoss stack of the Java EE 6 APIs, with extras
- from the Hibernate family of projects) -->
- <dependency>
- <groupId>org.jboss.spec</groupId>
- <artifactId>jboss-javaee-6.0</artifactId>
- <version>${version.jboss.spec.javaee.6.0}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
-
</dependencies>
</dependencyManagement>
- <!-- Dependencies. -->
-
<dependencies>
- <!-- "provided" scope used for API's included in JBoss WildFly. -->
-
- <!-- Import the CDI API. -->
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Import the JPA API. -->
<dependency>
- <groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.0-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Import the Common Annotations API (JSR-250). -->
- <dependency>
- <groupId>org.jboss.spec.javax.annotation</groupId>
- <artifactId>jboss-annotations-api_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Import the EJB API. -->
- <dependency>
- <groupId>org.jboss.spec.javax.ejb</groupId>
- <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-javaee-7.0</artifactId>
+ <version>1.0.2.Final</version>
+ <type>pom</type>
<scope>provided</scope>
</dependency>
-
- <!-- Wicket CDI integration. -->
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-cdi</artifactId>
- </dependency>
-
- <!-- Wicket -->
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
- </dependency>
-
- <!-- Servlet -->
- <dependency>
- <groupId>org.jboss.spec.javax.servlet</groupId>
- <artifactId>jboss-servlet-api_3.0_spec</artifactId>
- </dependency>
-
- <!-- JUnit -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
- <!-- Arquillian -->
- <dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-container-spi</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-container-test-impl-base</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-container-test-spi</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
- <groupId>org.jboss.arquillian.core</groupId>
- <artifactId>arquillian-core-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.core</groupId>
- <artifactId>arquillian-core-impl-base</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
+ <groupId>org.wildfly</groupId>
+ <artifactId>wildfly-arquillian-container-embedded</artifactId>
+ <version>${wildfly.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.arquillian.core</groupId>
- <artifactId>arquillian-core-spi</artifactId>
- <scope>test</scope>
+ <groupId>org.wildfly</groupId>
+ <artifactId>wildfly-embedded</artifactId>
+ <version>${wildfly.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
<scope>test</scope>
</dependency>
+ <!-- Wicket CDI integration. -->
<dependency>
- <groupId>org.jboss.arquillian.protocol</groupId>
- <artifactId>arquillian-protocol-servlet</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-cdi</artifactId>
</dependency>
+
+ <!-- Wicket -->
<dependency>
- <groupId>org.jboss.arquillian.test</groupId>
- <artifactId>arquillian-test-spi</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-core</artifactId>
</dependency>
-
- <!-- Shrinkwrap -->
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
- <artifactId>shrinkwrap-resolver-depchain</artifactId>
- <scope>test</scope>
- <type>pom</type>
+ <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
</dependency>
-
- <!-- Wildfly managed. -->
<dependency>
- <groupId>org.wildfly</groupId>
- <artifactId>wildfly-arquillian-container-managed</artifactId>
- <scope>test</scope>
+ <groupId>org.jboss.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-spi</artifactId>
</dependency>
+
</dependencies>
<build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
- <!-- Set the name of the war, used as the context root when the app is deployed. -->
- <finalName>${project.artifactId}</finalName>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.10</version>
- <executions>
- <execution>
- <id>unpack</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.wildfly</groupId>
- <artifactId>wildfly-dist</artifactId>
- <version>${version.wildfly_8}</version>
- <type>zip</type>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <environmentVariables>
- <JBOSS_HOME>${project.build.directory}/wildfly-${version.wildfly_8}</JBOSS_HOME>
- </environmentVariables>
- <systemProperties>
- <jboss.version>${version.wildfly_8}</jboss.version>
- </systemProperties>
- </configuration>
- </plugin>
- <!-- WildFly plugin to deploy the war -->
- <plugin>
- <groupId>org.wildfly.plugins</groupId>
- <artifactId>wildfly-maven-plugin</artifactId>
- <version>${version.wildfly.maven.plugin}</version>
- <configuration>
- <filename>target/${project.build.finalName}.war</filename>
- </configuration>
- </plugin>
- </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${maven.dependency.plugin.version}</version>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.wildfly</groupId>
+ <artifactId>wildfly-dist</artifactId>
+ <version>${wildfly.version}</version>
+ <type>zip</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${maven.surefire.plugin.version}</version>
+ <configuration>
+ <systemPropertyVariables>
+ <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>
+ </systemPropertyVariables>
+ <redirectTestOutputToFile>false</redirectTestOutputToFile>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.wildfly.plugins</groupId>
+ <artifactId>wildfly-maven-plugin</artifactId>
+ <version>1.0.2.Final</version>
+ <configuration>
+ <filename>target/${project.build.finalName}.war</filename>
+ </configuration>
+ </plugin>
+
+ </plugins>
</pluginManagement>
<plugins>
<plugin>
@@ -335,5 +177,6 @@
</plugin>
</plugins>
</build>
+
</project>
http://git-wip-us.apache.org/repos/asf/wicket/blob/058f7335/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
index 36c6008..f4ed277 100644
--- a/testing/wicket-arquillian/src/test/resources/arquillian.xml
+++ b/testing/wicket-arquillian/src/test/resources/arquillian.xml
@@ -26,7 +26,7 @@
<container qualifier="wildfly" default="true">
<configuration>
- <property name="jbossHome">target/wildfly-${version.wildfly_8}</property>
+ <property name="jbossHome">target/wildfly-${wildfly.version}</property>
<property name="managementPort">48990</property>
<!-- DEBUG MODE MANAGED: -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n -->
<property name="javaVmArguments">-Djboss.socket.binding.port-offset=38000 -Xmx128m -XX:MaxPermSize=128m -Xrunjdwp:transport=dt_socket,address=48787,server=y,suspend=n