Skip to content

Commit

Permalink
fixes #413 so that we have a war that can deploy in jboss as 6.1.0 (n…
Browse files Browse the repository at this point in the history 
…ote it works fine in EAP 6.1.0 but you must use hawtio-no-slf4j.war for jboss as 6.1.0)
  • Loading branch information
@jstrachan
jstrachan committed Jul 26, 2013
1 parent ab3633d commit f0cc87a
Show file tree
Hide file tree
Showing 5 changed files with 145 additions and 2 deletions.
4 changes: 4 additions & 0 deletions hawtio-no-slf4j/.gitignore
View file
@@ -0,0 +1,4 @@
hawtio-config
hawtio.log
overlays
mavenIndexer
138 changes: 138 additions & 0 deletions hawtio-no-slf4j/pom.xml
View file
@@ -0,0 +1,138 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<parent>
<groupId>io.hawt</groupId>
<artifactId>project</artifactId>
<version>1.2-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>hawtio-no-slf4j</artifactId>
<packaging>war</packaging>
<name>${project.artifactId}</name>
<description>hawtio :: No slf4j Web Application</description>

<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>${servlet-api-version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>io.hawt</groupId>
<artifactId>hawtio-web</artifactId>
<version>${project.version}</version>
<!--
NOTE this WAR dependency type which enables this WAR to
inherit all the plugins and content from the core hawtio-web WAR
-->
<type>war</type>
</dependency>

<!-- lets mark dependencies from the WAR as provided to avoid jetty:run adding duplicates -->
<dependency>
<groupId>io.hawt</groupId>
<artifactId>hawtio-core</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.hawt</groupId>
<artifactId>hawtio-git</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>${war-plugin-version}</version>
<configuration>
<packagingExcludes>**/lib/slf4j*.jar</packagingExcludes>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>

<plugin>
<groupId>${jetty-plugin-groupId}</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${jetty-version}</version>
<configuration>
<webAppSourceDirectory>${project.build.directory}/${project.name}</webAppSourceDirectory>
<scanIntervalSeconds>1</scanIntervalSeconds>
<webAppConfig>
<contextPath>${context}</contextPath>
</webAppConfig>
<connectors>
<connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
<port>${jettyPort}</port>
<maxIdleTime>60000</maxIdleTime>
</connector>
</connectors>
<systemProperties>
<systemProperty>
<key>hawtio.config.dir</key>
<value>${hawtio-config-dir}</value>
</systemProperty>
<systemProperty>
<key>hawtio.config.repo</key>
<value>${hawtio-config-repo}</value>
</systemProperty>
</systemProperties>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
<version>2.0</version>
<configuration>
<port>9090</port>
<path>${context}</path>
<systemProperties>
</systemProperties>
<useTestClasspath>false</useTestClasspath>
<!--
<warSourceDirectory>${project.build.directory}/${project.name}-${project.version}</warSourceDirectory>
-->
</configuration>
</plugin>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat6-maven-plugin</artifactId>
<version>2.0</version>
<configuration>
<port>9090</port>
<path>${context}</path>
<systemProperties>
</systemProperties>
<useTestClasspath>false</useTestClasspath>
<!--
<warSourceDirectory>${project.build.directory}/${project.name}-${project.version}</warSourceDirectory>
-->
</configuration>
</plugin>

<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>2.5</version>
<configuration>
<filesets>
<fileset>
<directory>${basedir}/overlays</directory>
<includes>
<include>**/*.*</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
</filesets>
</configuration>
</plugin>
</plugins>
</build>
</project>
2 changes: 1 addition & 1 deletion hawtio-plugin-examples/simple-plugin/pom.xml
View file
Expand Up @@ -99,7 +99,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.1.1</version>
<version>${war-plugin-version}</version>
<configuration>
<outputFileNameMapping>@{artifactId}@-@{baseVersion}@@{dashClassifier?}@.@{extension}@</outputFileNameMapping>
<packagingExcludes>**/classes/OSGI-INF/**</packagingExcludes>
Expand Down
2 changes: 1 addition & 1 deletion hawtio-web/pom.xml
View file
Expand Up @@ -421,7 +421,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.1.1</version>
<version>${war-plugin-version}</version>
<configuration>
<outputFileNameMapping>@{artifactId}@-@{baseVersion}@@{dashClassifier?}@.@{extension}@</outputFileNameMapping>
<warSourceDirectory>${webapp-outdir}</warSourceDirectory>
Expand Down
1 change: 1 addition & 0 deletions pom.xml
View file
Expand Up @@ -270,6 +270,7 @@
<module>hawtio-web</module>
<module>hawtio-default</module>
<module>hawtio-default-offline</module>
<module>hawtio-no-slf4j</module>
<module>hawtio-embedded</module>
<module>hawtio-osgi-jmx</module>
<module>hawtio-osgi-devmode</module>
Expand Down

1 comment on commit f0cc87a

@ObiKenobii
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank you :)

Please sign in to comment.