Skip to content
This repository has been archived by the owner on Jun 7, 2021. It is now read-only.

Commit

Permalink
* Move static examples into the testing path.
Browse files Browse the repository at this point in the history
* Add -Puberjar to running each as a -swarm.jar instead of only via
  wildfly-swarm:{start,stop} maven goals.
  • Loading branch information
bobmcwhirter committed Nov 30, 2015
1 parent 69212dd commit b0f5e17
Show file tree
Hide file tree
Showing 15 changed files with 157 additions and 147 deletions.
8 changes: 8 additions & 0 deletions README.md
Expand Up @@ -7,3 +7,11 @@ as a reference for your own project.
The examples require a build of [WildFly Swarm](https://github.com/wildfly-swarm/wildfly-swarm) HEAD prior to building.

If you want to run the examples against the latest WildFly Swarm release, the example source can be [cloned](https://github.com/wildfly-swarm/wildfly-swarm-examples/tree/1.0.0.Alpha3) or [downloaded](https://github.com/wildfly-swarm/wildfly-swarm-examples/releases/tag/1.0.0.Alpha3).

## UberJar vs non

By default, each example runs using the Maven plugin without constructing
an *uberjar*. To run them as an *uberjar*, use the `-Puberjar` profile
when invoking Maven.

mvn install -Puberjar
47 changes: 0 additions & 47 deletions jaxrs/jaxrs-war/verify.sh

This file was deleted.

12 changes: 10 additions & 2 deletions pom.xml
Expand Up @@ -153,6 +153,7 @@
<module>jpa</module>
<module>jsf</module>
<module>msc</module>
<module>static</module>
<!--
<module>cdi-servlet</module>
<module>datasource-deployment</module>
Expand All @@ -169,8 +170,6 @@
<module>messaging-mdb</module>
<module>msc</module>
<module>servlet</module>
<module>static</module>
<module>static-war</module>
<module>transactions</module>
<module>vaadin</module>
Expand All @@ -184,4 +183,13 @@
<module>logstash</module>
-->
</modules>

<profiles>
<profile>
<id>uberjar</id>
<properties>
<wildfly-swarm.useUberJar>true</wildfly-swarm.useUberJar>
</properties>
</profile>
</profiles>
</project>
38 changes: 8 additions & 30 deletions static/pom.xml
Expand Up @@ -15,38 +15,16 @@
<relativePath>../</relativePath>
</parent>

<artifactId>wildfly-swarm-example-static</artifactId>
<artifactId>examples-static</artifactId>

<name>WildFly Swarm Examples: Static Content</name>
<description>WildFly Swarm Examples: Static Content</description>
<name>WildFly Swarm Examples: Static parent</name>
<description>WildFly Swarm Examples: Static parent</description>

<packaging>jar</packaging>
<packaging>pom</packaging>

<build>
<plugins>
<plugin>
<groupId>org.wildfly.swarm</groupId>
<artifactId>wildfly-swarm-plugin</artifactId>
<configuration>
<mainClass>org.wildfly.swarm.examples.staticcontent.Main</mainClass>
</configuration>
<executions>
<execution>
<goals>
<goal>package</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.wildfly.swarm</groupId>
<artifactId>wildfly-swarm-undertow</artifactId>
<version>${version.wildfly-swarm}</version>
</dependency>
</dependencies>

<modules>
<module>static-war</module>
<module>static-shrinkwrap</module>
</modules>
</project>
File renamed without changes.
60 changes: 60 additions & 0 deletions static/static-shrinkwrap/pom.xml
@@ -0,0 +1,60 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2015 Red Hat, Inc. and/or its affiliates.
~
~ Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
-->
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.wildfly.swarm.examples</groupId>
<artifactId>examples-static</artifactId>
<version>1.0.0.Alpha6-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<artifactId>example-static-shrinkwrap</artifactId>

<name>WildFly Swarm Examples: Static Content ShrinkWrap</name>
<description>WildFly Swarm Examples: Static Content ShrinkWrap</description>

<packaging>jar</packaging>

<build>
<plugins>
<plugin>
<groupId>org.wildfly.swarm</groupId>
<artifactId>wildfly-swarm-plugin</artifactId>
<configuration>
<mainClass>org.wildfly.swarm.examples.staticcontent.Main</mainClass>
</configuration>
<executions>
<execution>
<id>package</id>
</execution>
<execution>
<id>start</id>
</execution>
<execution>
<id>stop</id>
</execution>
</executions>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.wildfly.swarm.examples</groupId>
<artifactId>examples-base</artifactId>
</dependency>
<dependency>
<groupId>org.wildfly.swarm</groupId>
<artifactId>wildfly-swarm-undertow</artifactId>
<version>${version.wildfly-swarm}</version>
</dependency>
</dependencies>

</project>
@@ -0,0 +1,26 @@
package org.wildfly.swarm.it.jaxrs;

import org.jboss.arquillian.drone.api.annotation.Drone;
import org.jboss.arquillian.junit.Arquillian;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.openqa.selenium.WebDriver;
import org.wildfly.swarm.it.AbstractIntegrationTest;

import static org.fest.assertions.Assertions.assertThat;

/**
* @author Bob McWhirter
*/
@RunWith(Arquillian.class)
public class StaticApplicationIT extends AbstractIntegrationTest {

@Drone
WebDriver browser;

@Test
public void testIt() {
browser.navigate().to("http://localhost:8080/");
assertThat(browser.getPageSource()).contains("Howdy!");
}
}
File renamed without changes.
23 changes: 19 additions & 4 deletions static-war/pom.xml → static/static-war/pom.xml
Expand Up @@ -10,15 +10,15 @@

<parent>
<groupId>org.wildfly.swarm.examples</groupId>
<artifactId>wildfly-swarm-examples-parent</artifactId>
<artifactId>examples-static</artifactId>
<version>1.0.0.Alpha6-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<artifactId>wildfly-swarm-example-static-war</artifactId>
<artifactId>example-static-war</artifactId>

<name>WildFly Swarm Examples: Static WAR</name>
<description>WildFly Swarm Examples: Static WAR</description>
<name>WildFly Swarm Examples: Static Content .war</name>
<description>WildFly Swarm Examples: Static Content .war</description>

<packaging>war</packaging>

Expand All @@ -34,11 +34,26 @@
<plugin>
<groupId>org.wildfly.swarm</groupId>
<artifactId>wildfly-swarm-plugin</artifactId>
<executions>
<execution>
<id>package</id>
</execution>
<execution>
<id>start</id>
</execution>
<execution>
<id>stop</id>
</execution>
</executions>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.wildfly.swarm.examples</groupId>
<artifactId>examples-base</artifactId>
</dependency>
<dependency>
<groupId>org.wildfly.swarm</groupId>
<artifactId>wildfly-swarm-undertow</artifactId>
Expand Down
@@ -0,0 +1,26 @@
package org.wildfly.swarm.it.jaxrs;

import org.jboss.arquillian.drone.api.annotation.Drone;
import org.jboss.arquillian.junit.Arquillian;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.openqa.selenium.WebDriver;
import org.wildfly.swarm.it.AbstractIntegrationTest;

import static org.fest.assertions.Assertions.assertThat;

/**
* @author Bob McWhirter
*/
@RunWith(Arquillian.class)
public class StaticApplicationIT extends AbstractIntegrationTest {

@Drone
WebDriver browser;

@Test
public void testIt() {
browser.navigate().to("http://localhost:8080/");
assertThat(browser.getPageSource()).contains("Howdy!");
}
}
47 changes: 0 additions & 47 deletions static/verify.sh

This file was deleted.

17 changes: 0 additions & 17 deletions verify.sh

This file was deleted.

0 comments on commit b0f5e17

Please sign in to comment.