Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	samples/activemq/queues.json
	src/com/googlecode/jmxtrans/util/JmxUtils.java

Author: jstrachan

.gitignore

@@ -1,3 +1,6 @@
+.classpath
+.project
+_eclipse
 .idea
 logs
 out

build.xml

@@ -14,6 +14,7 @@ commons-pool.src=lib/commons-pool-1.5.6-sources.jar
 jackson-core.jar=lib/jackson-core-asl-1.6.3.jar
 jackson-mapper.jar=lib/jackson-mapper-asl-1.6.3.jar
 jackson.src=lib/jackson-1.6.3-sources.jar
+jgit.jar=lib/org.eclipse.jgit-1.1.0.201109151100-r.jar
 jpathwatch.jar=lib/jpathwatch-0-94.jar
 jrobin.jar=lib/jrobin-1.5.9.jar
 jrobin.src=lib/jrobin-1.5.9-sources.jar
@@ -25,8 +26,6 @@ slf4j-api.jar=lib/slf4j-api-1.6.1.jar
 slf4j-api.src=lib/slf4j-api-1.6.1-sources.jar
 slf4j-log4j.jar=lib/slf4j-log4j12-1.6.1.jar
 slf4j-log4j.src=lib/slf4j-log4j12-1.6.1-sources.jar
-svnkit.jar=lib/svnkit.jar
-svntask.jar=lib/svntask.jar
 sweetened.jar=lib/sweetened.jar
 velocity.jar=lib/velocity-1.7.jar
 velocity.src=lib/velocity-1.7-sources.jar

jar.properties

@@ -21,7 +21,6 @@
           ],
           "typeNames" : ["Destination"],
           "resultAlias" : "ActiveMQ.Queue",
-
           "outputWriters":[
             {
               "@class":"com.googlecode.jmxtrans.model.output.KeyOutWriter",

lib/org.eclipse.jgit-1.1.0.201109151100-r.jar

@@ -2,13 +2,10 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
-import java.lang.management.ManagementFactory;
 import java.lang.reflect.Array;
 import java.rmi.UnmarshalException;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -22,7 +19,6 @@
 import javax.management.AttributeList;
 import javax.management.MBeanAttributeInfo;
 import javax.management.MBeanInfo;
-import javax.management.MBeanServer;
 import javax.management.MBeanServerConnection;
 import javax.management.ObjectInstance;
 import javax.management.ObjectName;
@@ -61,7 +57,7 @@ public class JmxUtils {
 
 	private static final Logger log = LoggerFactory.getLogger(JmxUtils.class);
 
-    /**
+	/**
 	 * Merges two lists of servers (and their queries). Based on the equality of both sets of objects.
 	 * Public for testing purposes.
 	 */
@@ -335,10 +331,6 @@ private static void runOutputWritersForQuery(Query query) throws Exception {
 	 * Helper method for connecting to a Server. You need to close the resulting connection.
 	 */
 	public static JMXConnector getServerConnection(Server server) throws Exception {
-        if (server.isLocal()) {
-            MBeanServer mbeanServer = server.getLocalMBeanServer();
-            return new LocalJMXConnector(mbeanServer);
-        }
 		JMXServiceURL url = new JMXServiceURL(server.getUrl());
 
 		if (server.getProtocolProviderPackages() != null && server.getProtocolProviderPackages().contains("weblogic"))
@@ -348,7 +340,7 @@ public static JMXConnector getServerConnection(Server server) throws Exception {
 
 	}
 
-    /**
+	/**
 	 * Generates the proper username/password environment for JMX connections.
 	 */
 	public static Map<String, String> getWebLogicEnvironment(Server server) {
@@ -491,17 +483,6 @@ public static JmxProcess getJmxProcess(File file) throws JsonParseException, Jso
 		return jmx;
 	}
 
-	/**
-	 * Uses jackson to load json configuration from a File into a full object
-	 * tree representation of that json.
-	 */
-	public static JmxProcess getJmxProcess(String name, InputStream in) throws JsonParseException, JsonMappingException, IOException {
-		ObjectMapper mapper = new ObjectMapper();
-		JmxProcess jmx = mapper.readValue(in, JmxProcess.class);
-		jmx.setName(name);
-		return jmx;
-	}
-
 	/**
 	 * Useful for figuring out if an Object is a number.
 	 */
@@ -659,7 +640,7 @@ public static String getKeyString2(Query query, Result result, Entry<String, Obj
 	}
 
 
-    /**
+	/**
 	 * Replaces all . with _ and removes all spaces and double/single quotes.
 	 */
 	public static String cleanupStr(String name) {
@@ -698,28 +679,30 @@ public static String getConcatedTypeNameValues(List<String> typeNames, String ty
 	}
 
 
-    /**
-   	 * Given a typeName string, get the first match from the typeNames setting.
-   	 * In other words, suppose you have:
-   	 *
-   	 * typeName=name=PS Eden Space,type=MemoryPool
-   	 *
-   	 * If you addTypeName("name"), then it'll retrieve 'PS Eden Space' from the string
-   	 */
-    public static String getConcatedTypeNameValues(Query query, List<String> typeNames, String typeName) {
-        Set<String> queryTypeNames = query.getTypeNames();
-        if (queryTypeNames != null && queryTypeNames.size() > 0) {
-            List<String> allNames = new ArrayList<String>(queryTypeNames);
-            for (String name : typeNames) {
-                if (!allNames.contains(name)) {
-                    allNames.add(name);
-                }
-            }
-            return getConcatedTypeNameValues(allNames, typeName);
-        } else {
-            return getConcatedTypeNameValues(typeNames, typeName);
-        }
-    }
+	/**
+	 * Given a typeName string, get the first match from the typeNames setting.
+	 * In other words, suppose you have:
+	 *
+	 * typeName=name=PS Eden Space,type=MemoryPool
+	 *
+	 * If you addTypeName("name"), then it'll retrieve 'PS Eden Space' from the
+	 * string
+	 */
+	public static String getConcatedTypeNameValues(Query query, List<String> typeNames, String typeName) {
+		Set<String> queryTypeNames = query.getTypeNames();
+		if (queryTypeNames != null && queryTypeNames.size() > 0) {
+			List<String> allNames = new ArrayList<String>(queryTypeNames);
+			for (String name : typeNames) {
+				if (!allNames.contains(name)) {
+					allNames.add(name);
+				}
+			}
+			return getConcatedTypeNameValues(allNames, typeName);
+		} else {
+			return getConcatedTypeNameValues(typeNames, typeName);
+		}
+	}
+
 	/** */
 	private static String getTypeNameValue(String typeName, String[] tokens) {
 		boolean foundIt = false;