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

Commit

Permalink
HAWKULAR-384 Changed root directory name to hawkular-VERSION
Browse files Browse the repository at this point in the history
  • Loading branch information
@theute
theute committed Jun 25, 2015
1 parent 6f31ef8 commit 34b7cc1
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 14 deletions.
24 changes: 12 additions & 12 deletions dist/assembly.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,21 @@
<fileSets>
<fileSet>
<directory>src/main/resources/wildfly/configuration</directory>
<outputDirectory>${wildfly.dist.zip.root.dir}/standalone/configuration</outputDirectory>
<outputDirectory>${hawkular.dist.zip.root.dir}/standalone/configuration</outputDirectory>
<filtered>false</filtered>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
</fileSet>
<fileSet>
<directory>src/main/resources/configuration</directory>
<outputDirectory>${wildfly.dist.zip.root.dir}/standalone/configuration</outputDirectory>
<outputDirectory>${hawkular.dist.zip.root.dir}/standalone/configuration</outputDirectory>
<filtered>true</filtered>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
</fileSet>
<fileSet>
<directory>src/main/resources/wildfly/modules</directory>
<outputDirectory>${wildfly.dist.zip.root.dir}/modules</outputDirectory>
<outputDirectory>${hawkular.dist.zip.root.dir}/modules</outputDirectory>
<filtered>false</filtered>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
Expand Down Expand Up @@ -72,8 +72,8 @@
<directoryMode>0755</directoryMode>
</fileSet>
<fileSet>
<directory>${project.build.directory}/wildfly</directory>
<outputDirectory></outputDirectory>
<directory>${project.build.directory}/wildfly/${wildfly.dist.zip.root.dir}</directory>
<outputDirectory>${hawkular.dist.zip.root.dir}</outputDirectory>
<excludes>
<exclude>**/*.sh</exclude>
</excludes>
Expand All @@ -82,8 +82,8 @@
<directoryMode>0755</directoryMode>
</fileSet>
<fileSet>
<directory>${project.build.directory}/wildfly</directory>
<outputDirectory></outputDirectory>
<directory>${project.build.directory}/wildfly/${wildfly.dist.zip.root.dir}</directory>
<outputDirectory>${hawkular.dist.zip.root.dir}</outputDirectory>
<includes>
<include>**/*.sh</include>
</includes>
Expand All @@ -93,14 +93,14 @@
</fileSet>
<fileSet>
<directory>${project.build.directory}/keycloak/</directory>
<outputDirectory>${wildfly.dist.zip.root.dir}</outputDirectory>
<outputDirectory>${hawkular.dist.zip.root.dir}</outputDirectory>
</fileSet>
</fileSets>

<dependencySets>
<!-- all component deployments that go in the nest's internal modules directory -->
<dependencySet>
<outputDirectory>${wildfly.dist.zip.root.dir}/modules/org/hawkular/nest/main/deployments</outputDirectory>
<outputDirectory>${hawkular.dist.zip.root.dir}/modules/org/hawkular/nest/main/deployments</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<includes>
<include>org.hawkular.inventory:hawkular-integrated-inventory-rest</include>
Expand All @@ -120,7 +120,7 @@

<!-- TODO Make the unpacking conditional == only for the dev profile -->
<dependencySet>
<outputDirectory>${wildfly.dist.zip.root.dir}/modules/org/hawkular/nest/main/deployments/${artifact.artifactId}.war</outputDirectory>
<outputDirectory>${hawkular.dist.zip.root.dir}/modules/org/hawkular/nest/main/deployments/${artifact.artifactId}.war</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<includes>
<include>org.hawkular:hawkular-console</include>
Expand All @@ -132,7 +132,7 @@

<!-- additional subsystem extensions that go in the main WildFly modules directory -->
<dependencySet>
<outputDirectory>${wildfly.dist.zip.root.dir}/modules</outputDirectory>
<outputDirectory>${hawkular.dist.zip.root.dir}/modules</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<includes>
<include>org.hawkular.agent:hawkular-monitor:zip:module</include>
Expand All @@ -145,7 +145,7 @@

<!-- Keycloak theme -->
<dependencySet>
<outputDirectory>${wildfly.dist.zip.root.dir}/modules/org/hawkular/keycloak/theme/main</outputDirectory>
<outputDirectory>${hawkular.dist.zip.root.dir}/modules/org/hawkular/keycloak/theme/main</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<includes>
<include>org.hawkular.accounts:hawkular-accounts-keycloak-theme:jar</include>
Expand Down
5 changes: 3 additions & 2 deletions dist/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
<checkstyle.suppressions.file>checkstyle-suppressions.xml</checkstyle.suppressions.file>
<assembly.dir>${project.build.directory}/assembly</assembly.dir>
<wildfly.dist.zip.root.dir>wildfly-${version.org.wildfly}</wildfly.dist.zip.root.dir>
<hawkular.dist.zip.root.dir>hawkular-${project.version}</hawkular.dist.zip.root.dir>
</properties>

<dependencies>
Expand Down Expand Up @@ -275,7 +276,7 @@
<includes>
<include>standalone.xml</include>
</includes>
<outputDir>${assembly.dir}/${wildfly.dist.zip.root.dir}/standalone/configuration</outputDir>
<outputDir>${assembly.dir}/${hawkular.dist.zip.root.dir}/standalone/configuration</outputDir>
<parameters>
<parameter>
<name>kettle.build.type</name>
Expand All @@ -300,7 +301,7 @@
<includes>
<include>standalone.xml</include>
</includes>
<outputDir>${assembly.dir}/${wildfly.dist.zip.root.dir}/standalone/configuration</outputDir>
<outputDir>${assembly.dir}/${hawkular.dist.zip.root.dir}/standalone/configuration</outputDir>
<parameters>
<parameter>
<name>kettle.build.type</name>
Expand Down

0 comments on commit 34b7cc1

Please sign in to comment.