- Kettle -> Dist (+ file/directories reorg)

- Added Maven POM names

kettle/src/main/scripts/distro-assembly.xml → dist/assembly.xml

@@ -19,7 +19,7 @@
 -->
 
 <assembly>
-  <id>distribution</id>
+  <id>wildfly</id>
   <formats>
     <format>zip</format>
   </formats>
@@ -36,12 +36,8 @@
       <directoryMode>0755</directoryMode>
     </fileSet>
     <fileSet>
-      <directory>src/main/resources</directory>
-      <outputDirectory>/${nest.dist.zip.root.dir}/</outputDirectory>
-      <excludes>
-        <!-- We handle this file specially (at the end of this file) -->
-        <exclude>**/hawkular-realm*json</exclude>
-      </excludes>
+      <directory>src/main/resources/wildfly/bin</directory>
+      <outputDirectory>/${nest.dist.zip.root.dir}/bin</outputDirectory>
     </fileSet>
   </fileSets>
 
@@ -130,7 +126,7 @@
 
   <files>
     <file>
-      <source>src/main/resources/standalone/configuration/${hawkular.realm.template}</source>
+      <source>src/main/resources/configuration/${hawkular.realm.template}</source>
       <outputDirectory>${nest.dist.zip.root.dir}/standalone/configuration/</outputDirectory>
       <filtered>true</filtered>
       <destName>hawkular-realm.json</destName>

kettle/pom.xml → dist/pom.xml

@@ -26,29 +26,17 @@
     <version>1.0.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>hawkular-kettle</artifactId>
+  <artifactId>hawkular-dist</artifactId>
   <packaging>pom</packaging>
-  <name>Hawkular Kettle</name>
+  <name>Hawkular Distribution</name>
   <description>Hawkular distribution that integrates all components into a single server.</description>
 
   <properties>
     <kettle.build.type>production</kettle.build.type>
-    <nest.dist.zip.root.dir>wildfly-${version.org.wildfly}</nest.dist.zip.root.dir>
     <hawkular.realm.template>hawkular-realm.json</hawkular.realm.template>
 
-    <checkstyle.suppressions.file>${basedir}/src/main/scripts/checkstyle-suppressions.xml</checkstyle.suppressions.file>
+    <checkstyle.suppressions.file>checkstyle-suppressions.xml</checkstyle.suppressions.file>
 
-    <!-- The versions of the components that go into our integration distribution -->
-    <version.org.hawkular.agent>0.0.1-SNAPSHOT</version.org.hawkular.agent>
-    <version.org.hawkular.nest>0.0.1-SNAPSHOT</version.org.hawkular.nest>
-    <version.org.hawkular.inventory>0.0.1-SNAPSHOT</version.org.hawkular.inventory>
-    <version.org.hawkular.alerts>1.0.0-SNAPSHOT</version.org.hawkular.alerts>
-    <version.org.hawkular.metrics>0.3.2-SNAPSHOT</version.org.hawkular.metrics>
-    <version.org.hawkular.console>1.0.0-SNAPSHOT</version.org.hawkular.console>
-    <version.org.hawkular.accounts>1.0.0-SNAPSHOT</version.org.hawkular.accounts>
-    <version.org.hawkular.pinger>1.0.0-SNAPSHOT</version.org.hawkular.pinger>
-    <version.org.hawkular.availCreator>1.0.0-SNAPSHOT</version.org.hawkular.availCreator>
-    <version.org.keycloak>1.1.0.Final</version.org.keycloak>
   </properties>
 
   <dependencies>
@@ -199,7 +187,7 @@
               <transformationSets>
                 <transformationSet>
                   <dir>${basedir}/target/nest/${nest.dist.zip.root.dir}/standalone/configuration</dir>
-                  <stylesheet>src/main/scripts/standalone.xsl</stylesheet>
+                  <stylesheet>src/main/resources/wildfly/patches/standalone.xsl</stylesheet>
                   <includes>
                     <include>standalone.xml</include>
                   </includes>
@@ -224,8 +212,9 @@
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
+          <appendAssemblyId>false</appendAssemblyId>
           <descriptors>
-            <descriptor>src/main/scripts/distro-assembly.xml</descriptor>
+            <descriptor>assembly.xml</descriptor>
           </descriptors>
         </configuration>
         <executions>

modules/avail-creator/pom.xml

@@ -118,4 +118,5 @@
     </plugins>
   </build>
 
+  <name>Hawkular: Availability Creator</name>
 </project>

modules/pinger/pom.xml

@@ -142,4 +142,5 @@
     </plugins>
   </build>
 
+  <name>Hawkular: Pinger</name>
 </project>

pom.xml

@@ -56,7 +56,7 @@
     <module>ui/console</module>
     <module>modules/pinger</module>
     <module>modules/avail-creator</module>
-    <module>kettle</module>
+    <module>dist</module>
   </modules>
 
   <scm>
@@ -79,6 +79,17 @@
     <!-- - If groupId is not unique, append the property name with "-{artifactId}" -->
     <!-- - Version properties must be sorted alphabetically -->
 
+    <version.org.hawkular.agent>0.0.1-SNAPSHOT</version.org.hawkular.agent>
+    <version.org.hawkular.nest>0.0.1-SNAPSHOT</version.org.hawkular.nest>
+    <version.org.hawkular.inventory>0.0.1-SNAPSHOT</version.org.hawkular.inventory>
+    <version.org.hawkular.alerts>1.0.0-SNAPSHOT</version.org.hawkular.alerts>
+    <version.org.hawkular.metrics>0.3.2-SNAPSHOT</version.org.hawkular.metrics>
+    <version.org.hawkular.console>1.0.0-SNAPSHOT</version.org.hawkular.console>
+    <version.org.hawkular.accounts>1.0.0-SNAPSHOT</version.org.hawkular.accounts>
+    <version.org.hawkular.pinger>1.0.0-SNAPSHOT</version.org.hawkular.pinger>
+    <version.org.hawkular.availCreator>1.0.0-SNAPSHOT</version.org.hawkular.availCreator>
+
+    <version.org.keycloak>1.1.0.Final</version.org.keycloak>
     <version.com.google.code.gson>2.2.4</version.com.google.code.gson>
     <version.com.google.guava>16.0.1</version.com.google.guava>
     <version.gnu.getopt>1.0.13</version.gnu.getopt>

ui/console/pom.xml

@@ -27,8 +27,8 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>hawkular-console</artifactId>
-  <name>hawkular-console</name>
+  <artifactId>hawkular-admin-console</artifactId>
+  <name>Hawkular: Admin console</name>
   <packaging>war</packaging>
 
   <properties>