Merge branch 'master' into feature-separate-remote-poller

OpenNMS · Jun 12, 2014 · becc5b7 · becc5b7
2 parents 9d6441f + f76ce70
commit becc5b7
Show file tree

Hide file tree

Showing 734 changed files with 2,497 additions and 2,005 deletions.
diff --git a/bin/functions.pl b/bin/functions.pl
@@ -19,6 +19,7 @@
 	$HELP
 	$JAVA_HOME
 	@JAVA_SEARCH_DIRS
+	$LOGLEVEL
 	$MVN
 	$MAVEN_VERSION
 	$MAVEN_OPTS
@@ -33,6 +34,7 @@
 $JAVA_HOME     = undef;
 $PATHSEP       = $Config{'path_sep'};
 $VERBOSE       = undef;
+$LOGLEVEL      = 'debug' unless (defined $LOGLEVEL);
 @ARGS          = ();
 
 @JAVA_SEARCH_DIRS = qw(
@@ -42,8 +44,11 @@
 	/Library/Java/JavaVirtualMachines
 	/Library/Java/Home
 	/opt
+	/opt/ci/java
 );
 
+push(@JAVA_SEARCH_DIRS, File::Spec->catdir($ENV{'HOME'}, 'ci', 'java'));
+
 eval {
 	setpriority(0, 0, 10);
 };
@@ -85,6 +90,7 @@
 	"profile|p=s"               => \$BUILD_PROFILE,
 	"java-home|java|j=s"        => \$JAVA_HOME,
 	"verbose|v"                 => \$VERBOSE,
+	"log-level|l=s"             => \$LOGLEVEL,
 );
 
 if (not $result) {
@@ -108,11 +114,25 @@
 	                       (default: $MAVEN_OPTS)
 	-p/--profile PROFILE   default, dir, full, or fulldir
 	-t/--enable-tests      enable tests when building
-	-v/--verbose           be more verbose
+	-l/--log-level         log level (error/warning/info/debug)
 END
 	exit 1;
 }
 
+if ($VERBOSE) {
+	$LOGLEVEL = 'debug';
+}
+
+if (not defined $LOGLEVEL or $LOGLEVEL eq '') {
+	$LOGLEVEL = 'info';
+}
+
+$LOGLEVEL = lc($LOGLEVEL);
+if ($LOGLEVEL !~ /^(error|warning|info|debug)$/) {
+	print STDERR "Log level $LOGLEVEL invalid.  Must be one of 'error', 'warning', 'info', or 'debug'.\n";
+	exit 1;
+}
+
 if ((defined $JAVA_HOME and -d $JAVA_HOME) or (exists $ENV{'JAVA_HOME'} and -d $ENV{'JAVA_HOME'})) {
 	if (not defined $JAVA_HOME or not -d $JAVA_HOME) {
 		$JAVA_HOME = $ENV{'JAVA_HOME'};
@@ -122,7 +142,9 @@ END
 	my $minimumversion = get_minimum_java();
 
 	if ($shortversion < $minimumversion) {
-		die "You specified a Java home of $JAVA_HOME, but it does not meet minimum java version $minimumversion!\n";
+		warning("You specified a Java home of $JAVA_HOME, but it does not meet minimum java version $minimumversion!  Will try detecting instead.");
+		undef $JAVA_HOME;
+		delete $ENV{'JAVA_HOME'};
 	}
 }
 
@@ -496,15 +518,15 @@ sub run_command {
 }
 
 sub debug {
-	print "[DEBUG] " . join(' ', @_) . "\n" if ($VERBOSE);
+	print "[DEBUG] " . join(' ', @_) . "\n" if ($LOGLEVEL eq 'debug');
 }
 
 sub warning {
-	print "[WARN] " . join(' ', @_) . "\n";
+	print "[WARN] " . join(' ', @_) . "\n" if ($LOGLEVEL =~ /^(debug|warning)$/);
 }
 
 sub info {
-	print "[INFO] " . join(' ', @_) . "\n";
+	print "[INFO] " . join(' ', @_) . "\n" if ($LOGLEVEL =~ /^(debug|warning|info)$/);
 }
 
 sub error {

diff --git a/bin/javahome.pl b/bin/javahome.pl
@@ -0,0 +1,18 @@
+#!/usr/bin/env perl
+
+use Cwd qw(abs_path);
+use File::Basename qw(dirname);
+
+# include script functions
+use vars qw(
+	$LOGLEVEL
+	$PREFIX
+);
+$LOGLEVEL = 'error';
+$PREFIX = abs_path(dirname($0));
+
+require($PREFIX . "/functions.pl");
+
+print STDOUT $JAVA_HOME, "\n";
+
+exit 0;
diff --git a/container/branding/pom.xml b/container/branding/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.opennms</groupId>
     <artifactId>container</artifactId>
-    <version>1.13.3-SNAPSHOT</version>
+    <version>1.13.4-SNAPSHOT</version>
   </parent>
 
     <groupId>org.opennms.container</groupId>
@@ -28,7 +28,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
+                        <Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
                         <Bundle-SymbolicName>manual</Bundle-SymbolicName>
                         <Import-Package>*</Import-Package>
                         <Private-Package>!*</Private-Package>

diff --git a/container/bridge/pom.xml b/container/bridge/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opennms</groupId>
         <artifactId>container</artifactId>
-        <version>1.13.3-SNAPSHOT</version>
+        <version>1.13.4-SNAPSHOT</version>
     </parent>
 
     <groupId>org.opennms.container</groupId>

diff --git a/...src/main/java/org/opennms/container/web/felix/base/internal/dispatch/ServletPipeline.java b/...src/main/java/org/opennms/container/web/felix/base/internal/dispatch/ServletPipeline.java
@@ -95,7 +95,7 @@ public void include(ServletRequest req, ServletResponse res)
         }
     }
 
-    private final class RequestWrapper
+    private final static class RequestWrapper
         extends HttpServletRequestWrapper
     {
         private final String requestUri;

diff --git a/container/features/pom.xml b/container/features/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.opennms</groupId>
     <artifactId>container</artifactId>
-    <version>1.13.3-SNAPSHOT</version>
+    <version>1.13.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opennms.karaf</groupId>

diff --git a/container/karaf/pom.xml b/container/karaf/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opennms</groupId>
         <artifactId>container</artifactId>
-        <version>1.13.3-SNAPSHOT</version>
+        <version>1.13.4-SNAPSHOT</version>
     </parent>
 
     <groupId>org.opennms.container</groupId>

diff --git a/container/pom.xml b/container/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.opennms</groupId>
     <artifactId>opennms</artifactId>
-    <version>1.13.3-SNAPSHOT</version>
+    <version>1.13.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>container</artifactId>

diff --git a/container/servlet/pom.xml b/container/servlet/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opennms</groupId>
         <artifactId>container</artifactId>
-        <version>1.13.3-SNAPSHOT</version>
+        <version>1.13.4-SNAPSHOT</version>
     </parent>
 
     <groupId>org.opennms.container</groupId>

diff --git a/container/standalone/pom.xml b/container/standalone/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opennms</groupId>
     <artifactId>container</artifactId>
-    <version>1.13.3-SNAPSHOT</version>
+    <version>1.13.4-SNAPSHOT</version>
   </parent>
   <groupId>org.opennms.container</groupId>
   <artifactId>standalone</artifactId>

diff --git a/container/web/pom.xml b/container/web/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opennms</groupId>
         <artifactId>container</artifactId>
-        <version>1.13.3-SNAPSHOT</version>
+        <version>1.13.4-SNAPSHOT</version>
     </parent>
 
     <groupId>org.opennms.container</groupId>

diff --git a/core/api/pom.xml b/core/api/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.opennms</groupId>
     <artifactId>org.opennms.core</artifactId>
-    <version>1.13.3-SNAPSHOT</version>
+    <version>1.13.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opennms.core</groupId>
@@ -18,7 +18,7 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
+            <Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Bundle-Version>${project.version}</Bundle-Version>
             <Export-Package>org.opennms.core.config.api.*;version="${project.version}",org.opennms.core.network;version="${project.version}"</Export-Package>

diff --git a/core/api/src/main/java/org/opennms/core/network/IpListFromUrl.java b/core/api/src/main/java/org/opennms/core/network/IpListFromUrl.java
@@ -44,19 +44,19 @@
  * Convenience class for generating a list of IP addresses from a file URL.
  */
 public class IpListFromUrl {
-    private final static Logger LOG = LoggerFactory.getLogger(IpListFromUrl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(IpListFromUrl.class);
 
     /**
      * The string indicating the start of the comments in a line containing the
      * IP address in a file URL
      */
-    private final static String COMMENT_STR = " #";
+    private static final String COMMENT_STR = " #";
 
     /**
      * This character at the start of a line indicates a comment line in a URL
      * file
      */
-    private final static char COMMENT_CHAR = '#';
+    private static final char COMMENT_CHAR = '#';
 
     /**
      * This method is used to read all interfaces from an URL file.

diff --git a/core/build/keystore/pom.xml b/core/build/keystore/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.opennms.core</groupId>
     <artifactId>org.opennms.core.build</artifactId>
-    <version>1.13.3-SNAPSHOT</version>
+    <version>1.13.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opennms.core.build</groupId>

diff --git a/core/build/pom.xml b/core/build/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.opennms</groupId>
     <artifactId>org.opennms.core</artifactId>
-    <version>1.13.3-SNAPSHOT</version>
+    <version>1.13.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opennms.core</groupId>

diff --git a/core/camel/pom.xml b/core/camel/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.opennms</groupId>
     <artifactId>org.opennms.core</artifactId>
-    <version>1.13.3-SNAPSHOT</version>
+    <version>1.13.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opennms.core</groupId>
@@ -18,7 +18,7 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
+            <Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Bundle-Version>${project.version}</Bundle-Version>
             <Export-Package>org.opennms.core.camel.*;version="${project.version}"</Export-Package>

diff --git a/core/castor-properties/pom.xml b/core/castor-properties/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.opennms</groupId>
     <artifactId>org.opennms.core</artifactId>
-    <version>1.13.3-SNAPSHOT</version>
+    <version>1.13.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opennms.core</groupId>
@@ -18,7 +18,7 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
+            <Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Bundle-Version>${project.version}</Bundle-Version>
             <!-- Attach to the Castor bundle (name specified in features.xml) -->

diff --git a/core/config/pom.xml b/core/config/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.opennms</groupId>
 		<artifactId>org.opennms.core</artifactId>
-		<version>1.13.3-SNAPSHOT</version>
+		<version>1.13.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.opennms.core</groupId>
@@ -19,7 +19,7 @@
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
-						<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
+						<Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
 						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
 						<Bundle-Version>${project.version}</Bundle-Version>
 						<Export-Package>org.opennms.core.config.impl.*;version="${project.version}"</Export-Package>

diff --git a/core/criteria/pom.xml b/core/criteria/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.opennms</groupId>
     <artifactId>org.opennms.core</artifactId>
-    <version>1.13.3-SNAPSHOT</version>
+    <version>1.13.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opennms.core</groupId>
@@ -33,7 +33,7 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
+            <Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Bundle-Version>${project.version}</Bundle-Version>
             <Export-Package>org.opennms.core.criteria,org.opennms.core.criteria.restrictions;version="${project.version}"</Export-Package>

diff --git a/core/daemon/pom.xml b/core/daemon/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.opennms</groupId>
     <artifactId>org.opennms.core</artifactId>
-    <version>1.13.3-SNAPSHOT</version>
+    <version>1.13.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opennms.core</groupId>
@@ -21,7 +21,7 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
+            <Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Bundle-Version>${project.version}</Bundle-Version>
             <Export-Package>org.opennms.netmgt.daemon.*;org.opennms.netmgt.vmmgr.*;version="${project.version}"</Export-Package>