Whitespace/EOF cleanup, build control changes (#97)

* Cleaned up missing EOF and unnecessary whitespace.

* Added 'set -e' to cause the scripts to fail on the first non-zero exit status rather than allow the failures to cascade.

* Made output directory and output filename more configurable, moved docker plugin into a profile so it can be disabled.

* Fixed issue with maven plugin order being non-deterministic when defined in a profile, made docker skipable with 'skipDockerBuild' variable.

Author: ddimensia

Histograms.md

@@ -6,7 +6,7 @@ by MAD.
 
 Representation
 --------------
-Histograms are built by incrementing a counter in a bucket and stored as a sparse list of 
+Histograms are built by incrementing a counter in a bucket and stored as a sparse list of
 bucket -> count entries.  The bucket is defined by the smallest number stored in that bucket, computed
 by using an IEEE Double with a mantissa truncated to n bits of precision.  The default in MAD is to use
 7 bits of precision.  Additionally, the min, max and sum of the samples are stored as IEEE Double values
@@ -15,10 +15,9 @@ alongside the histogram.
 Statistics
 ----------
 
-min - accurate (stored)  
-max - accurate (stored)  
-sum - accurate (stored)  
-quantiles - estimated.  accuracy depends on precision of the histogram and value stored.  n bits of 
-precision provides accuracy to within (1 / (2^n)) * value.  ex: 7 bits of precision provides accuracy 
+min - accurate (stored)
+max - accurate (stored)
+sum - accurate (stored)
+quantiles - estimated.  accuracy depends on precision of the histogram and value stored.  n bits of
+precision provides accuracy to within (1 / (2^n)) * value.  ex: 7 bits of precision provides accuracy
 to within 1% of the computed value.
-

LICENSE

@@ -89,7 +89,7 @@ a. You must give any other recipients of the Work or Derivative Works a copy of
 this License; and
 b. You must cause any modified files to carry prominent notices stating that You
 changed the files; and
-c. You must retain, in the Source form of any Derivative Works that You 
+c. You must retain, in the Source form of any Derivative Works that You
 distribute, all copyright, patent, trademark, and attribution notices from the
 Source form of the Work, excluding those notices that do not pertain to any part
 of the Derivative Works; and
@@ -105,7 +105,7 @@ the NOTICE file are for informational purposes only and do not modify the
 License. You may add Your own attribution notices within Derivative Works that
 You distribute, alongside or as an addendum to the NOTICE text from the Work,
 provided that such additional attribution notices cannot be construed as
-modifying the License. 
+modifying the License.
 
 You may add Your own copyright statement to Your modifications and may provide
 additional or different license terms and conditions for use, reproduction, or

README.md

@@ -128,9 +128,9 @@ For example:
     "serviceName": "MyApplication",
     "sources":
     [
-        {                                                                 
+        {
             "type": "com.arpnetworking.metrics.common.sources.ClientHttpSourceV1",
-            "name": "my_application_http_source"                                   
+            "name": "my_application_http_source"
         },
         {
             "type": "com.arpnetworking.metrics.common.sources.FileSource",

mvnw

@@ -57,27 +57,27 @@ case "`uname`" in
            #
            # Look for the Apple JDKs first to preserve the existing behaviour, and then look
            # for the new JDKs provided by Oracle.
-           # 
+           #
            if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then
              #
              # Apple JDKs
              #
              export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
            fi
-           
+
            if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then
              #
              # Apple JDKs
              #
              export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
            fi
-             
+
            if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then
              #
              # Oracle JDKs
              #
              export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
-           fi           
+           fi
 
            if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then
              #
@@ -219,7 +219,7 @@ concat_lines() {
 export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)}
 MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
 
-# Provide a "standardized" way to retrieve the CLI args that will 
+# Provide a "standardized" way to retrieve the CLI args that will
 # work with both Windows and non-Windows executions.
 MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
 export MAVEN_CMD_LINE_ARGS

pom.xml

@@ -130,8 +130,19 @@
     <!-- JVM Debug -->
     <debugJavaOptions />
     <debugJavaPort>9001</debugJavaPort>
+
+    <!-- Docker Overrides -->
+    <skipDockerBuild>false</skipDockerBuild>
+
+    <!-- Assembly Overrides -->
+    <tgz.finalName>${project.build.finalName}</tgz.finalName>
+
+    <!-- Project Overrides -->
+    <buildDirectory>${project.basedir}/target</buildDirectory>
   </properties>
+
   <build>
+    <directory>${buildDirectory}</directory>
     <resources>
       <resource>
         <directory>src/main/resources</directory>
@@ -205,7 +216,7 @@
               <mainClass>com.arpnetworking.metrics.mad.Main</mainClass>
             </program>
           </programs>
-          <unixScriptTemplate>${project.basedir}/target/appAssemblerUnixBinTemplate</unixScriptTemplate>
+          <unixScriptTemplate>${project.build.directory}/appAssemblerUnixBinTemplate</unixScriptTemplate>
           <endorsedDir>lib/ext</endorsedDir>
         </configuration>
       </plugin>
@@ -237,6 +248,7 @@
               <goal>single</goal>
             </goals>
             <configuration>
+              <finalName>${tgz.finalName}</finalName>
               <appendAssemblyId>true</appendAssemblyId>
               <attach>false</attach>
               <tarLongFileMode>posix</tarLongFileMode>
@@ -317,13 +329,6 @@
               <goal>build</goal>
             </goals>
           </execution>
-          <execution>
-            <id>default-remove</id>
-            <phase>validate</phase>
-            <configuration>
-              <removeAll>true</removeAll>
-            </configuration>
-          </execution>
           <execution>
             <id>default-start</id>
             <phase>pre-integration-test</phase>
@@ -390,6 +395,7 @@
               </run>
             </image>
           </images>
+          <skip>${skipDockerBuild}</skip>
         </configuration>
       </plugin>
     </plugins>
@@ -811,5 +817,15 @@
         <debugJavaOptions>-Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=${debugJavaPort},suspend=n</debugJavaOptions>
       </properties>
     </profile>
+    <profile>
+      <id>no-docker</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <skipIntegrationTests>true</skipIntegrationTests>
+        <skipDockerBuild>true</skipDockerBuild>
+      </properties>
+    </profile>
   </profiles>
 </project>

rpm/scripts/post.sh

@@ -1,3 +1,4 @@
+set -e
 /sbin/chkconfig --add mad
 mkdir -p /opt/mad/logs
 chown mad:mad /opt/mad/logs

rpm/scripts/postun.sh

@@ -1,3 +1,4 @@
+set -e
 if [ "$1" -ge 1 ]; then
   /sbin/service mad condrestart > /dev/null 2>&1
 fi

rpm/scripts/pre.sh

@@ -1,3 +1,4 @@
+set -e
 getent group mad >/dev/null || groupadd -r mad
 getent passwd mad >/dev/null || \
     useradd -r -g mad -d /opt/mad -s /sbin/nologin \

rpm/scripts/preun.sh

@@ -1,3 +1,4 @@
+set -e
 if [ "$1" = 0 ]; then
   /sbin/service mad stop > /dev/null 2>&1
   /sbin/chkconfig --del mad

src/main/java/com/arpnetworking/configuration/Configuration.java

@@ -471,4 +471,3 @@ public interface Configuration {
      */
     <T> T getRequiredAs(Type type) throws NoSuchElementException, IllegalArgumentException;
 }
-