Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Merge pull request #781 from ppalaga/160113-p32
Browse files Browse the repository at this point in the history
Add Hawkular feature pack
ran with the new agent release, all works
  • Loading branch information
jmazzitelli committed Jan 15, 2016
2 parents f3fb42d + cc4d430 commit 5c4a29c
Show file tree
Hide file tree
Showing 14 changed files with 416 additions and 59 deletions.
7 changes: 3 additions & 4 deletions console/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
<bower.link.package />
<node.version>v4.2.2</node.version>
<node.npm.version>2.14.7</node.npm.version>
<node.maven.plugin.version>0.0.26</node.maven.plugin.version>
<hawkular.checkstyle.excludes>
release.properties,
**/*.d.ts,
Expand All @@ -64,6 +63,7 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
Expand Down Expand Up @@ -95,6 +95,7 @@
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<webResources>
Expand Down Expand Up @@ -160,6 +161,7 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<excludeDefaultDirectories>true</excludeDefaultDirectories>
Expand All @@ -180,7 +182,6 @@
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>${node.maven.plugin.version}</version>

<configuration>
<workingDirectory>target/gulp-build/</workingDirectory>
Expand Down Expand Up @@ -240,7 +241,6 @@
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>${node.maven.plugin.version}</version>

<configuration>
<workingDirectory>target/gulp-build/</workingDirectory>
Expand Down Expand Up @@ -314,7 +314,6 @@
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>${node.maven.plugin.version}</version>

<configuration>
<workingDirectory>target/gulp-build/</workingDirectory>
Expand Down
42 changes: 8 additions & 34 deletions dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,36 +44,9 @@
<dependencies>

<dependency>
<groupId>org.hawkular.agent</groupId>
<artifactId>hawkular-wildfly-agent-feature-pack</artifactId>
<version>${version.org.hawkular.agent}</version>
<type>pom</type>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.hawkular.agent</groupId>
<artifactId>hawkular-wildfly-agent-feature-pack</artifactId>
<version>${version.org.hawkular.agent}</version>
<type>zip</type>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.hawkular.accounts</groupId>
<artifactId>hawkular-accounts-feature-pack</artifactId>
<version>${version.org.hawkular.accounts}</version>
<groupId>org.hawkular</groupId>
<artifactId>hawkular-feature-pack</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>provided</scope>
<exclusions>
Expand All @@ -85,9 +58,9 @@
</dependency>

<dependency>
<groupId>org.hawkular.accounts</groupId>
<artifactId>hawkular-accounts-feature-pack</artifactId>
<version>${version.org.hawkular.accounts}</version>
<groupId>org.hawkular</groupId>
<artifactId>hawkular-feature-pack</artifactId>
<version>${project.version}</version>
<type>zip</type>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -340,6 +313,7 @@
<!-- [FIXME metrics 1/2] A temporary fix that can be removed once metrics war has
its jboss-deployment-structure.xml fixed to depend on bus rather than nest WF module -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
Expand Down Expand Up @@ -435,7 +409,6 @@
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.2.12</version>
<configuration>
<imageName>hawkular:snapshot</imageName>
<dockerDirectory>docker</dockerDirectory>
Expand Down Expand Up @@ -485,6 +458,7 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<finalName>hawkular-${project.version}</finalName>
Expand Down
5 changes: 2 additions & 3 deletions dist/server-provisioning.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
Copyright 2015 Red Hat, Inc. and/or its affiliates
Copyright 2015-2016 Red Hat, Inc. and/or its affiliates
and other contributors as indicated by the @author tags.
Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -19,7 +19,6 @@
<server-provisioning xmlns="urn:wildfly:server-provisioning:1.1" extract-schemas="true"
copy-module-artifacts="true">
<feature-packs>
<feature-pack groupId="org.hawkular.agent" artifactId="hawkular-wildfly-agent-feature-pack" version="${version.org.hawkular.agent}" />
<feature-pack groupId="org.hawkular.accounts" artifactId="hawkular-accounts-feature-pack" version="${version.org.hawkular.accounts}" />
<feature-pack groupId="org.hawkular" artifactId="hawkular-feature-pack" version="${project.version}" />
</feature-packs>
</server-provisioning>
18 changes: 9 additions & 9 deletions dist/src/main/resources/standalone.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,15 @@
<xsl:template name="secure-deployment">
<xsl:param name="deployment.name" />
<xsl:param name="credential.secret" />
<secure-deployment>
<xsl:attribute name="name"><xsl:value-of select="$deployment.name"/></xsl:attribute>
<realm>hawkular</realm>
<resource>hawkular-accounts-backend</resource>
<use-resource-role-mappings>true</use-resource-role-mappings>
<enable-cors>true</enable-cors>
<enable-basic-auth>true</enable-basic-auth>
<credential name="secret"><xsl:value-of select="$credential.secret"/></credential>
</secure-deployment>
<secure-deployment>
<xsl:attribute name="name"><xsl:value-of select="$deployment.name"/></xsl:attribute>
<realm>hawkular</realm>
<resource>hawkular-accounts-backend</resource>
<use-resource-role-mappings>true</use-resource-role-mappings>
<enable-cors>true</enable-cors>
<enable-basic-auth>true</enable-basic-auth>
<credential name="secret"><xsl:value-of select="$credential.secret"/></credential>
</secure-deployment>
</xsl:template>

<!-- //*[local-name()='secure-deployment'] is an xPath's 1.0 way of saying of xPath's 2.0 prefix-less selector //*:secure-deployment -->
Expand Down
35 changes: 35 additions & 0 deletions feature-pack/assembly.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2015-2016 Red Hat, Inc. and/or its affiliates
and other contributors as indicated by the @author tags.
Licensed 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.
-->
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">

<id>${project.artifactId}</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>target/${project.artifactId}-${project.version}</directory>
<outputDirectory/>
</fileSet>
</fileSets>
</assembly>

44 changes: 44 additions & 0 deletions feature-pack/feature-pack-build.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2015-2016 Red Hat, Inc. and/or its affiliates
and other contributors as indicated by the @author tags.
Licensed 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.
-->
<build xmlns="urn:wildfly:feature-pack-build:1.1">
<dependencies>
<artifact name="org.hawkular.accounts:hawkular-accounts-feature-pack" />
<artifact name="org.hawkular.agent:hawkular-wildfly-agent-feature-pack" />
</dependencies>

<config>
<standalone template="configuration/standalone/template.xml" subsystems="configuration/standalone/subsystems.xml" output-file="standalone/configuration/standalone.xml" />
</config>

<file-permissions>
<permission value="755">
<filter pattern="*.sh" include="true"/>
</permission>
</file-permissions>

<line-endings>
<windows>
<filter pattern="*.bat" include="true"/>
</windows>
<unix>
<filter pattern="*.sh" include="true"/>
</unix>
</line-endings>
</build>
105 changes: 105 additions & 0 deletions feature-pack/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
<!--
Copyright 2015-2016 Red Hat, Inc. and/or its affiliates
and other contributors as indicated by the @author tags.
Licensed 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.
-->
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.hawkular</groupId>
<artifactId>hawkular</artifactId>
<version>1.0.0.Alpha9-SNAPSHOT</version>
</parent>
<artifactId>hawkular-feature-pack</artifactId>
<packaging>pom</packaging>

<name>Hawkular Feature Pack</name>
<description>A feature pack that can be used to build a Hawkular distribution.</description>

<dependencies>

<dependency>
<groupId>org.hawkular.accounts</groupId>
<artifactId>hawkular-accounts-feature-pack</artifactId>
<version>${version.org.hawkular.accounts}</version>
<type>zip</type>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.hawkular.agent</groupId>
<artifactId>hawkular-wildfly-agent-feature-pack</artifactId>
<version>${version.org.hawkular.agent}</version>
<type>zip</type>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

</dependencies>

<build>
<plugins>

<plugin>
<groupId>org.wildfly.build</groupId>
<artifactId>wildfly-feature-pack-build-maven-plugin</artifactId>
<executions>
<execution>
<id>feature-pack-build</id>
<phase>compile</phase>
<goals>
<goal>build</goal>
</goals>
<configuration>
<config-file>feature-pack-build.xml</config-file>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>assemble</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>assembly.xml</descriptor>
</descriptors>
<appendAssemblyId>false</appendAssemblyId>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

0 comments on commit 5c4a29c

Please sign in to comment.